From d58b4205c8c80cc190546420ddaecd646b252668 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Sep 2013 10:02:18 +0200 Subject: [PATCH 1/4] haskell-thyme: disable unit tests https://github.com/liyang/thyme/issues/4 --- pkgs/development/libraries/haskell/thyme/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 7d79881127d..dde2b0942f5 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { attoparsec Cabal filepath lens QuickCheck random systemPosixRedirect text time vectorSpace ]; + check = false; meta = { homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; From b2a54d51b555ccaa4c4f27bdefe8db62462c395b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Sep 2013 10:20:27 +0200 Subject: [PATCH 2/4] haskell-vault: jailbreak to fix build with older versions of GHC --- pkgs/development/libraries/haskell/vault/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index f73633b4f24..4632d599a2e 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.0.0"; sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8"; buildDepends = [ hashable unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; From da69f138630226adc9e39fd90feb306bffc7e019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Sep 2013 10:43:15 +0200 Subject: [PATCH 3/4] haskell-pandoc-types: Revert "update to version 1.12" This reverts commit 17f8b638378077946e77071040c80630bf23e0f5. The new version breaks Pandoc, curiously enough. Who would have thought? Everyone seems to be going Snoyman these days. --- .../libraries/haskell/pandoc-types/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 63874d39fb8..d4f49791d30 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, aeson, syb }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.12"; - sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj"; - buildDepends = [ aeson syb ]; + version = "1.10"; + sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; + buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; From a9d625b3dcdb718bda4408bbce3bf1fd4df1d97a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Sep 2013 10:44:55 +0200 Subject: [PATCH 4/4] haskell-tagsoup: Revert "update to version 0.13" This reverts commit d0b0d530b65c801709ab2706534fa7a6f7cc69b7. The new version breaks the build of Pandoc. --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index 5dc83178be0..3258267f012 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.13"; - sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1"; + version = "0.12.8"; + sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3"; isLibrary = true; isExecutable = true; buildDepends = [ text ];