bump version

Author: mmsqe

nix/default.nix

@@ -3,6 +3,7 @@
 import sources.nixpkgs {
   overlays = [
     (_: pkgs: {
+      flake-compat = import sources.flake-compat;
       go = pkgs.go_1_22;
       go-ethereum = pkgs.callPackage ./go-ethereum.nix {
         inherit (pkgs.darwin) libobjc;

nix/flake.nix

@@ -0,0 +1,123 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    nix-bundle-exe = {
+      url = "github:3noch/nix-bundle-exe";
+      flake = false;
+    };
+    gomod2nix = {
+      url = "github:nix-community/gomod2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+  };
+
+  outputs = { self, nixpkgs, nix-bundle-exe, gomod2nix, flake-utils }:
+    let
+      rev = self.shortRev or "dirty";
+      mkApp = drv: {
+        type = "app";
+        program = "${drv}/bin/${drv.meta.mainProgram}";
+      };
+    in
+    (flake-utils.lib.eachDefaultSystem
+      (system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [
+              (import ./nix/build_overlay.nix)
+              gomod2nix.overlays.default
+              self.overlay
+            ];
+            config = { };
+          };
+        in
+        rec {
+          packages = pkgs.cronos-matrix // {
+            inherit (pkgs) rocksdb;
+          };
+          apps = {
+            cronosd = mkApp packages.cronosd;
+            cronosd-testnet = mkApp packages.cronosd-testnet;
+          };
+          defaultPackage = packages.cronosd;
+          defaultApp = apps.cronosd;
+          devShells = {
+            default = pkgs.mkShell {
+              buildInputs = [
+                defaultPackage.go
+                pkgs.gomod2nix
+              ];
+            };
+            rocksdb = pkgs.mkShell {
+              buildInputs = [
+                defaultPackage.go
+                pkgs.gomod2nix
+                pkgs.rocksdb
+              ];
+            };
+          };
+          legacyPackages = pkgs;
+        }
+      )
+    ) // {
+      overlay = final: super: {
+        go = super.go_1_22;
+        bundle-exe = final.pkgsBuildBuild.callPackage nix-bundle-exe { };
+        # make-tarball don't follow symbolic links to avoid duplicate file, the bundle should have no external references.
+        # reset the ownership and permissions to make the extract result more normal.
+        make-tarball = drv: final.runCommand "tarball-${drv.name}"
+          {
+            nativeBuildInputs = with final.buildPackages; [ gnutar gzip ];
+          } ''
+          tar cfv - -C "${drv}" \
+            --owner=0 --group=0 --mode=u+rw,uga+r --hard-dereference . \
+            | gzip -9 > $out
+        '';
+        bundle-win-exe = drv: final.callPackage ./nix/bundle-win-exe.nix { cronosd = drv; };
+      } // (with final;
+        let
+          matrix = lib.cartesianProductOfSets {
+            network = [ "mainnet" "testnet" ];
+            pkgtype = [
+              "nix" # normal nix package
+              "bundle" # relocatable bundled package
+              "tarball" # tarball of the bundle, for distribution and checksum
+            ];
+          };
+          binaries = builtins.listToAttrs (builtins.map
+            ({ network, pkgtype }: {
+              name = builtins.concatStringsSep "-" (
+                [ "cronosd" ] ++
+                lib.optional (network != "mainnet") network ++
+                lib.optional (pkgtype != "nix") pkgtype
+              );
+              value =
+                let
+                  cronosd = callPackage ./. {
+                    inherit rev network;
+                  };
+                  bundle =
+                    if stdenv.hostPlatform.isWindows then
+                      bundle-win-exe cronosd
+                    else
+                      bundle-exe cronosd;
+                in
+                if pkgtype == "bundle" then
+                  bundle
+                else if pkgtype == "tarball" then
+                  make-tarball bundle
+                else
+                  cronosd;
+            })
+            matrix
+          );
+        in
+        {
+          cronos-matrix = binaries;
+        }
+      );
+    };
+}

nix/sources.json

@@ -58,5 +58,17 @@
         "type": "tarball",
         "url": "https://github.com/nix-community/poetry2nix/archive/4eb2ac54029af42a001c9901194e9ce19cbd8a40.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "flake-compat": {
+        "branch": "master",
+        "description": null,
+        "homepage": null,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "sha256": "1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7",
+        "type": "tarball",
+        "url": "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

tests/integration_tests/configs/upgrade-test-package.nix

@@ -1,13 +1,13 @@
 let
   pkgs = import ../../../nix { };
-  fetchEthermint = rev: builtins.fetchTarball "https://github.com/evmos/ethermint/archive/${rev}.tar.gz";
-  released = pkgs.buildGo120Module rec {
-    name = "ethermintd";
-    src = fetchEthermint "d29cdad6e667f6089dfecbedd36bb8d3a2a7d025";
-    subPackages = [ "cmd/ethermintd" ];
-    vendorHash = "sha256-cQAol54b6hNzsA4Q3MP9mTqFWM1MvR5uMPrYpaoj3SY=";
-    doCheck = false;
-  };
+  fetchFlake = repo: rev: (pkgs.flake-compat {
+    src = {
+      outPath = builtins.fetchTarball "https://github.com/${repo}/archive/${rev}.tar.gz";
+      inherit rev;
+      shortRev = builtins.substring 0 7 rev;
+    };
+  }).defaultNix;
+  released = (fetchFlake "crypto-org-chain/ethermint" "27d29ccdc275e5771f1febf4354c57566f9d18e5").default;
   current = pkgs.callPackage ../../../. { };
 in
 pkgs.linkFarm "upgrade-test-package" [