Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
49b3407
haskell.packages.ghc94.haskell-language-server: fix ref to config
sternenseemann Nov 3, 2025
a4441b3
Merge commit 'cef1398c495876ef5e5b02fb4f6291ceb3f6f5b5' into haskell-…
wolfgangwalther Nov 5, 2025
6786a51
haskellPackages.proto3-suite: fix build
alexfmpe Nov 4, 2025
0ecf902
haskellPackages.duckdb-ffi: mark as broken
sternenseemann Nov 4, 2025
5e86707
haskell.packages.ghc96.haskell-language-server: fix build
wolfgangwalther Nov 3, 2025
eb05db8
haskell.packages.ghc98.haskell-language-server: fix build
wolfgangwalther Nov 3, 2025
6d6ef70
Merge cc9d3a57daf6d1b3542326db274d4fa50ea81836 into haskell-updates
nixpkgs-ci[bot] Nov 6, 2025
e272163
Merge de2bd218354f824294170423eb7808f8a1a611d8 into haskell-updates
nixpkgs-ci[bot] Nov 6, 2025
89b60df
postgrest: 14.0 -> 14.1
wolfgangwalther Nov 6, 2025
5a80601
haskellPackages: stackage LTS 24.16 -> LTS 24.19
sternenseemann Nov 11, 2025
4d5a2f4
haskellPackages.pdftotext: move jailbreak into overrideCabal
sternenseemann Nov 7, 2025
df4f4e2
haskellPackages.pdftotext: remove redundant poppler input
sternenseemann Nov 11, 2025
f3d6f2c
haskellPackages.crucible*: adjust to package updates
sternenseemann Nov 14, 2025
358af58
haskellPackages.gi-gtk-hs: drop obsolete override
sternenseemann Nov 14, 2025
41d975f
Merge commit 61630d4ab5d87936 into haskell-updates
sternenseemann Nov 14, 2025
9d8a1ff
haskellPackages.text-icu: disable homebrew flag on darwin
mpscholten Nov 16, 2025
f0c4be0
haskellPackages.text-icu: disable homebrew flag (#462106)
wolfgangwalther Nov 17, 2025
7e867e0
Merge commit 'c840f3de26e798e19e0e6ed7bf8decf9cfb34d2f' into haskell-…
wolfgangwalther Nov 18, 2025
c7331a9
Merge da72f8229bc9f1d9a64cfa54d1b35fd6f2bd0eb6 into haskell-updates
nixpkgs-ci[bot] Nov 18, 2025
65344d2
Merge 225bffcec8104e19a69efdf52c2395e3f00fd1c5 into haskell-updates
nixpkgs-ci[bot] Nov 19, 2025
19681a9
Merge 482eaefbd43e065787da7521c43bdf427c5d83b2 into haskell-updates
nixpkgs-ci[bot] Nov 20, 2025
0a9cc0a
Merge baa40a5be0cd536fc753a74fe763a75476abb2a7 into haskell-updates
nixpkgs-ci[bot] Nov 21, 2025
3e6951e
git-annex: update sha256 for 10.20251029
sternenseemann Nov 21, 2025
f566020
haskellPackages.proto3-wire: update list of required patches
sternenseemann Nov 21, 2025
b44e047
top-level/release-haskell.nix: stop redundantly git-annex w/ 9.10
sternenseemann Nov 21, 2025
7024499
git-annex: remove compat code for GHC < 9.10
sternenseemann Nov 21, 2025
256eca9
Merge 64a5bece096e4d76a87b1b4c41e055253b95839b into haskell-updates
nixpkgs-ci[bot] Nov 22, 2025
6befea2
git-annex: remove compat code for GHC < 9.10 (#463791)
sternenseemann Nov 22, 2025
d884d12
haskell.packages.ghc948.crypton-x509-store: pin to 1.6.11
sternenseemann Nov 22, 2025
abd5d95
Merge 60d40a82c9c7775be1713df341885790d8065bcf into haskell-updates
nixpkgs-ci[bot] Nov 23, 2025
a638d36
Merge dbff0491a2f9961ba647b5f022195891c2924254 into haskell-updates
nixpkgs-ci[bot] Nov 24, 2025
5a86e3d
haskellPackages.cabal2nix-unstable: 2025-11-11 -> 2025-11-20
sternenseemann Nov 20, 2025
7b3164b
haskell.packages.ghc948.crypton-x509-store: pin to 1.6.11 (#463970)
wolfgangwalther Nov 24, 2025
d2f9817
haskell.packages.ghc94.hlint: pin to 3.8
wolfgangwalther Nov 24, 2025
bff0d7b
haskell.packages.ghc94.hlint: pin to 3.6.1
wolfgangwalther Nov 24, 2025
7600c46
haskellPackages: stackage LTS 24.19 -> LTS 24.21
wolfgangwalther Nov 24, 2025
6954351
haskellPackages: run unbreak.nu
wolfgangwalther Nov 24, 2025
8780e5b
haskellPackages: _ prefix attribute names that would need quoting
sternenseemann Oct 19, 2025
464aa22
Merge de3255d9ebab95d73cef7167991a8098083541a9 into haskell-updates
nixpkgs-ci[bot] Nov 25, 2025
aa87be7
haskellPackages: stackage LTS 24.19 -> LTS 24.21 (#464592)
wolfgangwalther Nov 25, 2025
7650609
Merge f087502faa7cd5fc268327cb7092e0383c65fa71 into haskell-updates
nixpkgs-ci[bot] Nov 26, 2025
d739a50
haskellPackages: _ prefix attribute names that would need quoting (#4…
sternenseemann Nov 26, 2025
75d3a3d
Merge 45af851ce7b0c1a95d7d901bb7a9816c3cb2378f into haskell-updates
nixpkgs-ci[bot] Nov 26, 2025
f982087
Merge fb451ae6708d0cc2ee8378c241448e89d446cd52 into haskell-updates
nixpkgs-ci[bot] Nov 27, 2025
758f58c
Merge bc0da6f230efdc7772bac7f1e6f925da75145728 into haskell-updates
nixpkgs-ci[bot] Nov 28, 2025
18d6699
git-annex: update sha256 for 10.20251114
sternenseemann Nov 28, 2025
62a3860
hledger-check-fancyassertions: update sha256 for 1.50.3
sternenseemann Nov 28, 2025
b264527
Merge 6a49303095abc094ee77dc243a9e351b642e8e75 into haskell-updates
nixpkgs-ci[bot] Nov 29, 2025
c919544
haskellPackages: mark builds failing on hydra as broken
wolfgangwalther Nov 29, 2025
2a3ef27
haskellPackages._4Blocks: fix transitive broken
wolfgangwalther Nov 29, 2025
6c0b980
haskellPackages._type: mark broken
wolfgangwalther Nov 29, 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
2 changes: 1 addition & 1 deletion pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchurl {
name = "hledger-check-fancyassertion-${version}.hs";
url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
hash = "sha256-p1JvPHSB5hkfZsTq1sSL0mxCRkhZu1zkpXTELVNFE64=";
hash = "sha256-Zokrrcy9CfVV2tNI1DDsjqC+PcTdlMdit4O4Y1gP1O4=";
};

dontUnpack = true;
Expand Down
8 changes: 4 additions & 4 deletions pkgs/data/misc/hackage/pin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"commit": "598216fa2815cc50449239d72043b12a04a83709",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/598216fa2815cc50449239d72043b12a04a83709.tar.gz",
"sha256": "030yfbdzzdsxfjin97kl1kzqqnvkvjvjfns3p84xkq59fw8096cr",
"msg": "Update from Hackage at 2025-10-22T21:20:29Z"
"commit": "24e42920d74ce9ac5c0c05264079d55cec49e82b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/24e42920d74ce9ac5c0c05264079d55cec49e82b.tar.gz",
"sha256": "1kmf1wg09gsw06525mc0y91x9jy81amhd1sd3b7gl1swnj3dzqqf",
"msg": "Update from Hackage at 2025-11-24T11:39:51Z"
}
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
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
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
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
131 changes: 41 additions & 90 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -594,42 +594,36 @@ with haskellLib;
# but we want e.g. completions as well. See
# https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
# or git-annex @ 3571b077a1244330cc736181ee04b4d258a78476 doc/bugs/bash_completion_file_is_missing*
git-annex = lib.pipe super.git-annex (
[
(overrideCabal (drv: {
src = pkgs.fetchgit {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "sha256-HkUrc9T8qpGsONIuM7ciKbx4vuJTOLFNxneIPte0wv4=";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
# mismatch on darwin.
postFetch = ''
rm -r $out/doc/?ndroid*
'';
};
git-annex = lib.pipe super.git-annex [
(overrideCabal (drv: {
src = pkgs.fetchgit {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "sha256-+OLFMrqpf1Ooy7CQ9S+N/H5R5+aHQtbO1pYwDF4ln8A=";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
# mismatch on darwin.
postFetch = ''
rm -r $out/doc/?ndroid*
'';
};

patches = drv.patches or [ ] ++ [
# Prevent .desktop files from being installed to $out/usr/share.
# TODO(@sternenseemann): submit upstreamable patch resolving this
# (this should be possible by also taking PREFIX into account).
./patches/git-annex-no-usr-prefix.patch
];
patches = drv.patches or [ ] ++ [
# Prevent .desktop files from being installed to $out/usr/share.
# TODO(@sternenseemann): submit upstreamable patch resolving this
# (this should be possible by also taking PREFIX into account).
./patches/git-annex-no-usr-prefix.patch
];

postPatch = ''
substituteInPlace Makefile \
--replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \
'InstallDesktopFile git-annex'
'';
}))
]
++ lib.optionals (lib.versionOlder self.ghc.version "9.10") [
(disableCabalFlag "OsPath")
(addBuildDepends [ self.filepath-bytestring ])
]
);
postPatch = ''
substituteInPlace Makefile \
--replace-fail 'InstallDesktopFile $(PREFIX)/bin/git-annex' \
'InstallDesktopFile git-annex'
'';
}))
];

# Too strict bounds on servant
# Pending a hackage revision: https://github.com/berberman/arch-web/commit/5d08afee5b25e644f9e2e2b95380a5d4f4aa81ea#commitcomment-89230555
Expand Down Expand Up @@ -2806,12 +2800,12 @@ with haskellLib;
doJailbreak
# 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
(overrideSrc rec {
version = "14.0";
version = "14.1";
src = pkgs.fetchFromGitHub {
owner = "PostgREST";
repo = "postgrest";
rev = "v${version}";
hash = "sha256-GokYeVDuVdIbowU6xE3l8iaGbH4jnpqQFy/E+sb/Unw=";
hash = "sha256-VGmo0Y8Q86euPlu3AhMmcmy3rintNy6s9efpUaliBWY=";
};
})
];
Expand Down Expand Up @@ -2958,24 +2952,14 @@ with haskellLib;
# https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963
snappy-hs = doJailbreak super.snappy-hs;

# Too strict upper bound on doctest
# https://github.com/awakesecurity/proto3-wire/pull/111
proto3-wire = appendPatches [
(fetchpatch {
# https://github.com/awakesecurity/proto3-wire/pull/108
name = "add-reverse-encoders-for-packed-repeated-fields.patch";
url = "https://github.com/awakesecurity/proto3-wire/commit/d4376fb6f1c1ac03ee8ec5c5793700ca6508ea70.patch";
hash = "sha256-vtEYg/jLoTn1YRVhQJi6kyta+U4XiWeS7i1ZSN7BYf8=";
includes = [
"**.cabal"
"*.hs"
];
})
(fetchpatch {
# https://github.com/awakesecurity/proto3-wire/pull/111
name = "support-LTS-24.patch";
url = "https://github.com/awakesecurity/proto3-wire/commit/35fd88c4daf6643135db6da9ab6ed6d6f33eb3de.patch";
url = "https://github.com/awakesecurity/proto3-wire/commit/fcc53d9935b64b6d8aaf65c8cef17f4bbed56867.patch";
hash = "sha256-GzXlweRshVLA29xVHhJSRIU40y+KtAplIqfvp0I8cY0=";
})

] super.proto3-wire;

# 2024-07-27: building test component requires non-trivial custom build steps
Expand Down Expand Up @@ -3109,7 +3093,7 @@ with haskellLib;
]
) super)
what4
what4_1_7
what4_1_7_2
;

copilot-theorem = lib.pipe super.copilot-theorem [
Expand Down Expand Up @@ -3171,29 +3155,15 @@ with haskellLib;
# https://github.com/tweag/monad-bayes/issues/378
(doJailbreak super.monad-bayes);

crucible =
lib.pipe
(super.crucible.override {
what4 = self.what4_1_7;
})
[
# 2025-04-13: jailbreak to allow th-abstraction >= 0.7
(warnAfterVersion "0.7.2")
doJailbreak

# Prevent clashes with now exported Prelude.foldl'
(appendPatch (
pkgs.fetchpatch {
name = "base-4.20-foldl'.patch";
url = "https://github.com/GaloisInc/crucible/commit/10f372e4b0389dd3966e04163dcd67d71e651709.patch";
relative = "crucible";
sha256 = "sha256-frxTs5SB1ENjH+X0lIlQ8k6pDIDOANylrqIOQpEtObU=";
}
))
];
# 2025-04-13: jailbreak to allow th-abstraction >= 0.7
crucible = doJailbreak (
super.crucible.override {
what4 = self.what4_1_7_2;
}
);

crucible-llvm = super.crucible-llvm.override {
what4 = self.what4_1_7;
what4 = self.what4_1_7_2;
};

# Test suite invokes cabal-install in a way incompatible with our generic builder
Expand Down Expand Up @@ -3331,25 +3301,6 @@ with haskellLib;
stripe-signature = doJailbreak super.stripe-signature;
stripe-wreq = doJailbreak super.stripe-wreq;

# 2025-10-12: gi-gtk was renamed to gi-gtk3
# https://github.com/haskell-gi/haskell-gi/issues/478
gi-gtk-hs =
appendPatches
[
(pkgs.fetchpatch {
name = "gi-gtk-hs-use-gtk3.patch";
url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch";
sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA=";
relative = "gi-gtk-hs";
})
]
(
super.gi-gtk-hs.override {
gi-gdk = self.gi-gdk3;
gi-gtk = self.gi-gtk3;
}
);

# 2025-08-04: Disable failing testcases. It would feel bad to disable all the
# checks in a cryptography related package.
botan-low = overrideCabal (drv: {
Expand Down
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,10 @@ self: super:
'';
}) super.rio;

# Don't use homebrew icu on macOS
# https://github.com/NixOS/nixpkgs/issues/462046
text-icu = disableCabalFlag "homebrew" super.text-icu;

# https://github.com/haskell-crypto/cryptonite/issues/360
cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite;

Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ self: super: {
++ drv.testFlags or [ ];
}) (doJailbreak super.hpack);

# Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4
crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11;

# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;

Expand Down Expand Up @@ -142,6 +145,8 @@ self: super: {
"haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs"
(markBroken super.haskell-language-server);

hlint = doDistribute self.hlint_3_6_1;

# directory-ospath-streaming requires the ospath API in core packages
# filepath, directory and unix.
stan = super.stan.override {
Expand Down
Loading
Loading