Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2025-06-14";
version = "unstable-2025-09-06";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/e9e2ebd9ab5c89c6cd55dd2c568dd46086f2addb.tar.gz";
sha256 = "0in0vab4vihamdhf0zs8y22dwm7h4fqzryq47cxb48cxg29rfz9y";
url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz";
sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
Expand Down
9 changes: 0 additions & 9 deletions pkgs/development/haskell-modules/configuration-nix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -771,15 +771,6 @@ builtins.intersectAttrs super {
colour = dontCheck super.colour;
spatial-rotations = dontCheck super.spatial-rotations;

# This package is marked broken, but it causes some evail failures for nixpkgs-review.
# cabal2nix still adds opencv3, which has been removed. It makes no sense to add opencv4,
# because the haskell package is only targeting opencv 3.x specifically.
# TODO: Remove this package entirely from hackage-packages.nix. It's broken and has been last
# updated in 2018.
opencv = overrideCabal (drv: {
libraryPkgconfigDepends = [ ];
}) super.opencv;

LDAP = dontCheck (
overrideCabal (drv: {
librarySystemDepends = drv.librarySystemDepends or [ ] ++ [ pkgs.cyrus_sasl.dev ];
Expand Down
26 changes: 12 additions & 14 deletions pkgs/development/haskell-modules/hackage-packages.nix

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

Loading