Drop dependency on nixpkgs (#692)

Callers should use `mkLib` with an instantiation of `pkgs` instead of using `crane.lib.${system}` directly
ipetkov · Aug 29, 2024 · 6f7504a · 6f7504a
1 parent 95b4209
commit 6f7504a
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 117 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
           - install_url: https://releases.nixos.org/nix/nix-2.18.2/install
             # The 24.05 branch ships with Nix 2.18.2
           - install_url: https://releases.nixos.org/nix/nix-2.18.2/install
-            nixpkgs-override: "--override-input nixpkgs $(./ci/ref-from-lock.sh ./test#nixpkgs)"
+            nixpkgs-override: "--override-input nixpkgs $(./ci/ref-from-lock.sh ./test#nixpkgs-latest-release)"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -89,7 +89,7 @@ jobs:
       # "opt-out" of our lockfile .gitignore
       run: |
         rm ./examples/.gitignore
-        nix develop .# --accept-flake-config --command ./ci/check-example.sh ./examples/${{ matrix.example }} ".#nixpkgs"
+        nix develop .# --accept-flake-config --command ./ci/check-example.sh ./examples/${{ matrix.example }} "./test#nixpkgs"
 
   examples-darwin:
     strategy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * `downloadCargoPackageFromGit` will now set `fetchLFS = true` when fetching git
   repos with defined output hashes
 
+### Removed
+* The deprecated top-level (flake) attribute `lib` no longer exists. Please use
+  `mkLib` with an instance of `pkgs` instead.
+
 ## [0.18.1] - 2024-08-22
 
 ### Fixed

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -39,7 +39,6 @@ following contents at the root of your cargo workspace:
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/docs/introduction/artifact-reuse.md b/docs/introduction/artifact-reuse.md
@@ -20,7 +20,6 @@ Here's how we can set up our flake to achieve our goals:
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/docs/introduction/sequential-builds.md b/docs/introduction/sequential-builds.md
@@ -12,7 +12,6 @@ build.
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    crane.inputs.nixpkgs.follows = "nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/docs/local_development.md b/docs/local_development.md
@@ -19,10 +19,7 @@ Sample `flake.nix`:
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
   };

diff --git a/docs/overriding_derivations.md b/docs/overriding_derivations.md
@@ -39,10 +39,7 @@ craneLib.buildPackage {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
@@ -107,10 +104,7 @@ If you need to change behavior that way, consider using a combination of
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
   };
 
   outputs = { self, nixpkgs, crane, fenix, flake-utils, advisory-db, ... }:

diff --git a/examples/alt-registry/flake.nix b/examples/alt-registry/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils = {
       url = "github:numtide/flake-utils";

diff --git a/examples/build-std/flake.nix b/examples/build-std/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/cross-musl/flake.nix b/examples/cross-musl/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/cross-rust-overlay/flake.nix b/examples/cross-rust-overlay/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/cross-windows/flake.nix b/examples/cross-windows/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     fenix = {
       url = "github:nix-community/fenix";

diff --git a/examples/custom-toolchain/flake.nix b/examples/custom-toolchain/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/end-to-end-testing/flake.nix b/examples/end-to-end-testing/flake.nix
@@ -3,10 +3,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/quick-start-simple/flake.nix b/examples/quick-start-simple/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
   };

diff --git a/examples/quick-start-workspace/flake.nix b/examples/quick-start-workspace/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     fenix = {
       url = "github:nix-community/fenix";

diff --git a/examples/quick-start/flake.nix b/examples/quick-start/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     fenix = {
       url = "github:nix-community/fenix";

diff --git a/examples/sqlx/flake.nix b/examples/sqlx/flake.nix
@@ -4,10 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
   };

diff --git a/examples/trunk-workspace/flake.nix b/examples/trunk-workspace/flake.nix
@@ -8,10 +8,7 @@
     # Update this to include the version you need
     nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/examples/trunk/flake.nix b/examples/trunk/flake.nix
@@ -8,10 +8,7 @@
     # Update this to include the version you need
     nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    crane.url = "github:ipetkov/crane";
 
     flake-utils.url = "github:numtide/flake-utils";
 

diff --git a/extra-tests/alt-store/flake.nix b/extra-tests/alt-store/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/extra-tests/alt-store/test.sh b/extra-tests/alt-store/test.sh
@@ -5,11 +5,14 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
+
 case "$(nix --version)" in
   "nix (Nix) 2.21.0" | "nix (Nix) 2.21.1")
     echo 'skipping test: https://github.com/NixOS/nix/issues/10267'
     ;;
 
-  *) nix build .#default --override-input crane ../.. --store $(pwd)/alt-store
+  *) nix build .#default ${craneOverride} --store $(pwd)/alt-store
     ;;
 esac
diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 flakeSrc=$(nix flake metadata ${craneOverride} --json 2>/dev/null | jq -r '.path')
 
 # Get information about the default derivation

diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 flakeSrc=$(nix flake metadata ${craneOverride} --json 2>/dev/null | jq -r '.path')
 
 # Get information about the default derivation

diff --git a/extra-tests/fetch-cargo-git/flake.nix b/extra-tests/fetch-cargo-git/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 

diff --git a/extra-tests/fetch-cargo-git/test.sh b/extra-tests/fetch-cargo-git/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 
 # Try fetching the git verision of cargo
 nix build ${craneOverride} .#cargo-git
diff --git a/flake.lock b/flake.lock