diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 7daf09ffe0dd..15a63ec9c5c7 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-08-10"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e9e2ebd9ab5c89c6cd55dd2c568dd46086f2addb.tar.gz"; - sha256 = "0in0vab4vihamdhf0zs8y22dwm7h4fqzryq47cxb48cxg29rfz9y"; + url = "https://github.com/NixOS/cabal2nix/archive/31c6db234a905bbf4e8f34c5a986f294b231de0a.tar.gz"; + sha256 = "1ifbmcm5k8mxcpq4kscfc5ddcknawxz6a4ak30jmf0kk1lrfsikf"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index ac9e1bf36114..6a06ab85ab71 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3503,7 +3503,6 @@ dont-distribute-packages: - twentefp-graphs - twentefp-rosetree - twentefp-trees - - twentyseven - twfy-api-client - twidge - twilight-stm diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e2914af5bb92..97d33bbb4bac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -226637,6 +226637,7 @@ self: { gflags, ghc, ghci, + glog, hashable, haskell-src-exts, hspec, @@ -226646,7 +226647,6 @@ self: { json, lens, libevent, - libglog, lifted-base, mangle, monad-control, @@ -226735,8 +226735,8 @@ self: { double-conversion fmt gflags + glog libevent - libglog ]; testHaskellDepends = [ aeson @@ -226778,8 +226778,8 @@ self: { inherit (pkgs) double-conversion; inherit (pkgs) fmt; inherit (pkgs) gflags; + inherit (pkgs) glog; inherit (pkgs) libevent; - libglog = null; }; "fbmessenger-api" = callPackage ( @@ -237683,7 +237683,7 @@ self: { boost_filesystem, boost_program_options, fmt, - libglog, + glog, libunwind, openssl, snappy, @@ -237699,7 +237699,7 @@ self: { ]; libraryPkgconfigDepends = [ fmt - libglog + glog libunwind openssl snappy @@ -237714,7 +237714,7 @@ self: { boost_filesystem = null; boost_program_options = null; inherit (pkgs) fmt; - libglog = null; + inherit (pkgs) glog; inherit (pkgs) libunwind; inherit (pkgs) openssl; inherit (pkgs) snappy; @@ -270116,6 +270116,7 @@ self: { ghc-compact, ghc-prim, Glob, + glog, gtest_main, happy, hashable, @@ -270130,9 +270131,7 @@ self: { IntervalMap, json, libfolly, - libglog, libunwind, - libxxhash, mangle, microlens, monad-control, @@ -270184,6 +270183,7 @@ self: { vector-algorithms, wai, warp, + xxHash, yaml, }: mkDerivation { @@ -270276,12 +270276,12 @@ self: { libraryPkgconfigDepends = [ fmt gflags + glog icu libfolly - libglog libunwind - libxxhash rocksdb + xxHash ]; libraryToolDepends = [ alex @@ -270419,13 +270419,13 @@ self: { atomic = null; inherit (pkgs) fmt; inherit (pkgs) gflags; + inherit (pkgs) glog; gtest_main = null; inherit (pkgs) icu; libfolly = null; - libglog = null; inherit (pkgs) libunwind; - libxxhash = null; inherit (pkgs) rocksdb; + inherit (pkgs) xxHash; }; "glfw-group" = callPackage ( @@ -319392,7 +319392,6 @@ self: { inline-c, inline-c-cpp, nix, - nix-flake, process, protolude, QuickCheck, @@ -319432,10 +319431,7 @@ self: { vector ]; librarySystemDepends = [ boost ]; - libraryPkgconfigDepends = [ - nix - nix-flake - ]; + libraryPkgconfigDepends = [ nix ]; testHaskellDepends = [ aeson base @@ -319462,7 +319458,6 @@ self: { { inherit (pkgs) boost; inherit (pkgs) nix; - nix-flake = null; }; "hercules-ci-cnix-store" = @@ -420401,7 +420396,7 @@ self: { base, bytestring, derive-storable, - llama, + llama-cpp, tasty, tasty-hunit, }: @@ -420414,7 +420409,7 @@ self: { bytestring derive-storable ]; - librarySystemDepends = [ llama ]; + librarySystemDepends = [ llama-cpp ]; testHaskellDepends = [ base bytestring @@ -420427,7 +420422,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { llama = null; }; + ) { inherit (pkgs) llama-cpp; }; "llrbtree" = callPackage ( { mkDerivation, base }: @@ -681582,7 +681577,6 @@ self: { ]; description = "Rubik's cube solver"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "twentyseven"; } ) { }; @@ -727535,13 +727529,13 @@ self: { deepseq, digest, hashable, - libxxhash, murmur-hash, QuickCheck, tasty, tasty-bench, tasty-quickcheck, text, + xxHash, }: mkDerivation { pname = "xxhash-ffi"; @@ -727555,7 +727549,7 @@ self: { hashable text ]; - libraryPkgconfigDepends = [ libxxhash ]; + libraryPkgconfigDepends = [ xxHash ]; testHaskellDepends = [ base bytestring @@ -727578,7 +727572,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { libxxhash = null; }; + ) { inherit (pkgs) xxHash; }; "xz" = callPackage ( {