From fbe66014abf80dc7ea86916a6b27abef3c38f5de Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:37:52 +0000 Subject: [PATCH 1/6] haskell-happstack-hamlet: mark as broken No upstream version supports happstack-server >= 7.4 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index e81235cf0979..3567b418ba32 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -12,5 +12,7 @@ cabal.mkDerivation (self: { description = "Support for Hamlet HTML templates in Happstack"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) From 45b9432f828863f9e4b956395223bb4c1abec3aa Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:39:02 +0000 Subject: [PATCH 2/6] haskell-happstack-lite: version bump Fixes build --- .../libraries/haskell/happstack/happstack-lite.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index fa904e0434a4..d0d4de909efb 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.5"; - sha256 = "1gkzkmg1ad5k9hb4gix2afq1k4j996qpp8mm1jzqk03a5njdpb4b"; + version = "7.3.6"; + sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; From b3bacd4d0c7f985f9bf67475c40c7d6db6d6bad9 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:41:09 +0000 Subject: [PATCH 3/6] haskell-pool-conduit: mark as broken Fails to build, deprecated. --- pkgs/development/libraries/haskell/pool-conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index f8f748056c3c..14098c980bb3 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -14,5 +14,7 @@ cabal.mkDerivation (self: { description = "Resource pool allocations via ResourceT. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) From 233cc55dc44f85fa620a2cd64d64440e3d28994d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:09 +0000 Subject: [PATCH 4/6] haskell-rest-core: version bump --- pkgs/development/libraries/haskell/rest-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index ce01091c0663..1c4affbafdc9 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1.2"; - sha256 = "0axl6d28agyzklrnl264413a8hpfi7ih296i453r6fg4c63ma5h4"; + version = "0.34.0.3"; + sha256 = "0jcbnzw0hxq1f7f0frsji3ybdlapmps8dv19ni6rq0bvmiip2i19"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { testDepends = [ HUnit mtl testFramework testFrameworkHunit unorderedContainers ]; - jailbreak = true; meta = { description = "Rest API library"; license = self.stdenv.lib.licenses.bsd3; From c2f216b8e1e425a599d62809b29a243d9c60cabd Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:37 +0000 Subject: [PATCH 5/6] haskell-rest-types: version bump --- pkgs/development/libraries/haskell/rest-types/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 9b9d9f62d26e..9a4caac1ad2f 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,13 +6,12 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11.1.1"; - sha256 = "0xr9h1bivw3miyg4xill0jwn95lybsbqgrnw2323pwxlbbnaa25a"; + version = "1.12"; + sha256 = "0is0kzpr7w1bfw32ybkqwj8g4fyx5ii983hbrqas9gbrkgc0hxv6"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid ]; - jailbreak = true; meta = { description = "Silk Rest Framework Types"; license = self.stdenv.lib.licenses.bsd3; From baba36ce27899fd41652d295c7dca6a6b08acabe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 18 Feb 2015 06:50:55 +0000 Subject: [PATCH 6/6] haskell-rest-happstack Fixes build --- pkgs/development/libraries/haskell/rest-happstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix index 523bb685561f..0cb090524e88 100644 --- a/pkgs/development/libraries/haskell/rest-happstack/default.nix +++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "rest-happstack"; - version = "0.2.10.3"; - sha256 = "05sakr88j6rlwnghzd00g3c3895wpjxi36n9pdbpv0fpm0hh86yv"; + version = "0.2.10.6"; + sha256 = "0b21wg4nj24yqh6akyaaw7dxmkdvvb7d9l0d32mz3hx4m2jq9ay5"; buildDepends = [ happstackServer mtl restCore restGen utf8String ]; meta = { description = "Rest driver for Happstack";