diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index e049064c7564..598f4663f909 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -111,4 +111,9 @@ sed -r \ # ShellCheck: latest version of command-line dev tool. # Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs. +# Work around Stackage LTS including a bogus version of cassava which has been deprecated on Hackage. +# See . +# TODO(@sternenseemann): drop this once the situation has been resolved in Stackage LTS +sed -e 's/cassava ==0.5.5.0/cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0/' -i "$stackage_config" + echo "$old_version -> $version" diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index db78fcc99571..87bbe230daa6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -330,7 +330,7 @@ default-package-overrides: - cased ==0.1.0.0 - cases ==0.1.4.4 - casing ==0.1.4.1 - - cassava ==0.5.5.0 + - cassava >= 0.5.4.0 && (> 0.5.5.0 || < 0.5.5.0) && < 0.6.0.0 - cassava-conduit ==0.6.6 - cassava-megaparsec ==2.1.1 - cast ==0.1.0.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f2668981f80e..62aaf79fab58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -133925,7 +133925,7 @@ self: { } ) { }; - cassava_0_5_4_1 = callPackage ( + cassava = callPackage ( { mkDerivation, array, @@ -133984,71 +133984,6 @@ self: { ]; description = "A CSV parsing and encoding library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - } - ) { }; - - cassava = callPackage ( - { - mkDerivation, - array, - attoparsec, - base, - bytestring, - containers, - deepseq, - hashable, - HUnit, - Only, - QuickCheck, - quickcheck-instances, - scientific, - test-framework, - test-framework-hunit, - test-framework-quickcheck2, - text, - text-short, - unordered-containers, - vector, - }: - mkDerivation { - pname = "cassava"; - version = "0.5.5.0"; - sha256 = "1rcc7l93g80mbmfvbz0bclsldkz19yyfyazfp8h471856sj5a9kp"; - revision = "1"; - editedCabalFile = "12d4zbpm1xm2zs3mshwas295n1ab970354x89ciy8smddjn8i5sm"; - configureFlags = [ "-f-bytestring--lt-0_10_4" ]; - libraryHaskellDepends = [ - array - attoparsec - base - bytestring - containers - deepseq - hashable - Only - scientific - text - text-short - unordered-containers - vector - ]; - testHaskellDepends = [ - base - bytestring - HUnit - QuickCheck - quickcheck-instances - scientific - test-framework - test-framework-hunit - test-framework-quickcheck2 - text - unordered-containers - vector - ]; - description = "A CSV parsing and encoding library"; - license = lib.licenses.bsd3; } ) { };