Temporary Commit

Kava-Labs · Apr 9, 2024 · 87129b1 · 87129b1
1 parent 5dc8bab
commit 87129b1
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 15 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -65,12 +65,34 @@ jobs:
       - run: |
           nix-shell -I nixpkgs=./nix -p test-env --run "make lint-py"
         if: env.GIT_DIFF
+#  gomod2nix:
+#    name: Check gomod2nix.toml file is up to date
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/[email protected]
+#      - uses: cachix/install-nix-action@v18
+#      - uses: technote-space/[email protected]
+#        with:
+#          PATTERNS: |
+#            **/**.py
+#      - name: run gomod2nix
+#        run: |
+#          nix run -f ./nix gomod2nix
+#          git diff --no-ext-diff --exit-code
+#        if: env.GIT_DIFF
   gomod2nix:
     name: Check gomod2nix.toml file is up to date
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected]
-      - uses: cachix/install-nix-action@v18
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v26
+        with:
+          nix_path: nixpkgs=channel:nixos-23.11
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+      - uses: cachix/cachix-action@v14
+        with:
+          name: crypto-ethermint
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |

diff --git a/nix/default.nix b/nix/default.nix
@@ -11,13 +11,14 @@ import sources.nixpkgs {
       };
     }) # update to a version that supports eip-1559
     # https://github.com/NixOS/nixpkgs/pull/179622
-    (import ./go_1_20_overlay.nix)
-    (final: prev:
-      (import "${sources.gomod2nix}/overlay.nix")
-        (final // {
-          inherit (final.darwin.apple_sdk_11_0) callPackage;
-        })
-        prev)
+#    (import ./go_1_20_overlay.nix)
+#    (final: prev:
+#      (import "${sources.gomod2nix}/overlay.nix")
+#        (final // {
+#          inherit (final.darwin.apple_sdk_11_0) callPackage;
+#        })
+#        prev)
+    (import "${sources.gomod2nix}/overlay.nix")
     (pkgs: _:
       import ./scripts.nix {
         inherit pkgs;

diff --git a/nix/sources.json b/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": null,
         "owner": "tweag",
         "repo": "gomod2nix",
-        "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58",
-        "sha256": "0li17ynbg2wg0xqy655m5rmcw905sbv7d4ir35z7s5pg1yhhzxkp",
+        "rev": "30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6",
+        "sha256": "1m0q0p1xidsp61xfrbj8ld1dqk3fhyrfifxj2ks36yjbnzmi1x69",
         "type": "tarball",
-        "url": "https://github.com/tweag/gomod2nix/archive/40d32f82fc60d66402eb0972e6e368aeab3faf58.tar.gz",
+        "url": "https://github.com/tweag/gomod2nix/archive/30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
-        "sha256": "1ndiv385w1qyb3b18vw13991fzb9wg4cl21wglk89grsfsnra41k",
+        "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803",
+        "sha256": "0mmgk3bg8rqs4mlsaxr5hyvzqn3sg53pqqm1aiwq00kmcnhds7nx",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/057f9aecfb71c4437d2b27d3323df7f93c010b7e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/86ef6bd96b6279e1a4a53236d341f5df1ede3803.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "poetry2nix": {