From f3119f03ac1e90fc93bca89e33a7d623b925dbff Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:28:27 +0200 Subject: [PATCH] haskell.packages.*.cabal-install: remove random, hashable overrides These are not necessary anymore as stackage naturally contains random 1.2.0 and we apply the hashable fix globally as well. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 -- 3 files changed, 6 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 c4bab1f0785e..01a867221a6c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -47,8 +47,6 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # cabal-install-parsers is written for Cabal 3.4 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 00797c0c86f1..8fb10d8b05f5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -60,8 +60,6 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # 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 c55d720033ee..4bc3fd779db9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -48,8 +48,6 @@ self: super: { cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # Jailbreaks & Version Updates