From 270246ddd9be86e8267f8a82f459bf8455a9582d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 27 Oct 2022 22:11:24 +0200 Subject: [PATCH] haskellPackages: adapt to process 1.6.15.0 -> 1.6.16.0 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) 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 85708b5e7774..1a578dbafbdf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -52,12 +52,12 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); # Pick right versions for GHC-specific packages 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 1c1579566a9a..dbb550f6fd00 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -58,12 +58,12 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); # Ignore overly restrictive upper version bounds. 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 8951319e1bbb..49a97e8b9178 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -53,12 +53,12 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); # Jailbreaks & Version Updates diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index e1c5a414fef5..503d6520d47d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -59,12 +59,12 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: { Cabal = self.Cabal_3_8_1_0; Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); doctest = dontCheck (doJailbreak super.doctest); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c29963bb1d1e..651000b30716 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1054,7 +1054,7 @@ self: super: builtins.intersectAttrs super { # Make sure that Cabal 3.8.* can be built as-is Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; - process = self.process_1_6_15_0; + process = self.process_1_6_16_0; }); # cabal-install switched to build type simple in 3.2.0.0