From 9dd2b3c651c623bc9ad861163769938f5cb67a98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jun 2014 12:20:34 +0200 Subject: [PATCH] haskell-shelly: move version override to haskell-defaults.nix --- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 62d9115a6659..8c2325250061 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -57,6 +57,7 @@ haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; scientific = self.scientific_0_2_0_2; + shelly = self.shelly_0_15_4_1; }; ghc722Prefs = self : super : ghc742Prefs self super // { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fa3e2f008e5a..abbdca0eef6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1936,9 +1936,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; - shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") - then self.shelly_0_15_4_1 - else self.shelly_1_5_3_1; + shelly = self.shelly_1_5_3_1; simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};