From a413fa8e2d119c9077786a795ca45ef40e9291fd Mon Sep 17 00:00:00 2001 From: Kris Jenkins Date: Thu, 15 Jan 2015 09:37:32 +0000 Subject: [PATCH 1/2] Fixing shake test-suite run. --- pkgs/development/libraries/haskell/shake/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index fca81a974fb..71a91cb6f13 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,6 +1,4 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, binary, deepseq, extra, filepath, hashable, jsFlot +{ gcc, cabal, binary, deepseq, extra, filepath, hashable, jsFlot , jsJquery, QuickCheck, random, time, transformers , unorderedContainers, utf8String }: @@ -11,6 +9,7 @@ cabal.mkDerivation (self: { sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m"; isLibrary = true; isExecutable = true; + buildTools = [ gcc ]; buildDepends = [ binary deepseq extra filepath hashable jsFlot jsJquery random time transformers unorderedContainers utf8String From cc49382d262858876ceb24d1d3bb5e54ac92d894 Mon Sep 17 00:00:00 2001 From: Kris Jenkins Date: Thu, 15 Jan 2015 09:37:44 +0000 Subject: [PATCH 2/2] Updating shake to the latest version. --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 71a91cb6f13..3ed0912b0f3 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.14.2"; - sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m"; + version = "0.14.3"; + sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl"; isLibrary = true; isExecutable = true; buildTools = [ gcc ];