diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index c29e0233..31c75141 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -126,7 +126,7 @@ jobs: root_nixpkgs=$(nix eval --raw --file . 'inputs.nixpkgs.rev') old=$(git show --no-patch --format=%h) nix flake update --commit-lock-file \ - --override-input nixpkgs "github:NixOS/nixpkgs/$root_nixpkgs" \ + --override-input 'dev-nixpkgs' "github:NixOS/nixpkgs/$root_nixpkgs" \ --flake './flake/dev' new=$(git show --no-patch --format=%h) if [ "$old" != "$new" ]; then diff --git a/flake/dev/flake.nix b/flake/dev/flake.nix index dd213905..3390398c 100644 --- a/flake/dev/flake.nix +++ b/flake/dev/flake.nix @@ -2,33 +2,36 @@ description = "Private inputs for development purposes. These are used by the top level flake in the `dev` partition, but do not appear in consumers' lock files."; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + # NOTE: Use a different name to the root flake's inputs.nixpkgs to avoid shadowing it. + # NOTE: The only reason we specify a nixpkgs input at all here, is so the other inputs can follow it. + # TODO: Once nix 2.26 is more prevalent, follow the root flake's inputs using a "path:../.." input. + dev-nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "dev-nixpkgs"; }; nix-darwin = { url = "github:lnl7/nix-darwin"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "dev-nixpkgs"; }; devshell = { url = "github:numtide/devshell"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "dev-nixpkgs"; }; treefmt-nix = { url = "github:numtide/treefmt-nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "dev-nixpkgs"; }; flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; git-hooks = { url = "github:cachix/git-hooks.nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "dev-nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; };