summary refs log tree commit diff
diff options
context:
space:
mode:
authorMalte Brandy <malte.brandy@maralorn.de>2021-02-08 16:58:02 +0100
committerPeter Simons <simons@cryp.to>2021-02-12 20:35:21 +0100
commit5fd1c13b7f80386db26a1c53e68365136e68a51c (patch)
tree9245be2498dc46d88935a3cfbc7737d5f2d1ae80
parentac9f8df68b55387a8e4fa4f2e70c598b6d6d3618 (diff)
downloadnixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar.gz
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar.bz2
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar.lz
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar.xz
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.tar.zst
nixpkgs-5fd1c13b7f80386db26a1c53e68365136e68a51c.zip
Re-enable Cabal 3.2.* build for older ghc versions
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix31
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 506a04c2e6a..629c3fcd0bf 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2701,6 +2701,7 @@ default-package-overrides:
 extra-packages:
   - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
   - Cabal == 2.4.*                      # required for cabal-install etc.
+  - Cabal == 3.2.*                      # required for cabal-install etc.
   - dhall == 1.29.0                     # required for ats-pkg
   - dhall == 1.37.1                     # required for spago 0.19.0.
   - Diff < 0.4                          # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 41b5271cdc5..3d7cc25d836 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2746,6 +2746,37 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "Cabal_3_2_1_0" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, binary
+     , bytestring, containers, deepseq, Diff, directory, filepath
+     , integer-logarithms, mtl, optparse-applicative, parsec, pretty
+     , process, QuickCheck, stm, tagged, tar, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, temporary, text, time
+     , transformers, tree-diff, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "3.2.1.0";
+       sha256 = "1xfn9q6jnbp3jc6swn4hapa83f5m66pjz8fqbqmffydagf36fkzy";
+       revision = "1";
+       editedCabalFile = "07brbxkjlf1yqs9bjdwcwq1gx853kh600qnrf6bnya92q1p0fhw7";
+       setupHaskellDepends = [ mtl parsec ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         mtl parsec pretty process text time transformers unix
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans binary bytestring containers
+         deepseq Diff directory filepath integer-logarithms
+         optparse-applicative pretty process QuickCheck stm tagged tar tasty
+         tasty-golden tasty-hunit tasty-quickcheck temporary text tree-diff
+       ];
+       doCheck = false;
+       description = "A framework for packaging Haskell software";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "Cabal_3_4_0_0" = callPackage
     ({ mkDerivation, array, async, base, base-compat, base-orphans
      , binary, bytestring, clock, containers, deepseq, Diff, directory