Skip to content

haskellPackages: _ prefix attribute names that would need quoting #453366

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

Merged
sternenseemann merged 2 commits into from
Nov 26, 2025
Merged

haskellPackages: _ prefix attribute names that would need quoting #453366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a86e3d
haskellPackages.cabal2nix-unstable: 2025-11-11 -> 2025-11-20
sternenseemann Nov 20, 2025
8780e5b
haskellPackages: _ prefix attribute names that would need quoting
sternenseemann Oct 19, 2025
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
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "2.20.1-unstable-2025-11-11";
version = "2.20.1-unstable-2025-11-20";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.7.1.1-unstable-2025-11-11";
version = "1.7.1.1-unstable-2025-11-20";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
}:
mkDerivation {
pname = "hackage-db";
version = "2.1.3-unstable-2025-11-11";
version = "2.1.3-unstable-2025-11-20";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
8 changes: 5 additions & 3 deletions pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
lib,
parsec-class,
pretty,
process,
QuickCheck,
}:
mkDerivation {
pname = "language-nix";
version = "2.3.0-unstable-2025-11-11";
version = "2.3.0-unstable-2025-11-20";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/a152152295a9fa6698583e84a2b8c7eee1446296.tar.gz";
sha256 = "1jpgzyc360g5snvc5ji6wqfvbsc7siwxvhrwafzzfg762niq0c49";
url = "https://github.com/NixOS/cabal2nix/archive/459859839cfe4fb352a29c1a72a1c4f0f537a1b8.tar.gz";
sha256 = "1443hlbz29y2dn22kf91zx7g284zp3l2vgw6jg4wgx66v2sxrqii";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
Expand All @@ -33,6 +34,7 @@ mkDerivation {
lens
parsec-class
pretty
process
QuickCheck
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
Expand Down
36 changes: 36 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,18 @@ builtins.intersectAttrs super {
};
}) (enableSeparateBinOutput super.cabal2nix-unstable);

# Cabal doesn't allow us to properly specify the test dependency
# on nix-instantiate(1). Even though we're just evaluating pure code,
# it absolutely wants to write to disk.
Comment on lines +1534 to +1536
Copy link
Contributor

@wolfgangwalther wolfgangwalther Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can nix-instantiate --readonly-mode help here?

(didn't check whether we're already using it)

Copy link
Member Author

@sternenseemann sternenseemann Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it, but nix-instantiate still tries to create profiles, so I didn't bother adding it. I mean, --readonly-mode just tells it not to write anything to the store when it would have to, but this is never the case in the test suite.

language-nix-unstable = overrideCabal (drv: {
testDepends = drv.testDepends or [ ] ++ [ pkgs.nix ];
preCheck = ''
export TMP_NIX_DIR="$(mktemp -d)"
export NIX_STORE_DIR="$TMP_NIX_DIR/store"
export NIX_STATE_DIR="$TMP_NIX_DIR/state"
'';
}) super.language-nix-unstable;

# test suite needs local redis daemon
nri-redis = dontCheck super.nri-redis;

Expand Down Expand Up @@ -2110,3 +2122,27 @@ builtins.intersectAttrs super {

botan-bindings = super.botan-bindings.override { botan = pkgs.botan3; };
}

// lib.optionalAttrs pkgs.config.allowAliases (
lib.genAttrs
[
"2captcha"
"3d-graphics-example"
"3dmodels"
"4Blocks"
"assert"
"if"
]
(
old:
let
new = "_" + old;
in
{
name = old;
value =
lib.warnOnInstantiate "haskell.packages.*.${old} has been renamed to haskell.packages.*.${new}"
self.${new};
}
)
)
140 changes: 128 additions & 12 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading