From a8559f061dff4e14e8664e71c8e4a660e237b253 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Sat, 13 Jun 2026 20:30:26 -0400 Subject: [PATCH 1/3] flake: Be consistent with input ordering Sort the inputs themselves and have .url first and then everything else follows in order. Also added new lines to break up the big block of text which should make it easier to read and catch the issue thats getting fixed in the next commit next time it happens. --- flake.nix | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index dbabf994c2..ac7b4bdd2f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,30 +9,42 @@ inputs = { devshell.url = "github:numtide/devshell"; devshell.inputs.nixpkgs.follows = "nixpkgs"; + flake-parts.url = "github:hercules-ci/flake-parts"; + flake-utils.url = "github:numtide/flake-utils"; - git-hooks.inputs.nixpkgs.follows = "nixpkgs"; + git-hooks.url = "github:cachix/git-hooks.nix"; + git-hooks.inputs.nixpkgs.follows = "nixpkgs"; + multigres.url = "github:multigres/multigres"; multigres.flake = false; - nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + nix-darwin.url = "github:nix-darwin/nix-darwin"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; + + nix-editor.url = "github:snowfallorg/nix-editor"; nix-editor.inputs.nixpkgs.follows = "nixpkgs"; nix-editor.inputs.utils.follows = "flake-utils"; - nix-editor.url = "github:snowfallorg/nix-editor"; + + nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; nix-eval-jobs.inputs.flake-parts.follows = "flake-parts"; nix-eval-jobs.inputs.treefmt-nix.follows = "treefmt-nix"; - nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; - nix2container.inputs.nixpkgs.follows = "nixpkgs"; + nix2container.url = "github:nlewo/nix2container"; + nix2container.inputs.nixpkgs.follows = "nixpkgs"; + # Pin to a specific nixpkgs version that has compatible v8 and curl versions # for extensions that require older package versions nixpkgs-oldstable.url = "github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d"; + nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; - rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + rust-overlay.url = "github:oxalica/rust-overlay"; - treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; + rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = From b13ffc8150b8054ea9f7d089e6ae3a0bbdfff875 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Mon, 15 Jun 2026 12:19:35 -0400 Subject: [PATCH 2/3] flake: Add comment re nix-eval-job's nixpkgs following ours Would be good to drop an extra nixpkgs fetch/add-to-store. --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index ac7b4bdd2f..507af5fbd1 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; nix-eval-jobs.inputs.flake-parts.follows = "flake-parts"; + # nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; Uncomment when *our* nixpkgs is bumped again nix-eval-jobs.inputs.treefmt-nix.follows = "treefmt-nix"; nix2container.url = "github:nlewo/nix2container"; @@ -38,6 +39,7 @@ # for extensions that require older package versions nixpkgs-oldstable.url = "github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d"; + # Uncomment nix-eval-jobs...nixpkgs.follows when this gets bumped nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"; rust-overlay.url = "github:oxalica/rust-overlay"; From 2e2da3a51a545c1ffd8f0490fe276b3aeec33e29 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Fri, 12 Jun 2026 17:05:23 -0400 Subject: [PATCH 3/3] flake: Use nearest channel release for nixpkgs-oldstable Using a tarball instead of github commit means smaller download (~1/3 smaller) and slightly smaller store usage. --- flake.lock | 16 ++++++---------- flake.nix | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index c2d6ea1fe9..25985950e4 100644 --- a/flake.lock +++ b/flake.lock @@ -265,18 +265,14 @@ }, "nixpkgs-oldstable": { "locked": { - "lastModified": 1712666087, - "narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a76c4553d7e741e17f289224eda135423de0491d", - "type": "github" + "lastModified": 1712670910, + "narHash": "sha256-GKfWxagYxrsVeVVpxsp+NvBCbMM13zJy4JKN+MxG1sM=", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre609661.a76c4553d7e7/nixexprs.tar.xz" }, "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a76c4553d7e741e17f289224eda135423de0491d", - "type": "github" + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre609661.a76c4553d7e7/nixexprs.tar.xz" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index 507af5fbd1..4fab140e72 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ # Pin to a specific nixpkgs version that has compatible v8 and curl versions # for extensions that require older package versions - nixpkgs-oldstable.url = "github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d"; + nixpkgs-oldstable.url = "https://releases.nixos.org/nixpkgs/nixpkgs-24.05pre609661.a76c4553d7e7/nixexprs.tar.xz"; # Uncomment nix-eval-jobs...nixpkgs.follows when this gets bumped nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";