chore(nix): bump nixpkgs

Author: benluelo

docs/openapi.nix

@@ -2,7 +2,6 @@ _: {
   perSystem =
     {
       pkgs,
-      unstablePkgs,
       openapi,
       ensureAtRepositoryRoot,
       mkCi,
@@ -17,7 +16,7 @@ _: {
               {
                 buildInputs =
                   [ biome ]
-                  ++ (with unstablePkgs; [
+                  ++ (with pkgs; [
                     yq
                     jq
                     bun

flake.lock

@@ -5,12 +5,7 @@
       url = "github:hellwolf/solc.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixpkgs.url = "github:NixOS/nixpkgs?rev=75a5ebf473cd60148ba9aec0d219f72e5cf52519";
-    # Track a separate nixpkgs for latest solc
-    nixpkgs-solc.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-go.url = "github:NixOS/nixpkgs/nixos-unstable";
-    # Track a separate nixpkgs for unstable nixos
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
     # Track a separate nixpkgs for JS/TS toolchains
     nixpkgs-js.url = "github:NixOS/nixpkgs/nixos-unstable";
     # Remove when lnav is updated on upstream nixpkgs
@@ -21,8 +16,8 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     arion = {
-      url = "github:hercules-ci/arion?rev=6a1f03329c400327b3b2e0ed5e1efff11037ba67";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:hercules-ci/arion/v0.2.2.0";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
@@ -33,7 +28,7 @@
     };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
     };
     crane = {
       url = "github:ipetkov/crane";
@@ -139,8 +134,6 @@
     inputs@{
       self,
       nixpkgs,
-      nixpkgs-solc,
-      nixpkgs-go,
       flake-parts,
       nix-filter,
       foundry,
@@ -256,9 +249,7 @@
             last = pkgs.lib.lists.last complete;
           };
 
-          goPkgs = import inputs.nixpkgs-go { inherit system; };
           jsPkgs = import inputs.nixpkgs-js { inherit system; };
-          unstablePkgs = import inputs.nixpkgs-unstable { inherit system; };
 
           gitRev = if (builtins.hasAttr "rev" self) then self.rev else "dirty";
         in
@@ -271,9 +262,7 @@
                 dbg
                 get-flake
                 uniondBundleVersions
-                goPkgs
                 jsPkgs
-                unstablePkgs
                 mkCi
                 ;
 
@@ -286,37 +275,37 @@
                   (_: super: {
                     inherit (self'.packages) devnet-utils;
 
-                    go-ethereum = super.go-ethereum.override {
-                      buildGoModule =
-                        args:
-                        super.buildGoModule (
-                          args
-                          // rec {
-                            version = "1.13.12";
-                            src = pkgs.fetchFromGitHub {
-                              owner = "ethereum";
-                              repo = "go-ethereum";
-                              rev = "v${version}";
-                              sha256 = "sha256-2olJV7Z01kuXlUGyI0v4YNW07/RfYiDUhBncCIS4s0A=";
-                            };
-                            vendorHash = "sha256-gcLVQTBpOE0DHz7/p7PENhwghftJKUDm88/4jaQ1VYw=";
-                            subPackages = [
-                              "cmd/abidump"
-                              "cmd/abigen"
-                              "cmd/bootnode"
-                              "cmd/clef"
-                              "cmd/devp2p"
-                              "cmd/era"
-                              "cmd/ethkey"
-                              "cmd/evm"
-                              "cmd/geth"
-                              "cmd/p2psim"
-                              "cmd/rlpdump"
-                              "cmd/utils"
-                            ];
-                          }
-                        );
-                    };
+                    # go-ethereum = super.go-ethereum.override {
+                    #   buildGoModule =
+                    #     args:
+                    #     super.buildGoModule (
+                    #       args
+                    #       // rec {
+                    #         version = "1.13.12";
+                    #         src = pkgs.fetchFromGitHub {
+                    #           owner = "ethereum";
+                    #           repo = "go-ethereum";
+                    #           rev = "v${version}";
+                    #           sha256 = "sha256-2olJV7Z01kuXlUGyI0v4YNW07/RfYiDUhBncCIS4s0A=";
+                    #         };
+                    #         vendorHash = "sha256-gcLVQTBpOE0DHz7/p7PENhwghftJKUDm88/4jaQ1VYw=";
+                    #         subPackages = [
+                    #           "cmd/abidump"
+                    #           "cmd/abigen"
+                    #           "cmd/bootnode"
+                    #           "cmd/clef"
+                    #           "cmd/devp2p"
+                    #           "cmd/era"
+                    #           "cmd/ethkey"
+                    #           "cmd/evm"
+                    #           "cmd/geth"
+                    #           "cmd/p2psim"
+                    #           "cmd/rlpdump"
+                    #           "cmd/utils"
+                    #         ];
+                    #       }
+                    #     );
+                    # };
 
                     writeShellApplicationWithArgs = import ./tools/writeShellApplicationWithArgs.nix {
                       pkgs = super;
@@ -485,7 +474,7 @@
                 nodePackages_latest.typescript-language-server
                 nodePackages_latest.vscode-langservers-extracted
               ])
-              ++ (with unstablePkgs; [
+              ++ (with pkgs; [
                 wasm-tools
                 postgresql
                 go_1_23
@@ -498,7 +487,7 @@
                   [
                     pkgs.solc
                     pkgs.foundry-bin
-                    goPkgs.sqlx-cli
+                    pkgs.sqlx-cli
                     self'.packages.hasura-cli
                     self'.packages.ignite-cli
                   ]