Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cabal2nix/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 6 additions & 2 deletions cabal2nix/test/golden-test-cases/nix-paths.nix.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading