From 0a069fb1ef5b7c852da6362ed1a2b6e79ff4dc71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 Jan 2021 20:37:11 +0100 Subject: [PATCH] splitmix: drop obsolete override The 0.1.0.3 version is now the default. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 1 - 3 files changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc156f9bf20..ea66efa0206 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -363,9 +363,6 @@ self: super: { punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; - QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( { - splitmix = self.splitmix_0_1_0_3; - }); redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; 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 3e057f89214..b6b4e8ab9a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -70,7 +70,6 @@ self: super: { resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; split = doJailbreak super.split; - splitmix = self.splitmix_0_1_0_3; tar = doJailbreak super.tar; time-compat = doJailbreak super.time-compat; vector = doJailbreak (dontCheck super.vector); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edf463d360e..9cc04812517 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -550,7 +550,6 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; - splitmix_0_1_0_3 = dontCheck super.splitmix_0_1_0_3; # Break infinite recursion cycle between tasty and clock. clock = dontCheck super.clock;