From a9d78a775852589832d15d245715ec2809119f25 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 4 Jan 2024 12:37:03 +0100 Subject: haskellPackages.pantry_0_5_2_1: remove at 0.5.2.1 No longer needed by stack. --- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/configuration-nix.nix | 1 - .../haskell-modules/hackage-packages.nix | 44 ---------------------- 3 files changed, 46 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 1d8a70264bba..53e97655e9cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -128,7 +128,6 @@ extra-packages: - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7a5666fcfb0d..f263712dcbc6 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -825,7 +825,6 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - pantry_0_5_2_1 = dontCheck super.pantry_0_5_2_1; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e0ab0eb89f8a..105fde6d8306 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -226027,50 +226027,6 @@ self: { broken = true; }) {}; - "pantry_0_5_2_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; - version = "0.5.2.1"; - sha256 = "0g1v78mgxa6mn0vm6yii3nzfdwpn4hgrlcld1h3mbwaxn6c8116k"; - revision = "1"; - editedCabalFile = "15gyndsfckzc0iz5bhh4hbiszcyv1mp65445f4mmf6b6pfcq7qag"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pantry" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers -- cgit 1.4.1