Skip to content

Commit ca3da94

Browse files
haskellPackages.cabal2nix-unstable: 2025-06-14 -> 2025-09-06
See also 1f230cd. Resolves #439496.
1 parent 507d996 commit ca3da94

3 files changed

Lines changed: 15 additions & 26 deletions

File tree

pkgs/development/haskell-modules/cabal2nix-unstable.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
}:
3636
mkDerivation {
3737
pname = "cabal2nix";
38-
version = "unstable-2025-06-14";
38+
version = "unstable-2025-09-06";
3939
src = fetchzip {
40-
url = "https://github.com/NixOS/cabal2nix/archive/e9e2ebd9ab5c89c6cd55dd2c568dd46086f2addb.tar.gz";
41-
sha256 = "0in0vab4vihamdhf0zs8y22dwm7h4fqzryq47cxb48cxg29rfz9y";
40+
url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz";
41+
sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7";
4242
};
4343
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
4444
isLibrary = true;

pkgs/development/haskell-modules/configuration-nix.nix

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -771,15 +771,6 @@ builtins.intersectAttrs super {
771771
colour = dontCheck super.colour;
772772
spatial-rotations = dontCheck super.spatial-rotations;
773773

774-
# This package is marked broken, but it causes some evail failures for nixpkgs-review.
775-
# cabal2nix still adds opencv3, which has been removed. It makes no sense to add opencv4,
776-
# because the haskell package is only targeting opencv 3.x specifically.
777-
# TODO: Remove this package entirely from hackage-packages.nix. It's broken and has been last
778-
# updated in 2018.
779-
opencv = overrideCabal (drv: {
780-
libraryPkgconfigDepends = [ ];
781-
}) super.opencv;
782-
783774
LDAP = dontCheck (
784775
overrideCabal (drv: {
785776
librarySystemDepends = drv.librarySystemDepends or [ ] ++ [ pkgs.cyrus_sasl.dev ];

pkgs/development/haskell-modules/hackage-packages.nix

Lines changed: 12 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)