diff --git a/flake.lock b/flake.lock index 131979e6..9ecbf3a2 100644 --- a/flake.lock +++ b/flake.lock @@ -113,7 +113,9 @@ "flake-compat": [ "flake-compat" ], - "git-hooks": "git-hooks", + "git-hooks": [ + "git-hooks-nix" + ], "nix": "nix", "nixpkgs": [ "nixpkgs" @@ -234,7 +236,7 @@ "foundry-nix": "foundry-nix", "lib-extras": "lib-extras", "nixpkgs": [ - "nixpkgs" + "nixos-2405" ], "nixpkgs-2311": [ "nixos-2311" @@ -477,40 +479,12 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "devenv" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv" - ] - }, - "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": [ "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], @@ -533,28 +507,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "git-hooks-nix", @@ -605,16 +557,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -825,6 +777,22 @@ "type": "github" } }, + "nixos-2411": { + "locked": { + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-anywhere": { "inputs": { "disko": [ @@ -1012,10 +980,11 @@ "nixd": "nixd", "nixos-2311": "nixos-2311", "nixos-2405": "nixos-2405", + "nixos-2411": "nixos-2411", "nixos-anywhere": "nixos-anywhere", "nixos-images": "nixos-images", "nixpkgs": [ - "nixos-2405" + "nixos-2411" ], "nixpkgs-unstable": "nixpkgs-unstable", "systems": "systems", diff --git a/flake.nix b/flake.nix index 19cfeb8c..ce400d01 100644 --- a/flake.nix +++ b/flake.nix @@ -15,12 +15,13 @@ inputs = { nixos-2311.url = "github:NixOS/nixpkgs/nixos-23.11"; nixos-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixos-2411.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs.follows = "nixos-2405"; + nixpkgs.follows = "nixos-2411"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -71,7 +72,7 @@ ethereum-nix = { url = "github:metacraft-labs/ethereum.nix"; inputs = { - nixpkgs.follows = "nixpkgs"; + nixpkgs.follows = "nixos-2405"; nixpkgs-2311.follows = "nixos-2311"; nixpkgs-unstable.follows = "nixpkgs-unstable"; flake-parts.follows = "flake-parts"; @@ -98,7 +99,7 @@ inputs = { cachix.follows = "cachix"; nixpkgs.follows = "nixpkgs"; - pre-commit-hooks.follows = "git-hooks-nix"; + git-hooks.follows = "git-hooks-nix"; flake-compat.follows = "flake-compat"; }; }; diff --git a/packages/default.nix b/packages/default.nix index ed52b2e7..cc249985 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - inherit (lib) optionalAttrs; + inherit (lib) optionalAttrs versionAtLeast; inherit (pkgs) system; inherit (pkgs.hostPlatform) isLinux; in rec { @@ -12,7 +12,10 @@ inputs = { nixpkgs = rec { inherit (pkgs) cachix; - nix = pkgs.nixVersions.nix_2_22; + nix = let + nixStable = pkgs.nixVersions.stable; + in + assert versionAtLeast nixStable.version "2.24.10"; nixStable; nix-eval-jobs = pkgs.nix-eval-jobs.override {inherit nix;}; nix-fast-build = pkgs.nix-fast-build.override {inherit nix-eval-jobs;}; };