diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index f237cf6b9acb..f3a5fed12ac0 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -45,6 +45,7 @@ sed -r \ -e '/ distribution-nixpkgs /d' \ -e '/ jailbreak-cabal /d' \ -e '/ language-nix /d' \ + -e '/ cabal-install /d' \ < "${tmpfile}.new" >> $stackage_config if [[ "${1:-}" == "--do-commit" ]]; then diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 8fcad5d0b2bb..cac225085bd3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -263,7 +263,6 @@ default-package-overrides: - cabal-file ==0.1.1 - cabal-file-th ==0.2.7 - cabal-flatpak ==0.1.0.3 - - cabal-install ==3.4.1.0 - cabal-plan ==0.7.2.1 - cabal-rpm ==2.0.10 - Cabal-syntax ==3.6.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 343b486e6f35..773dbf6e2a0c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -49753,39 +49753,6 @@ self: { }) {}; "cabal-install" = callPackage - ({ mkDerivation, array, async, base, base16-bytestring, binary - , bytestring, Cabal, containers, cryptohash-sha256, deepseq - , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, lukko, mtl, network-uri, parsec, pretty, process - , random, regex-base, regex-posix, resolv, stm, tar, text, time - , transformers, unix, zlib - }: - mkDerivation { - pname = "cabal-install"; - version = "3.4.1.0"; - sha256 = "121az3z76b9696bxm235jdlria9rr61f6117s4d26p17ipy8pbb1"; - revision = "2"; - editedCabalFile = "11ik469w43dq36aavaiph90ri2i58qpi5ajqm76sq0wkh1fdmk57"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array async base base16-bytestring binary bytestring Cabal - containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP lukko mtl network-uri - parsec pretty process random regex-base regex-posix resolv stm tar - text time transformers unix zlib - ]; - doCheck = false; - postInstall = '' - mkdir -p $out/share/bash-completion - mv bash-completion $out/share/bash-completion/completions - ''; - description = "The command-line interface for Cabal and Hackage"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "cabal-install_3_6_2_0" = callPackage ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security @@ -49815,7 +49782,6 @@ self: { ''; description = "The command-line interface for Cabal and Hackage"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {};