diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 7daf09ffe0dd..168e1f885c7d 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 73ed3fb95351..d08240cacf56 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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 ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 015ed9e3c7f2..85eea82315fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -228958,6 +228958,7 @@ self: { gflags, ghc, ghci, + glog, hashable, haskell-src-exts, hspec, @@ -228967,7 +228968,6 @@ self: { json, lens, libevent, - libglog, lifted-base, mangle, monad-control, @@ -229055,8 +229055,8 @@ self: { double-conversion fmt gflags + glog libevent - libglog ]; testHaskellDepends = [ aeson @@ -229098,8 +229098,8 @@ self: { inherit (pkgs) double-conversion; inherit (pkgs) fmt; inherit (pkgs) gflags; + inherit (pkgs) glog; inherit (pkgs) libevent; - libglog = null; }; "fbmessenger-api" = callPackage ( @@ -424503,7 +424503,7 @@ self: { base, bytestring, derive-storable, - llama, + llama-cpp, tasty, tasty-hunit, }: @@ -424516,7 +424516,7 @@ self: { bytestring derive-storable ]; - librarySystemDepends = [ llama ]; + librarySystemDepends = [ llama-cpp ]; testHaskellDepends = [ base bytestring @@ -424529,7 +424529,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { llama = null; }; + ) { inherit (pkgs) llama-cpp; }; "llrbtree" = callPackage ( { mkDerivation, base }: @@ -491279,7 +491279,7 @@ self: { JuicyPixels, lens, linear, - opencv3, + opencv, primitive, QuickCheck, repa, @@ -491319,7 +491319,7 @@ self: { transformers vector ]; - libraryPkgconfigDepends = [ opencv3 ]; + libraryPkgconfigDepends = [ opencv ]; testHaskellDepends = [ base bytestring @@ -491348,13 +491348,12 @@ self: { criterion repa ]; - hardeningDisable = [ "bindnow" ]; description = "Haskell binding to OpenCV-3.x"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (pkgs) opencv3; }; + ) { inherit (pkgs) opencv; }; "opencv-extra" = callPackage ( { @@ -500315,7 +500314,6 @@ self: { text yaml ]; - doCheck = false; description = "Supports using pandoc with citeproc"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -734456,13 +734454,13 @@ self: { deepseq, digest, hashable, - libxxhash, murmur-hash, QuickCheck, tasty, tasty-bench, tasty-quickcheck, text, + xxHash, }: mkDerivation { pname = "xxhash-ffi"; @@ -734476,7 +734474,7 @@ self: { hashable text ]; - libraryPkgconfigDepends = [ libxxhash ]; + libraryPkgconfigDepends = [ xxHash ]; testHaskellDepends = [ base bytestring @@ -734500,7 +734498,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { libxxhash = null; }; + ) { inherit (pkgs) xxHash; }; "xz" = callPackage ( {