diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 429275753071..3fa9c44e7cd7 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2023-07-10"; + version = "unstable-2023-08-15"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/6b3d10bd0e9b2ec6f0667402609cfa260fdaf0ad.tar.gz"; - sha256 = "0vd1q01pg5nmkahmvvkbca3hgb54hgh73mjn9np8z9bs2r03csgb"; + url = "https://github.com/NixOS/cabal2nix/archive/0365d9b77086d26ca5197fb48019cedbb0dce5d2.tar.gz"; + sha256 = "15aia2v05cmblabhb287cf1yqy4dlzw0g905h79fcvkgygnn2ib8"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0994cf04d526..c48e7feaee2f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42847,7 +42847,7 @@ self: { "bidi-icu" = callPackage ({ mkDerivation, base, containers, data-default, ghc-prim, hspec - , icu-uc, inline-c, primitive, tasty, tasty-hspec, template-haskell + , icu, inline-c, primitive, tasty, tasty-hspec, template-haskell , text, transformers, vector }: mkDerivation { @@ -42858,7 +42858,7 @@ self: { base containers data-default ghc-prim inline-c primitive template-haskell text transformers vector ]; - libraryPkgconfigDepends = [ icu-uc ]; + libraryPkgconfigDepends = [ icu ]; testHaskellDepends = [ base data-default ghc-prim hspec primitive tasty tasty-hspec text vector @@ -42867,7 +42867,7 @@ self: { license = "(BSD-2-Clause OR Apache-2.0)"; hydraPlatforms = lib.platforms.none; broken = true; - }) {icu-uc = null;}; + }) {inherit (pkgs) icu;}; "bidirectional" = callPackage ({ mkDerivation, base, hedgehog, mtl, profunctors }: @@ -289138,9 +289138,8 @@ self: { "text-icu" = callPackage ({ mkDerivation, array, base, bytestring, deepseq, directory - , ghc-prim, HUnit, icu, icu-i18n, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time + , ghc-prim, HUnit, icu, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time }: mkDerivation { pname = "text-icu"; @@ -289148,7 +289147,7 @@ self: { sha256 = "0frxrsj580ipgb3pdvw1msdz8d63j02vvrqhzjja3ixlq24am69d"; libraryHaskellDepends = [ base bytestring deepseq text time ]; librarySystemDepends = [ icu ]; - libraryPkgconfigDepends = [ icu-i18n ]; + libraryPkgconfigDepends = [ icu ]; testHaskellDepends = [ array base bytestring deepseq directory ghc-prim HUnit QuickCheck random test-framework test-framework-hunit @@ -289156,7 +289155,7 @@ self: { ]; description = "Bindings to the ICU library"; license = lib.licenses.bsd3; - }) {inherit (pkgs) icu; icu-i18n = null;}; + }) {inherit (pkgs) icu;}; "text-icu-normalized" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, containers