haskellPackages.cabal-install: ignore stackage bound

We have generally shipped the latest cabal-install version. Stackage has
re-added cabal-install recently which caused cabal-install to get
downgraded to 3.4 to match the Cabal version shipped by GHC 9.0.2. This
commit reverts that change.
This commit is contained in:
sternenseemann 2022-02-27 11:47:32 +01:00
parent cb63ca9b2d
commit f10a7e5a3b
3 changed files with 1 additions and 35 deletions

@ -45,6 +45,7 @@ sed -r \
-e '/ distribution-nixpkgs /d' \ -e '/ distribution-nixpkgs /d' \
-e '/ jailbreak-cabal /d' \ -e '/ jailbreak-cabal /d' \
-e '/ language-nix /d' \ -e '/ language-nix /d' \
-e '/ cabal-install /d' \
< "${tmpfile}.new" >> $stackage_config < "${tmpfile}.new" >> $stackage_config
if [[ "${1:-}" == "--do-commit" ]]; then if [[ "${1:-}" == "--do-commit" ]]; then

@ -263,7 +263,6 @@ default-package-overrides:
- cabal-file ==0.1.1 - cabal-file ==0.1.1
- cabal-file-th ==0.2.7 - cabal-file-th ==0.2.7
- cabal-flatpak ==0.1.0.3 - cabal-flatpak ==0.1.0.3
- cabal-install ==3.4.1.0
- cabal-plan ==0.7.2.1 - cabal-plan ==0.7.2.1
- cabal-rpm ==2.0.10 - cabal-rpm ==2.0.10
- Cabal-syntax ==3.6.0.0 - Cabal-syntax ==3.6.0.0

@ -49753,39 +49753,6 @@ self: {
}) {}; }) {};
"cabal-install" = callPackage "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 ({ mkDerivation, array, async, base, base16-bytestring, binary
, bytestring, Cabal, containers, cryptohash-sha256, deepseq , bytestring, Cabal, containers, cryptohash-sha256, deepseq
, directory, echo, edit-distance, filepath, hackage-security , directory, echo, edit-distance, filepath, hackage-security
@ -49815,7 +49782,6 @@ self: {
''; '';
description = "The command-line interface for Cabal and Hackage"; description = "The command-line interface for Cabal and Hackage";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
maintainers = with lib.maintainers; [ peti ]; maintainers = with lib.maintainers; [ peti ];
}) {}; }) {};