Merge pull request #683 from NixOS/no-resolve-nix-tools

FromCabal.Name: stop resolving executables from pkgs.nix to nix attr

Author: sternenseemann

cabal2nix/CHANGELOG.md

@@ -16,6 +16,11 @@
   and `pkgs.devil` all of which have been removed from Nixpkgs for 25.11.
 * Removed expression post processing hooks for `pandoc`, `pandoc-citeproc`,
   `liquid-fixpoint` and `GlomeVec`.
+* Stop resolving the `nix-store`, `nix-hash` etc. executables in `build-tools`
+  to a `nix` package input. As of 2025-10-16, this clashes with a Hackage
+  package causing the input to stop working as intended. Users who relied
+  on this resolution, will need to pass in `pkgs.nix` manually via overrides
+  going forward.
 
 ## 2.20.1
 

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs

@@ -324,11 +324,6 @@ buildToolNixName "gtk2hsC2hs"                   = return "gtk2hs-buildtools"
 buildToolNixName "gtk2hsHookGenerator"          = return "gtk2hs-buildtools"
 buildToolNixName "gtk2hsTypeGen"                = return "gtk2hs-buildtools"
 buildToolNixName "hsc2hs"                       = []
-buildToolNixName "nix-build"                    = return "nix"
-buildToolNixName "nix-env"                      = return "nix"
-buildToolNixName "nix-hash"                     = return "nix"
-buildToolNixName "nix-instantiate"              = return "nix"
-buildToolNixName "nix-store"                    = return "nix"
 buildToolNixName "utillinux"                    = return "util-linux"
 buildToolNixName x                              = return (fromString x)
 

cabal2nix/test/golden-test-cases/nix-paths.nix.golden

@@ -1,10 +1,14 @@
-{ mkDerivation, base, lib, nix, process }:
+{ mkDerivation, base, lib, nix-build, nix-env, nix-hash
+, nix-instantiate, nix-store, process
+}:
 mkDerivation {
   pname = "nix-paths";
   version = "1.0.1";
   sha256 = "deadbeef";
   libraryHaskellDepends = [ base process ];
-  libraryToolDepends = [ nix ];
+  libraryToolDepends = [
+    nix-build nix-env nix-hash nix-instantiate nix-store
+  ];
   homepage = "https://github.com/peti/nix-paths";
   description = "Knowledge of Nix's installation directories";
   license = lib.licenses.bsd3;