test: Update nixpkgs, poetry2nix

b-harvest · Aug 8, 2024 · b41b1ec · b41b1ec
1 parent 7a4ed2f
commit b41b1ec
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -3,21 +3,16 @@
 import sources.nixpkgs {
   overlays = [
     (_: pkgs: {
-      go = pkgs.go_1_21;
+      flake-compat = import sources.flake-compat;
+      go = pkgs.go_1_22;
       go-ethereum = pkgs.callPackage ./go-ethereum.nix {
         inherit (pkgs.darwin) libobjc;
         inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
-        buildGoModule = pkgs.buildGo121Module;
+        buildGoModule = pkgs.buildGo120Module;
       };
     }) # update to a version that supports eip-1559
-    # https://github.com/NixOS/nixpkgs/pull/179622
-    (import ./go_1_21_overlay.nix)
-    (final: prev:
-      (import "${sources.gomod2nix}/overlay.nix")
-        (final // {
-          inherit (final.darwin.apple_sdk_11_0) callPackage;
-        })
-        prev)
+    (import "${sources.poetry2nix}/overlay.nix")
+    (import "${sources.gomod2nix}/overlay.nix")
     (pkgs: _:
       import ./scripts.nix {
         inherit pkgs;
@@ -27,13 +22,13 @@ import sources.nixpkgs {
           dotenv = builtins.path { name = "dotenv"; path = ../scripts/.env; };
         };
       })
-    (_: pkgs: { test-env = import ./testenv.nix { inherit pkgs; }; })
+    (_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; })
     (_: pkgs: {
-      cosmovisor = pkgs.buildGo118Module rec {
+      cosmovisor = pkgs.buildGo120Module rec {
         name = "cosmovisor";
         src = sources.cosmos-sdk + "/cosmovisor";
         subPackages = [ "./cmd/cosmovisor" ];
-        vendorSha256 = "sha256-b5WxrM1L2e/J6ZrOKwzmi85YuoRw/bPor20zNIenYS8=";
+        vendorHash = "sha256-b5WxrM1L2e/J6ZrOKwzmi85YuoRw/bPor20zNIenYS8=";
         doCheck = false;
       };
     })

diff --git a/nix/go-ethereum.nix b/nix/go-ethereum.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1";
   };
 
-  vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd";
+  vendorHash = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd";
 
   doCheck = false;
 

diff --git a/nix/sources.json b/nix/sources.json
@@ -41,10 +41,22 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5129fb42b9c262318130a97b47516946da3e7d7",
-        "sha256": "1pasj6b8zbyng4i641rzvnzwab5lklrj3yps26vw0yfd4sdk3y9v",
+        "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803",
+        "sha256": "0mmgk3bg8rqs4mlsaxr5hyvzqn3sg53pqqm1aiwq00kmcnhds7nx",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/f5129fb42b9c262318130a97b47516946da3e7d7.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/86ef6bd96b6279e1a4a53236d341f5df1ede3803.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "poetry2nix": {
+        "branch": "master",
+        "description": "Convert poetry projects to nix automagically [maintainer=@adisbladis] ",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "poetry2nix",
+        "rev": "4eb2ac54029af42a001c9901194e9ce19cbd8a40",
+        "sha256": "16fi71fpywiqsya1z99kkb14dansyrmkkrb2clzs3b5qqx673wf4",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/poetry2nix/archive/4eb2ac54029af42a001c9901194e9ce19cbd8a40.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }