diff options
author | sternenseemann <sternenseemann@systemli.org> | 2021-10-12 12:51:42 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2021-10-12 12:51:49 +0200 |
commit | 2fb806dba040bddd93d87e054b88a65c42976dc4 (patch) | |
tree | 88ffe7c6a97e0325fc3de31babdcf1cd9a773494 | |
parent | 21910c199d7ee8043b21a52667f2d7d0c8e00c8d (diff) | |
download | nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar.gz nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar.bz2 nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar.lz nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar.xz nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.tar.zst nixpkgs-2fb806dba040bddd93d87e054b88a65c42976dc4.zip |
haskell.packages.*: reflect Cabal minor version update
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index de595427da8..997ca59e7fb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1990,7 +1990,7 @@ EOT # Needs Cabal >= 3.4 chs-cabal = super.chs-cabal.override { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }; # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 714b889f2c0..4d0c3320894 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,15 +44,15 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # cabal-install-parsers is written for Cabal 3.6 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_4_1_0; }; # Jailbreak to fix the build. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0d1efbf7119..25d8e44b454 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -51,7 +51,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Ignore overly restrictive upper version bounds. @@ -98,7 +98,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index df96afc0e0c..e477440b00d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -45,7 +45,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Jailbreaks & Version Updates diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0d7ef5628ee..3c48db55a1d 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -305,7 +305,7 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; + Cabal_3_6_2_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; cabal2nix-unstable = all; funcmp = all; haskell-language-server = all; |