From 7210f218743ab9b152e9c3599e6be8ec4b7adb34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Feb 2013 16:04:59 +0100 Subject: [PATCH] haskell-show: update to version 0.5 --- pkgs/development/libraries/haskell/show/default.nix | 11 ++++------- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 70e629e1ebf2..411684e4953c 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,13 +1,10 @@ -{ cabal, QuickCheck, random, smallcheck, syb }: +{ cabal, QuickCheck, random, simpleReflect, smallcheck, syb }: cabal.mkDerivation (self: { pname = "show"; - version = "0.4.1.2"; - sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w"; - buildDepends = [ QuickCheck random smallcheck syb ]; - patchPhase = '' - sed -i -e 's|smallcheck>=0.4|smallcheck >=0.4 \&\& <= 1|' show.cabal - ''; + version = "0.5"; + sha256 = "1s9nwhbc1935359r76glirg858c1sg8nfvv0bzzrncrgf0gxcl4f"; + buildDepends = [ QuickCheck random simpleReflect smallcheck syb ]; meta = { description = "'Show' instances for Lambdabot"; license = "GPL"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 27012c9bff8a..91e51b694fbb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1617,9 +1617,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; - show = callPackage ../development/libraries/haskell/show { - smallcheck = self.smallcheck_0_6_2; - }; + show = callPackage ../development/libraries/haskell/show {}; SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};