gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sternenseemann
2025-11-26 09:34:59 +00:00
committed by GitHub
parent 7650609202 8780e5b41f
commit d739a500ca
6 changed files with 178 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+3 -3
View File
@@ -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;
pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+3 -3
View File
@@ -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;
pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+3 -3
View File
@@ -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;
pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+5 -3
View File
@@ -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 = [
@@ -33,6 +34,7 @@ mkDerivation {
lens
parsec-class
pretty
process
QuickCheck
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
pkgs/development/haskell-modules/configuration-nix.nix
+36
View File
@@ -1551,6 +1551,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.
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;
@@ -2130,3 +2142,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};
}
)
)
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+128 -12
View File
@@ -8,7 +8,7 @@
self: {
"2captcha" = callPackage (
_2captcha = callPackage (
{
mkDerivation,
aeson,
@@ -49,7 +49,7 @@ self: {
}
) { };
"3d-graphics-examples" = callPackage (
_3d-graphics-examples = callPackage (
{
mkDerivation,
base,
@@ -76,7 +76,7 @@ self: {
}
) { };
"3dmodels" = callPackage (
_3dmodels = callPackage (
{
mkDerivation,
attoparsec,
@@ -103,7 +103,7 @@ self: {
}
) { };
"4Blocks" = callPackage (
_4Blocks = callPackage (
{
mkDerivation,
base,
@@ -7793,6 +7793,49 @@ self: {
}
) { };
ConcurrentUtils = callPackage (
{
mkDerivation,
_assert,
array,
atl,
base,
containers,
extra,
list-extras,
monad-loops,
monads-tf,
parallel,
profunctors,
strict,
time,
vector,
}:
mkDerivation {
pname = "ConcurrentUtils";
version = "0.5.0.0";
sha256 = "1caixp7gdhjsnlr79kmc4pd4ky663x9kid9i998qrd6anbrm2i8b";
libraryHaskellDepends = [
_assert
array
atl
base
containers
extra
list-extras
monad-loops
monads-tf
parallel
profunctors
strict
time
vector
];
description = "Concurrent utilities";
license = lib.licenses.gpl2Only;
}
) { };
Concurrential = callPackage (
{
mkDerivation,
@@ -85939,7 +85982,7 @@ self: {
}
) { ghc-binary = null; };
"assert" = callPackage (
_assert = callPackage (
{
mkDerivation,
base,
@@ -94930,10 +94973,8 @@ self: {
];
description = "Specify axioms for type classes and quickCheck all available instances";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
}
) { control-invariants = null; };
) { };
azimuth-hs = callPackage (
{
@@ -161945,6 +161986,51 @@ self: {
}
) { };
control-invariants = callPackage (
{
mkDerivation,
_assert,
base,
containers,
data-default,
deepseq,
either,
lens,
mtl,
QuickCheck,
semigroups,
template-haskell,
th-lift,
th-printf,
transformers,
}:
mkDerivation {
pname = "control-invariants";
version = "0.1.0.0";
sha256 = "0qfw2g04k3jd9dqj1m46rf9dz767y3lkny8pj4zp3mnr704wnwwr";
revision = "1";
editedCabalFile = "0f8px9rf0d6bz0hm52iw5v89ada7jgj5lydpsr6x542hbq953wz3";
libraryHaskellDepends = [
_assert
base
containers
data-default
deepseq
either
lens
mtl
QuickCheck
semigroups
template-haskell
th-lift
th-printf
transformers
];
description = "Invariants and contract monitoring";
license = lib.licenses.mit;
}
) { };
control-iso = callPackage (
{
mkDerivation,
@@ -225196,10 +225282,8 @@ self: {
];
description = "Existential types with lens-like accessors";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
}
) { control-invariants = null; };
) { };
exists = callPackage (
{
@@ -374432,7 +374516,7 @@ self: {
}
) { };
"if" = callPackage (
_if = callPackage (
{ mkDerivation, base }:
mkDerivation {
pname = "if";
@@ -698867,6 +698951,27 @@ self: {
}
) { };
_type = callPackage (
{
mkDerivation,
base,
containers,
template-haskell,
}:
mkDerivation {
pname = "type";
version = "0.2.0";
sha256 = "13xkbj1nimgs9cm5mdqx52m1qzjgkzcxxjibqb1g8rmjgy17yj5m";
libraryHaskellDepends = [
base
containers
template-haskell
];
description = "Dynamic casting library with support for arbitrary rank type kinds";
license = lib.licenses.bsd3;
}
) { };
type-aligned = callPackage (
{ mkDerivation, base }:
mkDerivation {
@@ -734251,6 +734356,17 @@ self: {
}
) { };
_with = callPackage (
{ mkDerivation }:
mkDerivation {
pname = "with";
version = "0.1.0";
sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701";
description = "Simple open product type";
license = lib.licenses.bsd3;
}
) { };
with-index = callPackage (
{ mkDerivation, base }:
mkDerivation {