diff --git a/flake.lock b/flake.lock index b24e14b..e245820 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -78,16 +78,16 @@ }, "stable": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a00ae53..c686301 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - stable.url = "github:NixOS/nixpkgs/nixos-24.05"; + stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nix-github-actions = { url = "github:nix-community/nix-github-actions"; @@ -29,28 +29,10 @@ supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; colmenaOptions = import ./src/nix/hive/options.nix; colmenaModules = import ./src/nix/hive/modules.nix; - - # Temporary fork of nix-eval-jobs with changes to be upstreamed - # Mostly for the integration test setup and not needed in most use cases - _evalJobsOverlay = final: prev: let - patched = prev.nix-eval-jobs.overrideAttrs (old: { - version = old.version + "-colmena"; - patches = (old.patches or []) ++ [ - # Allows NIX_PATH to be honored - (final.fetchpatch { - url = "https://github.com/zhaofengli/nix-eval-jobs/commit/6ff5972724230ac2b96eb1ec355cd25ca512ef57.patch"; - hash = "sha256-2NiMYpw27N+X7Ixh2HkP3fcWvopDJWQDVjgRdhOL2QQ"; - }) - ]; - }); - in { - nix-eval-jobs = patched; - }; in flake-utils.lib.eachSystem supportedSystems (system: let pkgs = import nixpkgs { inherit system; overlays = [ - _evalJobsOverlay ]; }; in rec { @@ -120,8 +102,6 @@ overlays = [ self.overlays.default inputsOverlay - - _evalJobsOverlay ]; }; pkgsStable = import stable { @@ -129,8 +109,6 @@ overlays = [ self.overlays.default inputsOverlay - - _evalJobsOverlay ]; }; } else {}; @@ -155,13 +133,4 @@ }; }; }; - - nixConfig = { - extra-substituters = [ - "https://colmena.cachix.org" - ]; - extra-trusted-public-keys = [ - "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - ]; - }; }