imp: #0 use a separate nix version for the bitte shell

- this allows us to guarantee a consistent nix version within devshells across projects
input-output-hk · Dec 2, 2021 · 7b55cf1 · 7b55cf1
1 parent 2916451
commit 7b55cf1
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 25 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,15 +6,25 @@
     nixpkgs-client.url = "github:nixos/nixpkgs/release-21.05";
     nixpkgs-auxiliary.url = "github:nixos/nixpkgs/nixos-21.11";
 
+    # in function of https://github.com/NixOS/nix/pull/5544
+    # we want to bump this nix version soon-ish
+    # that pr "fixes" builds on monitoring "do the right thing"
+    nix-core.url = "github:NixOS/nix/c6fa7775de413a799b9a137dceced5dcf0f5e6ed";
+    nix-core.inputs.nixpkgs.follows = "nixpkgs-core";
+    # currently includes `computeLocks` fix - so follows are not screwed
+    nix-auxiliary.url = "github:NixOS/nix/2ff71b021379a2c9bbdcb789a93cdc585b3520ca";
+    nix-auxiliary.inputs.nixpkgs.follows = "nixpkgs-auxiliary";
+
+    # Legacy alias / TODO
     nixpkgs.follows = "nixpkgs-core";
-    nix.url = "github:NixOS/nix/c6fa7775de413a799b9a137dceced5dcf0f5e6ed";
-    nix.inputs.nixpkgs.follows = "nixpkgs-core";
+    nix.follows = "nix-core";
 
     fenix.url = "github:nix-community/fenix";
 
     cli.url = "github:input-output-hk/bitte-cli";
     cli.inputs.fenix.follows = "fenix";
     cli.inputs.nixpkgs.follows = "nixpkgs-auxiliary";
+    cli.inputs.nix.follows = "nix-auxiliary";
 
     deploy.url = "github:input-output-hk/deploy-rs";
     deploy.inputs.fenix.follows = "fenix";