From cd3949a15c7c4a1e5023968e9fbd972ef85d735a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 17 Oct 2024 14:03:10 +0200 Subject: [PATCH] haskellPackages.Cabal_3_6_3_0: remove at 3.6.3.0 --- doc/languages-frameworks/haskell.section.md | 2 +- .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 20 ------------------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 247daf8d1dbe..97b961c0dfae 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -760,7 +760,7 @@ that depend on that library, you may want to use: ```nix haskellPackages.haskell-ci.overrideScope (self: super: { - Cabal = self.Cabal_3_6_2_0; + Cabal = self.Cabal_3_14_0_0; }) ``` diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 77d858cde2a3..08f56e361bc5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -41,7 +41,6 @@ default-package-overrides: extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - - Cabal == 3.6.* # used for packages needing newer Cabal on ghc 8.10 and 9.0 - Cabal-syntax == 3.8.* # version required for ormolu and fourmolu on ghc 9.2 and 9.0 - Cabal-syntax == 3.10.* - Cabal == 3.10.* diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3e782963166b..87fdc24bc10a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2886,26 +2886,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_3_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, filepath, mtl, parsec, pretty, process, text - , time, transformers, unix - }: - mkDerivation { - pname = "Cabal"; - version = "3.6.3.0"; - sha256 = "0xxbciinap6938jldj16009s4rqjdd9dbbjvnjzgzs58sj4gx89g"; - setupHaskellDepends = [ mtl parsec ]; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - mtl parsec pretty process text time transformers unix - ]; - doCheck = false; - description = "A framework for packaging Haskell software"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "Cabal_3_10_3_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text