From bd957f80380cd45e6473dd29283820fe9f24f6f9 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 14 Aug 2014 19:52:41 +0100 Subject: [PATCH 1/7] haskell-cabal-bounds: update to 0.8.1 --- pkgs/development/tools/haskell/cabal-bounds/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index c8dc299e7d9..fa258f95094 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens +{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, Glob, lens , strict, tasty, tastyGolden, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8"; - sha256 = "0db5vy4qfjc2d27d4vk37gz9sdjgjlargndligmljf52s2g568r0"; + version = "0.8.1"; + sha256 = "19z596niwvjbjs8cp06zqkd29kn7chqkf60cdbr0ikyw8v4dcjw7"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal cabalLenses cmdargs either lens strict transformers unorderedContainers ]; - testDepends = [ filepath tasty tastyGolden ]; + testDepends = [ filepath Glob tasty tastyGolden ]; + jailbreak = true; doCheck = false; meta = { description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; From 7788421cd3db9550c5b819922c24fcf74c5098f3 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 14 Aug 2014 19:53:17 +0100 Subject: [PATCH 2/7] haskell-constraints: update to 0.4 --- pkgs/development/libraries/haskell/constraints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 6681f3a85bb..3f1b196ef27 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "constraints"; - version = "0.3.5"; - sha256 = "01xrk0xqkfwzzr5jwkadkyjgrdcpslwiqfqdb7mci688xp2isi3i"; + version = "0.4"; + sha256 = "0nnplylzbcw884jgsd4i46z75dkiyx4166j5fym5zdnwhyj75sp5"; buildDepends = [ newtype ]; meta = { homepage = "http://github.com/ekmett/constraints/"; From 5585769ff606fd3fc1ded8b7311452da6b56e3a7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 14 Aug 2014 19:53:32 +0100 Subject: [PATCH 3/7] haskell-conduit-extra: update to 1.1.3.1 --- pkgs/development/libraries/haskell/conduit-extra/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 87fc9f18e76..35fd7c42d0e 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.3"; - sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix"; + version = "1.1.3.1"; + sha256 = "1glw734nm5gra5zw31lg3ia74dp4b2ik931jmk52b8f62ysg2vx0"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { async attoparsec blazeBuilder conduit exceptions hspec resourcet stm text transformers transformersBase ]; - noHaddock = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; From db42862c96157869b7ddba8d4bb24d15bcc1440e Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 14 Aug 2014 19:53:50 +0100 Subject: [PATCH 4/7] haskell-bytes: update to 0.14.1 --- pkgs/development/libraries/haskell/bytes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index fac15f1d4b8..4a8877b6a59 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bytes"; - version = "0.14.0.2"; - sha256 = "1bdradf5lq1kgiri64zd8cvcw2fxwbwv0apznl8vxyqlx406v3rn"; + version = "0.14.1"; + sha256 = "023sdwdirvigrdg03f6jrdndm6pkqsmsrwz9ji57dpqg4f5k9jzk"; buildDepends = [ binary cereal mtl text time transformers transformersCompat void ]; From c2dafe1af3dcee21fdc0e35d8cc6a026e315d723 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 14 Aug 2014 19:54:05 +0100 Subject: [PATCH 5/7] haskell-json-assertions: regenerate with cabal2nix --- .../development/libraries/haskell/json-assertions/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index f287b60764e..fce4d5d7922 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, indexed, indexedFree, lens, text }: cabal.mkDerivation (self: { @@ -10,6 +12,6 @@ cabal.mkDerivation (self: { description = "Test that your (Aeson) JSON encoding matches your expectations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) From 82c7852608ce40a82240cd64ddc88fd188c90d94 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 15 Aug 2014 02:17:52 +0100 Subject: [PATCH 6/7] haskell-Strafunski-StategyLib: update to 5.0.0.4 --- .../libraries/haskell/Strafunski-StrategyLib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix index 99d58423d3b..2fa2a91efe8 100644 --- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix +++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Strafunski-StrategyLib"; - version = "5.0.0.3"; - sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y"; + version = "5.0.0.4"; + sha256 = "0miffjc8li5l1jarmz8l34z5mx3q68pyxghsi1lbda51bzz3wy1g"; buildDepends = [ mtl syb ]; jailbreak = true; meta = { From dae18a3b66a0d693b7ffe71e5e1a6e3cd5cc9064 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 15 Aug 2014 02:18:29 +0100 Subject: [PATCH 7/7] haskell-distributed-process: update to 0.5.1 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index e4a02faa60f..21cebedefe4 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.5.0"; - sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny"; + version = "0.5.1"; + sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk"; buildDepends = [ binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers