From 6b5f1f35fbf68beee4d81556331892e3ba659e3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:57:47 +0100 Subject: haskell-errorcall-eq-instance: add version 0.1.0 --- .../libraries/haskell/errorcall-eq-instance/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix new file mode 100644 index 000000000000..e3bfa5c569ea --- /dev/null +++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix @@ -0,0 +1,13 @@ +{ cabal, hspec, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "errorcall-eq-instance"; + version = "0.1.0"; + sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; + testDepends = [ hspec QuickCheck ]; + meta = { + description = "An orphan Eq instance for ErrorCall"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) -- cgit 1.4.1 From 6ea83a9a66a930f98ed7521ad2b05f75f2be520f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:19 +0100 Subject: haskell-case-insensitive: update to version 1.1.0.2 --- .../libraries/haskell/case-insensitive/1.1.0.1.nix | 17 ----------------- .../libraries/haskell/case-insensitive/1.1.0.2.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix create mode 100644 pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix deleted file mode 100644 index 4f63796850a0..000000000000 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq, hashable, HUnit, testFramework -, testFrameworkHunit, text -}: - -cabal.mkDerivation (self: { - pname = "case-insensitive"; - version = "1.1.0.1"; - sha256 = "1hwkdkpr88r3s7c8w1msw1pawz8cfi0lwj1z9dcsp0xs788yzapp"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ HUnit testFramework testFrameworkHunit text ]; - meta = { - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix new file mode 100644 index 000000000000..5fd438e320d5 --- /dev/null +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.2.nix @@ -0,0 +1,17 @@ +{ cabal, deepseq, hashable, HUnit, testFramework +, testFrameworkHunit, text +}: + +cabal.mkDerivation (self: { + pname = "case-insensitive"; + version = "1.1.0.2"; + sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww"; + buildDepends = [ deepseq hashable text ]; + testDepends = [ HUnit testFramework testFrameworkHunit text ]; + meta = { + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index af706d027745..a8e563c79cb6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x inherit (self) cabal ghc; async = self.async_2_0_1_4; attoparsec = self.attoparsec_0_10_4_0; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; @@ -686,8 +686,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cassava = callPackage ../development/libraries/haskell/cassava {}; caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {}; - caseInsensitive_1_1_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.1.nix {}; - caseInsensitive = self.caseInsensitive_1_1_0_1; + caseInsensitive_1_1_0_2 = callPackage ../development/libraries/haskell/case-insensitive/1.1.0.2.nix {}; + caseInsensitive = self.caseInsensitive_1_1_0_2; cautiousFile = callPackage ../development/libraries/haskell/cautious-file {}; -- cgit 1.4.1 From 1d56cb64a825e38a7448af16cb0b1adc102acae9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:58:47 +0100 Subject: haskell-http-client-*: new packages --- .../haskell/http-client-conduit/default.nix | 14 +++++++++++ .../haskell/http-client-multipart/default.nix | 19 +++++++++++++++ .../libraries/haskell/http-client-tls/default.nix | 17 ++++++++++++++ .../libraries/haskell/http-client/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 5 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/haskell/http-client-conduit/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-multipart/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client-tls/default.nix create mode 100644 pkgs/development/libraries/haskell/http-client/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix new file mode 100644 index 000000000000..df4b49b47f39 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -0,0 +1,14 @@ +{ cabal, conduit, httpClient, resourcet, transformers }: + +cabal.mkDerivation (self: { + pname = "http-client-conduit"; + version = "0.2.0.0"; + sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + buildDepends = [ conduit httpClient resourcet transformers ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Frontend support for using http-client with conduit"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix new file mode 100644 index 000000000000..068efdcb543d --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, filepath, httpClient, httpTypes, mimeTypes +, random, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "http-client-multipart"; + version = "0.2.0.0"; + sha256 = "1bahkysh771p3mrfan1gmm6jyx62w3k57ba4rsnx7h1gwbilm878"; + buildDepends = [ + blazeBuilder filepath httpClient httpTypes mimeTypes random text + transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "Generate multipart uploads for http-client"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix new file mode 100644 index 000000000000..5056a94c5d94 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -0,0 +1,17 @@ +{ cabal, connection, dataDefault, hspec, httpClient, httpTypes +, network, tls +}: + +cabal.mkDerivation (self: { + pname = "http-client-tls"; + version = "0.2.0.0"; + sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + buildDepends = [ connection dataDefault httpClient network tls ]; + testDepends = [ hspec httpClient httpTypes ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "http-client backend using the connection package and tls library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix new file mode 100644 index 000000000000..fd40ca88e1dc --- /dev/null +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -0,0 +1,27 @@ +{ cabal, base64Bytestring, blazeBuilder, caseInsensitive, cookie +, dataDefault, deepseq, failure, hspec, httpTypes, monadControl +, network, publicsuffixlist, text, time, transformers, zlib +, zlibBindings +}: + +cabal.mkDerivation (self: { + pname = "http-client"; + version = "0.2.0.1"; + sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + buildDepends = [ + base64Bytestring blazeBuilder caseInsensitive cookie dataDefault + deepseq failure httpTypes network publicsuffixlist text time + transformers zlibBindings + ]; + testDepends = [ + base64Bytestring blazeBuilder caseInsensitive dataDefault deepseq + failure hspec httpTypes monadControl network text time transformers + zlib zlibBindings + ]; + meta = { + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a8e563c79cb6..244ca770c5ae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1222,6 +1222,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; + httpClient = callPackage ../development/libraries/haskell/http-client {}; + + httpClientConduit = callPackage ../development/libraries/haskell/http-client-conduit {}; + + httpClientMultipart = callPackage ../development/libraries/haskell/http-client-multipart {}; + + httpClientTls = callPackage ../development/libraries/haskell/http-client-tls {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; -- cgit 1.4.1 From 38ff6648470e3e72e400adde61b6a01e863f3603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 12:59:50 +0100 Subject: haskell-parsers: update to version 0.10.1.2 --- .../libraries/haskell/parsers/0.10.1.1.nix | 19 ------------------- .../libraries/haskell/parsers/0.10.1.2.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsers/0.10.1.1.nix create mode 100644 pkgs/development/libraries/haskell/parsers/0.10.1.2.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix deleted file mode 100644 index db79c81a62d4..000000000000 --- a/pkgs/development/libraries/haskell/parsers/0.10.1.1.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, charset, doctest, filepath, parsec, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.10.1.1"; - sha256 = "1w3dj3r2l0w54rafngrp7r1spqznbj5yzilkprqxvbvvj3jxgn5a"; - buildDepends = [ - charset parsec text transformers unorderedContainers - ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix new file mode 100644 index 000000000000..0f9c5f6634e7 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsers/0.10.1.2.nix @@ -0,0 +1,19 @@ +{ cabal, charset, doctest, filepath, parsec, text, transformers +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "parsers"; + version = "0.10.1.2"; + sha256 = "1malfr2ls7f6di2rj2jcyxyqvjz0vb3p3v06j0r9if1bkjfzfp2j"; + buildDepends = [ + charset parsec text transformers unorderedContainers + ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 244ca770c5ae..6351ea3bcb0f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1706,8 +1706,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; - parsers_0_10_1_1 = callPackage ../development/libraries/haskell/parsers/0.10.1.1.nix {}; - parsers = self.parsers_0_10_1_1; + parsers_0_10_1_2 = callPackage ../development/libraries/haskell/parsers/0.10.1.2.nix {}; + parsers = self.parsers_0_10_1_2; parsimony = callPackage ../development/libraries/haskell/parsimony {}; -- cgit 1.4.1 From 375c13622e7c44d504842779e0253096b444a02c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:01:16 +0100 Subject: haskell-text: update to version 1.0.0.0 --- .../development/libraries/haskell/text/1.0.0.0.nix | 22 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/text/1.0.0.0.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/text/1.0.0.0.nix b/pkgs/development/libraries/haskell/text/1.0.0.0.nix new file mode 100644 index 000000000000..fe740864970b --- /dev/null +++ b/pkgs/development/libraries/haskell/text/1.0.0.0.nix @@ -0,0 +1,22 @@ +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "text"; + version = "1.0.0.0"; + sha256 = "13i7xn5xl8lc5hcd08i4n0qp9rx51588jnjn4c68gp87vw1gwvjn"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6351ea3bcb0f..ed7dddae7f6d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x split = self.split_0_2_2; stm = self.stm_2_4_2; syb = self.syb_0_4_1; - text = self.text_0_11_3_1; + text = self.text_1_0_0_0; transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; @@ -2155,7 +2155,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; - text = self.text_0_11_3_1; + text_1_0_0_0 = callPackage ../development/libraries/haskell/text/1.0.0.0.nix {}; + text = self.text_1_0_0_0; textFormat = callPackage ../development/libraries/haskell/text-format {}; -- cgit 1.4.1 From 367b119971fad6314b642c41e8ea6d9216439b85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:02:23 +0100 Subject: haskell-pretty-show: update to version 1.6.2 --- .../libraries/haskell/pretty-show/1.6.1.nix | 17 ----------------- .../libraries/haskell/pretty-show/1.6.2.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.1.nix create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.2.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix deleted file mode 100644 index dc31b452a1bb..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, filepath, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.6.1"; - sha256 = "17zdljvpf7ra9x3lny5kbjvmz3psn8y1k9cwbg97m017gh87gsh0"; - isLibrary = true; - isExecutable = true; - buildDepends = [ filepath haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix new file mode 100644 index 000000000000..ea3b7ed27cbf --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix @@ -0,0 +1,18 @@ +{ cabal, filepath, happy, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.6.2"; + sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath haskellLexer ]; + buildTools = [ happy ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed7dddae7f6d..f7f2bd9d03b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,8 +1772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_1 = callPackage ../development/libraries/haskell/pretty-show/1.6.1.nix {}; - prettyShow = self.prettyShow_1_6_1; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; -- cgit 1.4.1 From 37d68e69a0803050450a70d0bd6e5fba57cb5c85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:02 +0100 Subject: haskell-pretty-show: remove obsolete version 1.2 --- pkgs/development/libraries/haskell/pretty-show/1.2.nix | 16 ---------------- .../libraries/haskell/pretty-show/1.6.2.nix | 18 ------------------ .../libraries/haskell/pretty-show/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +--- 4 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.2.nix create mode 100644 pkgs/development/libraries/haskell/pretty-show/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix deleted file mode 100644 index 545816a57a02..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.2"; - sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; - isLibrary = true; - isExecutable = true; - buildDepends = [ haskellLexer ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived Show instances"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix deleted file mode 100644 index ea3b7ed27cbf..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, filepath, happy, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.6.2"; - sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; - isLibrary = true; - isExecutable = true; - buildDepends = [ filepath haskellLexer ]; - buildTools = [ happy ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix new file mode 100644 index 000000000000..ea3b7ed27cbf --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -0,0 +1,18 @@ +{ cabal, filepath, happy, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.6.2"; + sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath haskellLexer ]; + buildTools = [ happy ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f7f2bd9d03b5..f34386fa180b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1771,9 +1771,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; - prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix {}; - prettyShow = self.prettyShow_1_6_2; + prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; punycode = callPackage ../development/libraries/haskell/punycode {}; -- cgit 1.4.1 From a91e1a6f85e1021ddedbcfbfe8a6fd3febc0bf49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: haskell-DAV: update to version 0.5 --- pkgs/development/libraries/haskell/DAV/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c330f082e890..c24ceacc0216 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,18 @@ -{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase -, mtl, network, optparseApplicative, resourcet, transformers -, xmlConduit, xmlHamlet +{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens +, liftedBase, mtl, network, optparseApplicative, resourcet +, transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.4.1"; - sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; + version = "0.5"; + sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpConduit httpTypes lens liftedBase mtl network - optparseApplicative resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpClient httpConduit httpTypes lens liftedBase + mtl network optparseApplicative resourcet transformers xmlConduit + xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; -- cgit 1.4.1 From 82e26eb2a430ac918d2f9264ab73bd4be6b25500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:18 +0100 Subject: haskell-JuicyPixels: update to version 3.1.2 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index b2947318a1f1..485a80dadb3c 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.1.1"; - sha256 = "0lvhaa8pqknkcsfps5gcbwiqx0y1rhasiw9hwy7975vgpsh58dph"; + version = "3.1.2"; + sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; -- cgit 1.4.1 From 5afde208e98a40f501025c344d4f6f3612b8237d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-authenticate-oauth: update to version 1.4.0.8 --- pkgs/development/libraries/haskell/authenticate-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 2ddd7c05ee99..15c8267ca3e2 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.7"; - sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g"; + version = "1.4.0.8"; + sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; buildDepends = [ base64Bytestring blazeBuilder blazeBuilderConduit conduit cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl -- cgit 1.4.1 From 5b61f54e0972637c697ea1548c6ee493c1e3b756 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-base-compat: update to version 0.3.0 --- pkgs/development/libraries/haskell/base-compat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index ca208b7c1a34..6ce94b0d6c00 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -1,9 +1,10 @@ -{ cabal, hspec, setenv }: +{ cabal, errorcallEqInstance, hspec, setenv }: cabal.mkDerivation (self: { pname = "base-compat"; - version = "0.2.1"; - sha256 = "1yssx3nww89dmkw8i55bp1vinbczbxhhh0kh4f3b9fyw5ylnai43"; + version = "0.3.0"; + sha256 = "0jjj953hr00jj99ld2977al6n6qk67ds9qfzkzwkh5ifgmi6f20i"; + buildDepends = [ errorcallEqInstance ]; testDepends = [ hspec setenv ]; meta = { description = "A compatibility layer for base"; -- cgit 1.4.1 From c22384263d9b5297cf89121ef7b4d7c9df347a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-blaze-html: update to version 0.6.1.2 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index ec21e3fcd84b..7d799c2ebf62 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.6.1.1"; - sha256 = "08zfmkvahmm613r0nrabwl5zv9ragcrhdqsa8jfdrfdkrf6ckbrc"; + version = "0.6.1.2"; + sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m"; buildDepends = [ blazeBuilder blazeMarkup text ]; testDepends = [ blazeBuilder blazeMarkup HUnit QuickCheck testFramework -- cgit 1.4.1 From 4d90e5aa3afce3056a4b8c207c2c729d6398ca19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-blaze-markup: update to version 0.5.1.6 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 0c544119d5ff..23ea971922b1 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.5.1.5"; - sha256 = "0g3smm1ym7h45bkzx94b77ssyg0z0gqfwbnap3ywa2381rb39l74"; + version = "0.5.1.6"; + sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm"; buildDepends = [ blazeBuilder text ]; testDepends = [ blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit -- cgit 1.4.1 From 695c2a345b8f26632607422697be84eaf7df1bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-cmdargs: update to version 0.10.6 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1814ab99784a..ba8793ebb45c 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.5"; - sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h"; + version = "0.10.6"; + sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; -- cgit 1.4.1 From c9ecf30aac0e11c0394d5bc99464d2ed9f580656 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-crypto-pubkey-types: update to version 0.4.1 --- pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index e4234d1d4cd0..ba5007e789fa 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.0"; - sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl"; + version = "0.4.1"; + sha256 = "1zs0hhpqcfsdyfr3z96m8lwxrxr3mf27wvjrpvih9jlvh64vp1pr"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; -- cgit 1.4.1 From fa254e5565fd07dcf0b6846a05599936ed20fb3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-crypto-pubkey: update to version 0.2.3 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index aa400c736cb1..d3355f4c85c8 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,14 +5,15 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.2"; - sha256 = "084758n5fyh2aigd6055a75pnqjhx42sbjg36hhp2a40vhl7xr2f"; + version = "0.2.3"; + sha256 = "198gpaxlcqkp6wa5cwwnlzdxnrs7j6h7zyizczd4imwbpl0gd2mk"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; testDepends = [ - byteable cryptohash cryptoNumbers cryptoRandom HUnit QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 + byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom + HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; -- cgit 1.4.1 From a438e431b36194a105758744e52781e8ac949623 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-errors: update to version 1.4.4 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 1b0bc4282a75..1b091d871bb8 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.3"; - sha256 = "02xvfh0kfca7z5vhnkmqg5gw5i5ad5bc3jf8flxj75ry7wqggfmm"; + version = "1.4.4"; + sha256 = "1mhh5xna5nppqg8aw93iil7nsnpx5j6r21a12bx4mmip8nzr6480"; buildDepends = [ either safe transformers ]; jailbreak = true; meta = { -- cgit 1.4.1 From b9f4a63413549154679e2bb6a88b65589464092f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-fast-logger: update to version 2.0.0 --- pkgs/development/libraries/haskell/fast-logger/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index fb8714f3e854..ee51859404ce 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,11 +1,10 @@ -{ cabal, blazeBuilder, dateCache, filepath, hspec, text, unixTime -}: +{ cabal, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.3.3"; - sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh"; - buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; + version = "2.0.0"; + sha256 = "0a2pmdj2q1mlpkwjszlb4gp6xk2bn8540cqhwjya55arx6rj9vs7"; + buildDepends = [ blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { description = "A fast logging system"; -- cgit 1.4.1 From fee913a3efc290b36873f6230e25cba28face186 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-ghc-vis: update to version 0.7.2 --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 04af52f26790..bfedbdb776d8 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.7.1"; - sha256 = "05j3yw1276wvy4va7r7pbnvhjg1k1mxzp4baxcb9jlb5dxfh0daa"; + version = "0.7.2"; + sha256 = "1mb33fafi212a6wawnd8601r80qjb1bja6nbj6jqrd91y96dxdll"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot -- cgit 1.4.1 From 8198b87947ff14e02108f81cb1c1e2f7a3994f51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:19 +0100 Subject: haskell-glade: update to version 0.12.5.0 --- pkgs/development/libraries/haskell/glade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 7c49b956aa98..30711083d2c5 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "glade"; - version = "0.12.1"; - sha256 = "114gdjz6bzfzqm71j17yb5mq96wcvjdv7ig3k4x4d9mdp97w8990"; + version = "0.12.5.0"; + sha256 = "0dbl7y5rdwzcham16iym9cikfyaphzr1rqcsni9ab6s2368a1vkr"; buildDepends = [ glib gtk ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; -- cgit 1.4.1 From e979b49dd595dcd3766fdc5891124d53d30dd6c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hakyll: update to version 4.4.2.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 424860c4677f..f7f318e502aa 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.4.1.2"; - sha256 = "0rbl0gl5ds63mv8cbcwb8aj0vic9padqs3zrdxr2ny70md1v9m9y"; + version = "4.4.2.0"; + sha256 = "10rkqnrj9gi4h25wfh1w4giqiir2d63vb85ysbxpc97rkbz3fwsg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,9 +25,6 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc.*,|pandoc-citeproc,|' hakyll.cabal - ''; doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; -- cgit 1.4.1 From dffb56d5d298a8c7ad1a99d26d191115e945fc34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hamlet: update to version 1.1.7.5 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index b64668b43660..89513e372ea2 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.4"; - sha256 = "01sgd4p2d4irphgpvr7waag6jn8y329yj9zdjswrqklyygpp98hj"; + version = "1.1.7.5"; + sha256 = "1ph92n5l63qr5hpjcvl37j1w857dwwzzgsxn8mdadi2pz35lxm82"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; -- cgit 1.4.1 From 322a1d40f7fe31b22c85ad2dd5bb8951e3f24741 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hexpat: update to version 0.20.5 --- pkgs/development/libraries/haskell/hexpat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 03aa9c16ed24..edded9b7698e 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.4"; - sha256 = "09ixvwgrr1046v806d23ngdhc8xqkf0yadzlbwxcy228ka13xwdw"; + version = "0.20.5"; + sha256 = "09p8mh2b76ymgfv64zpddywdf34n7b78agri6kjnhls0xsk8260a"; buildDepends = [ deepseq List text transformers utf8String ]; meta = { homepage = "http://haskell.org/haskellwiki/Hexpat/"; -- cgit 1.4.1 From fcb89f41c6b91d30df4c33824f1cfdf84f84e961 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hjsmin: update to version 0.1.4.4 --- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 5980141526b0..008c1766b947 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.3"; - sha256 = "1jhpqfvwvzik41i4mi9fr9w1jlrlc1lj2illlbbwg7r3fwr5hnnl"; + version = "0.1.4.4"; + sha256 = "0hzh2xbv9x013s1lhmgapjd0qx8v7n09rjlfxd9b1h5min00k048"; buildDepends = [ blazeBuilder languageJavascript text ]; testDepends = [ blazeBuilder Cabal HUnit languageJavascript QuickCheck -- cgit 1.4.1 From ee04bc15d022a79df473dbeecf5c097b336956ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hoogle: update to version 4.2.24 --- pkgs/development/libraries/haskell/hoogle/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 498e71d06d1e..fb4c33d73374 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,14 +1,13 @@ { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive -, cmdargs, conduit, deepseq, filepath, haskellSrcExts, hspec -, hspecExpectations, httpTypes, HUnit, parsec, random, safe -, systemFileio, tagsoup, text, time, transformers, uniplate, wai -, warp +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, random, safe, tagsoup, text, time, transformers, uniplate +, wai, warp }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.23"; - sha256 = "1ykjf0w6c3pzsrzdhxs53nxj84aj2px3gpfc8f53dmgqv3wkyii7"; + version = "4.2.24"; + sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -16,9 +15,7 @@ cabal.mkDerivation (self: { deepseq filepath haskellSrcExts httpTypes parsec random safe tagsoup text time transformers uniplate wai warp ]; - testDepends = [ - conduit hspec hspecExpectations HUnit systemFileio transformers - ]; + testDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; -- cgit 1.4.1 From 7053a3f96a6d03e16f3efe50dfdacb5ecc9a1c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hspec-expectations: update to version 0.5.0.1 --- pkgs/development/libraries/haskell/hspec-expectations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 789ff5d7b2a4..5a1462657515 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.3.3"; - sha256 = "0sg7wkgr9qmwv0bki1q8wvl5jrlsvn0c7sd2qpqp3cccdhwj9c5k"; + version = "0.5.0.1"; + sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; doCheck = false; -- cgit 1.4.1 From 6f776d29c5119e4116fd59bec09f0b3ef290d880 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hspec-meta: update to version 1.8.1 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index d409501d706b..5374ed7cd80a 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.7.2"; - sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj"; + version = "1.8.1"; + sha256 = "03582b79cqv3c2z02ni2xyzb3kccgcw0phmg5lklaphkrarm0g3w"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From bb371962ced717ca4adab49a81c8dd46599ac051 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-hspec: update to version 1.8.1.1 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 57dab8852fdd..10994799c43d 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.7.2.1"; - sha256 = "12khyg6ixk2rkbvxjbi210w57cais1s142v337kpcp3dfk6440bk"; + version = "1.8.1.1"; + sha256 = "1gpll1pr8zs7ha1nn13rp579av4nnjkz94rq0js6r1awz69cp0rb"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 3cb9b9cb3651949fba13a751dcc880b65cd109d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-http-conduit: update to version 2.0.0.1 --- .../libraries/haskell/http-conduit/default.nix | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index f0c559839e05..403fdbe59b79 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,31 +1,30 @@ { cabal, asn1Data, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, certificate, conduit -, cookie, cprngAes, dataDefault, deepseq, failure, filepath, hspec -, httpTypes, HUnit, liftedBase, mimeTypes, monadControl, mtl -, network, networkConduit, publicsuffixlist, random, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, wai, warp, zlibConduit +, connection, cookie, cprngAes, dataDefault, deepseq, failure +, filepath, hspec, httpClient, httpClientConduit +, httpClientMultipart, httpClientTls, httpTypes, HUnit, liftedBase +, mimeTypes, monadControl, mtl, network, networkConduit +, publicsuffixlist, random, regexCompat, resourcet, socks, text +, time, tls, tlsExtra, transformers, transformersBase, utf8String +, void, wai, warp, warpTls, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.5.2"; - sha256 = "0andx8ggcwcd39z10yh5j0rmn7ypypgfzaaibbbh2rhp5v28932b"; + version = "2.0.0.1"; + sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; buildDepends = [ - asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath httpTypes liftedBase mimeTypes - monadControl mtl network publicsuffixlist random regexCompat - resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void zlibConduit + conduit httpClient httpClientConduit httpClientTls httpTypes + liftedBase resourcet transformers ]; testDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive certificate conduit cookie cprngAes dataDefault - deepseq failure filepath hspec httpTypes HUnit liftedBase mimeTypes + caseInsensitive certificate conduit connection cookie cprngAes + dataDefault deepseq failure filepath hspec httpClient + httpClientMultipart httpTypes HUnit liftedBase mimeTypes monadControl mtl network networkConduit publicsuffixlist random regexCompat resourcet socks text time tls tlsExtra transformers - transformersBase utf8String void wai warp zlibConduit + transformersBase utf8String void wai warp warpTls zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; -- cgit 1.4.1 From 4675b82d642864895fa9dcbe8a9bd02b799dc114 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-http-reverse-proxy: update to version 0.3.0 --- .../libraries/haskell/http-reverse-proxy/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index a4f458f83953..f745554e4891 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,17 @@ { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit -, dataDefault, hspec, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, transformers, wai -, waiLogger, warp, word8 +, dataDefault, hspec, httpClient, httpConduit, httpTypes +, liftedBase, monadControl, network, networkConduit, resourcet +, text, transformers, wai, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1.1"; - sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; + version = "0.3.0"; + sha256 = "0wwrcm3hhbq9kawk3s12s8ws82vancmc8a5d29f6871jfq3vvzc2"; buildDepends = [ basicPrelude blazeBuilder caseInsensitive conduit dataDefault - httpConduit httpTypes liftedBase monadControl network - networkConduit text wai waiLogger warp word8 + httpClient httpTypes liftedBase monadControl network networkConduit + resourcet text wai waiLogger word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network -- cgit 1.4.1 From ae925636bd09101f455c2e87761091d1093582de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:20 +0100 Subject: haskell-http-types: update to version 0.8.3 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index c099709e0dae..ed24e1ede749 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.8.2"; - sha256 = "1536wpmicmq90qvnvcvq1dzk2vfhj7ls6hz4pqp0ll9aksk3msr1"; + version = "0.8.3"; + sha256 = "02l1lhl2ajbm5f7zq363nlb21dpdg1m0qsy330arccmds7z9g7a2"; buildDepends = [ blazeBuilder caseInsensitive text ]; testDepends = [ blazeBuilder hspec QuickCheck text ]; meta = { -- cgit 1.4.1 From 012a7209e58e73a754e4f86927c0280da23530bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: haskell-language-ecmascript: update to version 0.15.4 --- pkgs/development/libraries/haskell/language-ecmascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 458916df9d1b..77165ef104d1 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-ecmascript"; - version = "0.15.3"; - sha256 = "0ircm20nf321awl0gvy0vh3jplfwpd700br67f0i97rifxx2v40c"; + version = "0.15.4"; + sha256 = "1drivy75lvrwjx7irdbnnqp7y6mbzbm2pbxy7zzc1nfln6g3k9x7"; buildDepends = [ dataDefaultClass Diff mtl parsec QuickCheck uniplate wlPprint ]; -- cgit 1.4.1 From 3c5e50828aaa32a82576ce149a1e79549dfd9339 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: haskell-lens: update to version 3.10.0.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 60aa29ac089a..fff7f1cc5830 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.10"; - sha256 = "086kbd59zlx3ldrxilssxd0gr9izwhcfhg5k6bqzm6gwvysrzq3y"; + version = "3.10.0.1"; + sha256 = "0ar19ls0w1x1cnl6aj5qvrlyhfk51v8czahq4k861666rzglqd28"; buildDepends = [ bifunctors comonad contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel -- cgit 1.4.1 From 832a6b45d6980f5f0680720c1f868dd510fe0bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:21 +0100 Subject: haskell-linear: update to version 1.3.1.1 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index feeeaed3be54..99f5de71b619 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.3.1"; - sha256 = "1s07qbdi12rc4djk4s0ds5sh79qcqfmgrbwfj1ygskq3ra88qqsa"; + version = "1.3.1.1"; + sha256 = "174pqqc2gx8aigm51hfg7di35qbx65sgcqv6y1p25c2853g9h97y"; buildDepends = [ binary distributive hashable reflection semigroupoids semigroups tagged transformers unorderedContainers vector -- cgit 1.4.1 From 012480b9f4597f80ef1d63f36127ab227d21abf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-monad-logger: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 0b92ca0bb903..83cd57ce39b7 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.2.0"; - sha256 = "0pgjayx6h1zqadqrzaf36070kir7qlinha9h4bf532lfx5yc1yxg"; + version = "0.3.3.1"; + sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase -- cgit 1.4.1 From 3df57554b5fc4fcdb26050b8562da60ab25916b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-pandoc: update to version 1.12.2.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b5ccc95bd3fd..01ce4cc5bfb8 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.12.1"; - sha256 = "0csyrcfdqv2mc7ngn63lan3c1dd6zy0pb24k0z1lsraqlmmw76nf"; + version = "1.12.2.1"; + sha256 = "1xyvhfsz0cy5f7cwpz4kl0l87vylb8860c06wvk49z9fh2xkg6lf"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 01a828cbf99608b25396aa1a1f2e9dae69da56f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-quickcheck-instances: update to version 0.3.4 --- pkgs/development/libraries/haskell/quickcheck-instances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index 647e08718a8c..0b29a55ce5fa 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "quickcheck-instances"; - version = "0.3.3"; - sha256 = "0l5rck5sh3cplqqkkasm00phy962y3wa9l8a44843grp3flnpv72"; + version = "0.3.4"; + sha256 = "10kkjqn530cd4bz5jfnvfvpswk25glyjnmy21qj253db6ja8xns1"; buildDepends = [ QuickCheck text time ]; meta = { homepage = "https://github.com/aslatter/qc-instances"; -- cgit 1.4.1 From 7cc0bad3a45a556f13dd06468f8a8e30102a0032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-reducers: update to version 3.10.1.1 --- pkgs/development/libraries/haskell/reducers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index ea1049d2b40a..bc1bf72beea1 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "reducers"; - version = "3.10.1"; - sha256 = "0pgywdgq0rqir95n4z3nzmyx5n54a1df9abyanz4qfv0g080fjkz"; + version = "3.10.1.1"; + sha256 = "1d4zhcqy499pm0wxn76gyw0brbrdycmajblqy4mi49kiy0zlg8a7"; buildDepends = [ comonad fingertree hashable keys pointed semigroupoids semigroups text transformers unorderedContainers -- cgit 1.4.1 From 42f3190cf8614afa8cb8ac757804d992e05fe2b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-scotty: update to version 0.6.0 --- pkgs/development/libraries/haskell/scotty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index ad932df1ac79..3f50ed381523 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "scotty"; - version = "0.5.0"; - sha256 = "177c7nyjwksm2y98j2swgzfn1rmr2h0v4fk6s525kx803iibvfhc"; + version = "0.6.0"; + sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes mtl regexCompat resourcet text transformers wai waiExtra warp ]; meta = { - homepage = "https://github.com/ku-fpg/scotty"; + homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- cgit 1.4.1 From 8a347b892bb748d6d2052412300adef27f7bd6ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-semigroups: update to version 0.12.1 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index f1bc7259b799..a0e79c459d9e 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.12"; - sha256 = "0wk8hxak4dl8nbdif4f8z9gvr5bqm95inrvrcrb6ryaxichrn432"; + version = "0.12.1"; + sha256 = "0jxgd487d99cc721wyaxvazphlv567hbb57vdfjn4hq9ly4w464q"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; -- cgit 1.4.1 From f664af533756b5293e2f6defd3f162565fe885f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-shakespeare-css: update to version 1.0.6.5 --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 03b6b057cd1e..7dedf465f655 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.4"; - sha256 = "12f2b69grxpwk56b2d7idlg8axqfgzn0rn3m56r1hcpvkjbynlc4"; + version = "1.0.6.5"; + sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { -- cgit 1.4.1 From d7588eae7925e49a30ee920021aaac9ae4a90972 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:22 +0100 Subject: haskell-shakespeare-i18n: update to version 1.0.0.5 --- pkgs/development/libraries/haskell/shakespeare-i18n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index b7710d7c3d54..5d7cb8c4abe6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.4"; - sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l"; + version = "1.0.0.5"; + sha256 = "0f6i9pxr1lmqwcarb48swhrgab8hpkr46cv16psmbq67dr6h1dgf"; buildDepends = [ parsec shakespeare text ]; testDepends = [ hspec text ]; meta = { -- cgit 1.4.1 From d20feb0efc1e0dde7cfc1c7b471d63673c0f3028 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-shakespeare-text: update to version 1.0.0.10 --- pkgs/development/libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index ec60c0375b0c..feadafeb29f2 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.9"; - sha256 = "1rh1dwmc7xam76isa6cwc25rcricakc7ay54hz01fpiy059imx52"; + version = "1.0.0.10"; + sha256 = "0az3l70syb7ch5fb4i0nlibgh7wcrzqnqmlp1w5h68s796g5rjlb"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { -- cgit 1.4.1 From de2c3ff933ef2afa2de916890db301c52352d568 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-shakespeare: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 8b5de8ec76b7..f3891e554dd2 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.2.0.2"; - sha256 = "1vp7zskxrjxcznj1d0nx9iqkfvwa9xwpbxq46z054bizqfkri96c"; + version = "1.2.0.3"; + sha256 = "1mhycaw8qa4j7q5jing3hbx5vwwa0h4iv41fsx6xibz3y7lpqgmz"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time -- cgit 1.4.1 From 6ff4ebca323d7b15a2ac97f87c5b7123e500b5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-smallcheck: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index df2517a01ace..ef8f0e5e5ba4 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.1"; - sha256 = "167dhi0j4mfmf9idjcfx0x1y1jajx4qmgcpiia93vjpmv8ha56j8"; + version = "1.1.0.1"; + sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; -- cgit 1.4.1 From 8cdd84fac24ecb6e1c721429288e170d0039d9c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-snap: update to version 0.13.1.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 63103471ac2a..3f4751113be5 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.1.1"; - sha256 = "0nak84xwrfvdcb2ngq71qy8h0h1ih3wifnkgwxabhjbrqmd7ma0x"; + version = "0.13.1.2"; + sha256 = "19s7v9wc988yxynwqdhrhncz8vn9ic6d95gwfi1m0gpxxk5qlzzz"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From b1c6aabdb16fa26b1f2ece03bddaa1d9df310cde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-tasty-ant-xml: update to version 1.0.0.2 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index baabf323723c..3d68e8232755 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.1"; - sha256 = "1yn337dr9clzrkr8kpvm7x07lyb3v8pcijrddqah08k0ds8zpzcj"; + version = "1.0.0.2"; + sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; meta = { homepage = "http://github.com/ocharles/tasty-ant-xml"; - description = "A tasty ingredient to output test results in XML, using the Ant schema. This XML can be consumed by the Jenkins continuous integration framework."; + description = "Render tasty output to XML for Jenkins"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; -- cgit 1.4.1 From 5fb617876d605c91f586b429752eef840eb71a3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-tasty: update to version 0.4.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index c2c05a68f075..9ad53093c68b 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.1.1"; - sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w"; + version = "0.4.2"; + sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; -- cgit 1.4.1 From 710790a7042968ba5b1374cb73bf3cd2cc21f2be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-vector-algorithms: update to version 0.6.0.1 --- .../libraries/haskell/vector-algorithms/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index dc8c9dd35bae..74b098a3a7f1 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,10 +1,13 @@ -{ cabal, primitive, vector }: +{ cabal, mtl, mwcRandom, primitive, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.4.2"; - sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64"; - buildDepends = [ primitive vector ]; + version = "0.6.0.1"; + sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl mwcRandom primitive vector ]; + testDepends = [ QuickCheck vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; description = "Efficient algorithms for vector arrays"; -- cgit 1.4.1 From ca19f496b85aaf58dc40e2f375b5c18a7f5d0e6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-wai-app-static: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index d88eb2df0bc9..3bcf63e17963 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.3"; - sha256 = "0lsqfvlh65rggp9z6m5gyx8gv0wk3b44jrk57s8yj2bh74pbr64f"; + version = "2.0.0"; + sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate -- cgit 1.4.1 From 40a309e038d39cca527548e9f8a20c5afef59170 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-wai-extra: update to version 2.0.0.1 --- .../libraries/haskell/wai-extra/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7e3424713e0d..d3b835879650 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,23 +1,23 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, fastLogger, hspec, httpTypes, HUnit, liftedBase, network +, resourcet, stringsearch, text, time, transformers, void, wai +, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.6"; - sha256 = "09rk9i2fkk4haiq1c6rhcp1p72zw34j9cxsmqnm4jzh6fdsrkq2k"; + version = "2.0.0.1"; + sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit - caseInsensitive conduit dataDefault dateCache fastLogger httpTypes - liftedBase network resourcet stringsearch text time transformers - void wai waiLogger word8 zlibConduit + caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase + network resourcet stringsearch text time transformers void wai + waiLogger word8 zlibConduit ]; testDepends = [ blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit - text transformers wai waiTest zlib zlibBindings + resourcet text transformers wai waiTest zlib zlibBindings ]; meta = { homepage = "http://github.com/yesodweb/wai"; -- cgit 1.4.1 From 350a1e1c968061b3760008c47e5e2392c621c0fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-wai-handler-launch: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai-handler-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index c4d22a66e006..3ba78e162519 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-handler-launch"; - version = "1.3.1.5"; - sha256 = "1iz36j7lzl5c9b2hacxv4v5gfzkfvgj7hlb5xz4r14ca4w5fzzfj"; + version = "2.0.0"; + sha256 = "1z03c3hjkh4k6j5dsp4973f05rk2cgl7gazac4vdq4imwfzxj3lg"; buildDepends = [ blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai warp zlibConduit -- cgit 1.4.1 From eb16c02c56b878376f4620286f4eb57a2bf3f210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:23 +0100 Subject: haskell-wai-logger: update to version 2.0.1 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index fc958c2576b9..98b0cdee39c4 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache -, doctest, fastLogger, httpTypes, network, wai, waiTest +{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest +, fastLogger, httpTypes, network, unixTime, wai, waiTest }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.2"; - sha256 = "0las9jb8cxdsyh1mnrhx48yfbjw5f2x4hhmivhmhzb6qgxnbvma9"; + version = "2.0.1"; + sha256 = "1v8n7m314a12421gn10i8vz3nk9sak635dq4nq389sij8w1ihjkw"; buildDepends = [ - blazeBuilder byteorder caseInsensitive dateCache fastLogger - httpTypes network wai + blazeBuilder byteorder caseInsensitive fastLogger httpTypes network + unixTime wai ]; testDepends = [ doctest waiTest ]; meta = { -- cgit 1.4.1 From 059978b4742aedce62be389372101e381630cecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index bbc1ed1d1366..9cae0a85d6c9 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.1.1"; - sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2"; + version = "2.0.0.1"; + sha256 = "1lk7i9kiawsn56f8w2nidmas6g94yq7diaprvkd7c52hjki5mla7"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai -- cgit 1.4.1 From ad818c12a695ce61103b0cf660d2654f3fb50dfd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-wai: update to version 2.0.0 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 0fff9096cb07..4273e408a7f7 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.4.1"; - sha256 = "1m8z1jc4fvq8rw9vk1x5sy73dbmiifa41973x84i51vsibyaqhgb"; + version = "2.0.0"; + sha256 = "11s60v9pw8jl9w950z81gkxci7djrdibi8hxrw6j1v8az40qqiwk"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; -- cgit 1.4.1 From d6377fa89563810a7c609f7dffc4b4e351b759e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-warp-tls: update to version 2.0.0 --- pkgs/development/libraries/haskell/warp-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 5b1456c0c48c..b99c5214120b 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp-tls"; - version = "1.4.2"; - sha256 = "05mbf73859n2ns3bdnw24i7vygr4kysyxfq0xdkmmrd47fh3k9r6"; + version = "2.0.0"; + sha256 = "1dfwid6h7yl4v66as166ppbivzafh5wkkrbsvaaar6l3xd9kg211"; buildDepends = [ certificate conduit cprngAes cryptocipher cryptoRandomApi network networkConduit pem tls tlsExtra transformers wai warp -- cgit 1.4.1 From 27bdaa32690b828e5c86755e2baed986596b516a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-warp: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/warp/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 100dbbd7024e..15dd0ec15ec1 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,23 +1,23 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, hspec, HTTP, httpAttoparsec, httpTypes, HUnit -, liftedBase, network, networkConduit, QuickCheck, simpleSendfile -, transformers, unixCompat, void, wai +, conduit, doctest, hashable, hspec, HTTP, httpAttoparsec, httpDate +, httpTypes, HUnit, liftedBase, network, networkConduit, QuickCheck +, simpleSendfile, time, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.10.1"; - sha256 = "1pi2x0gi4r6qy151a9gmfq223yiy53j7prj2pyn00cprr0m4mk2v"; + version = "2.0.0.1"; + sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpAttoparsec httpTypes liftedBase network networkConduit + httpAttoparsec httpDate httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; testDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - hspec HTTP httpAttoparsec httpTypes HUnit liftedBase network - networkConduit QuickCheck simpleSendfile transformers unixCompat - void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit doctest + hashable hspec HTTP httpAttoparsec httpDate httpTypes HUnit + liftedBase network networkConduit QuickCheck simpleSendfile time + transformers unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; -- cgit 1.4.1 From 8d8db388d91c49ebc8534c4dfdc2d61771a5efb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-wl-pprint-extras: update to version 3.5 --- pkgs/development/libraries/haskell/wl-pprint-extras/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 77670b4f117e..dd32750ffe91 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -1,10 +1,13 @@ -{ cabal, nats, semigroupoids, semigroups, text, utf8String }: +{ cabal, HUnit, nats, semigroupoids, semigroups, testFramework +, testFrameworkHunit, text, utf8String +}: cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.4"; - sha256 = "17vxyckx2pj4sc2d1yw1rcsxn1rp4nzdjp0hgpy78xsp9plccgsy"; + version = "3.5"; + sha256 = "172xp23j3w8jbd7h0sna9g8p4d6xwy8154gqj93ycz2907r2kwb7"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; -- cgit 1.4.1 From 73a20b0473f7aff5132a189e6220fe38840c9470 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-wl-pprint-terminfo: update to version 3.7 --- pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index d2bd35eebd41..989d56afd7dc 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.6"; - sha256 = "14dq0inv6i8pwjzrpys420iwi6002mard1n73z96k89zq5xhwlbg"; + version = "3.7"; + sha256 = "01lzk8wfynb98ks8a0gvj8qffi50zlfaywlc9axr6j7h8rrblnm3"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; -- cgit 1.4.1 From a18328c0b6107af70f997e5e1157b57406efdbb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-xdot: update to version 0.2.4.1 --- pkgs/development/libraries/haskell/xdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index f7a2b731d037..7119705b357e 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4"; - sha256 = "0723drp9zs3hrayld99j4fniyvm65fz19hkk4001vpvgjw27dfja"; + version = "0.2.4.1"; + sha256 = "1k1ci9lq8l9bx8ks7rdng9jjj6d7hcwgmfbz757al85m1q17xa64"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; -- cgit 1.4.1 From 4923a984a57088451ab46a29ea056cf8f062b3c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-xml-conduit: update to version 1.1.0.9 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 3f97a028729e..28a5beb966f8 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.8"; - sha256 = "06if4mbrbcsjhk7hj3616fhgfh0rlsj95jblsbxq2drb4bn56r39"; + version = "1.1.0.9"; + sha256 = "01sx8yblknv0dyi7z6k6icfvwjvl4dyhrka1d6y1793xcp1mkxs6"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault deepseq failure -- cgit 1.4.1 From 3517ae882948351a6883030a10855797ece06873 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-xml-hamlet: update to version 0.4.0.6 --- pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index e2719984708a..885620f0648a 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.5"; - sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5"; + version = "0.4.0.6"; + sha256 = "05izdqpxw0gq2wgs4ckr55xvzfk5ay7xpbcvihj66myiah5azqwy"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { -- cgit 1.4.1 From c333429da943e049d882d4bf4a1057a30b6bf3cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:24 +0100 Subject: haskell-yesod-auth: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index bdc299939196..87cbe9f3d438 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.3"; - sha256 = "1hnppb36acr18prra702r9hdbs803zfvaj8krq4idlvwb6g7l0d8"; + version = "1.2.4"; + sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network -- cgit 1.4.1 From c2f98216f8a80bdf989f8b00299b3dbd78ea1cef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod-bin: update to version 1.2.5.1 --- .../libraries/haskell/yesod-bin/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index c93c76ee3fab..dbee52da8680 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,5 +1,5 @@ { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit -, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit +, dataDefault, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit , httpReverseProxy, httpTypes, liftedBase, network, networkConduit , optparseApplicative, parsec, projectTemplate, resourcet , shakespeare, shakespeareCss, shakespeareJs, shakespeareText @@ -10,17 +10,18 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.4.1"; - sha256 = "18wzxalgiffdjz6x5vxmhksscy5531plgyjkv705kf5vaw6v6rlr"; + version = "1.2.5.1"; + sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed - filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes - liftedBase network networkConduit optparseApplicative parsec - projectTemplate resourcet shakespeare shakespeareCss shakespeareJs - shakespeareText split systemFileio systemFilepath tar text time - transformers unixCompat unorderedContainers wai warp yaml zlib + attoparsec base64Bytestring blazeBuilder Cabal conduit dataDefault + fileEmbed filepath fsnotify ghcPaths httpConduit httpReverseProxy + httpTypes liftedBase network networkConduit optparseApplicative + parsec projectTemplate resourcet shakespeare shakespeareCss + shakespeareJs shakespeareText split systemFileio systemFilepath tar + text time transformers unixCompat unorderedContainers wai warp yaml + zlib ]; meta = { homepage = "http://www.yesodweb.com/"; -- cgit 1.4.1 From c1f1d00bce88843c884950c95852f129c5bfa4a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod-core: update to version 1.2.6.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 789d158fa6c5..86b2eec8945c 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -4,21 +4,22 @@ , httpTypes, HUnit, liftedBase, monadControl, monadLogger, parsec , pathPieces, QuickCheck, random, resourcet, safe, shakespeare , shakespeareCss, shakespeareI18n, shakespeareJs, text, time -, transformers, transformersBase, vector, wai, waiExtra, waiTest -, warp, yesodRoutes +, transformers, transformersBase, unixCompat, vector, wai, waiExtra +, waiLogger, waiTest, warp, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.5"; - sha256 = "0ia5j6vnxy32y6776wlsfcv9d6s7slqpmkhxw3pipcqd5sjn4kf9"; + version = "1.2.6.1"; + sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault failure fastLogger hamlet httpTypes liftedBase monadControl monadLogger parsec pathPieces random resourcet safe shakespeare shakespeareCss shakespeareI18n shakespeareJs text time transformers - transformersBase vector wai waiExtra warp yesodRoutes + transformersBase unixCompat vector wai waiExtra waiLogger warp + yesodRoutes ]; testDepends = [ blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase -- cgit 1.4.1 From 7a7b9e515b09505f19e4eccdfaee65f0b4ed3cc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod-persistent: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index 2c6b6f96fbc5..a3740629150a 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.2.1"; - sha256 = "06kzxdbg3xw128zlacsf51qi7qnccw0gjnwscxshljgipiicfhfc"; + version = "1.2.2"; + sha256 = "0pi7r6mf8ikd76cwdpjzb1lf73jc3f0ji3xximmg25q8lwcjygq5"; buildDepends = [ blazeBuilder conduit liftedBase persistent persistentTemplate poolConduit resourcet transformers yesodCore -- cgit 1.4.1 From 91e2d2bf9b6362a0e9e8afaaec6aa4d50dcc8daa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod-routes: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 4cbb865c9069..d651e90a8a7f 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.1"; - sha256 = "0pp7g3ccd0swh1j62am1vg9r2gh65jcci5w2n4r42sqzfnql0i8z"; + version = "1.2.0.2"; + sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { -- cgit 1.4.1 From 48958dac0611b3bb5e68878e2be6afe40e9470a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod-static: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index c1f3c4ea8734..c29cbe759749 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.2.1.1"; - sha256 = "009p6hq6hwmvji40yqv97v1sfwdfh44pasp68cxw05czhcwwcacv"; + version = "1.2.2"; + sha256 = "06abyfmqzv6aap0ww7vkw4j6xv6dkivn0g7wx59j2l54dfqrjifr"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohashCryptoapi dataDefault fileEmbed filepath hjsmin httpTypes mimeTypes -- cgit 1.4.1 From 5e5855d95ca2d0c104d7903344d0d53ce3a378db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 13:03:25 +0100 Subject: haskell-yesod: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 9f416ad27f93..b4e935428b2a 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.3"; - sha256 = "0y1jwz7azk078kf14hsylgpwljdmrainhwflgxwyf0gcc5l7jhz3"; + version = "1.2.4"; + sha256 = "0c8z4hsplfjb2ilrk0qbyighjipwcfhf55xqaw4zqvq752yj4n7c"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers -- cgit 1.4.1 From 9fcd7a8994206536ca0e48a9a2fb64df2bdf7ecf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 19:37:17 +0100 Subject: haskell-warp: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/warp/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 15dd0ec15ec1..0b6d3403c46f 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { liftedBase network networkConduit QuickCheck simpleSendfile time transformers unixCompat void wai ]; + doCheck = false; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; -- cgit 1.4.1 From b2770afe611a0430872a25f014dd564aea7e9dc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Dec 2013 23:01:48 +0100 Subject: haskell-cmdargs: work around broken tarball on Hackage --- pkgs/development/libraries/haskell/cmdargs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index ba8793ebb45c..1bd39a387bba 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; + patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; -- cgit 1.4.1 From e810997859191f9643a01affe9dae1c19f718743 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:40:15 +0100 Subject: haskell-http-client: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index fd40ca88e1dc..3658bc6bf8d1 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { failure hspec httpTypes monadControl network text time transformers zlib zlibBindings ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; -- cgit 1.4.1 From 9a7c392af3cd690df8546859f1767fe0e8b7687e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 10:47:53 +0100 Subject: haskell-http-client-tls: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-client-tls/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5056a94c5d94..f92ddcd7d551 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; + doCheck = false; meta = { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; -- cgit 1.4.1 From d231aca644ec56bea8f1a45f0d7e6b3f45521bcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:02:59 +0100 Subject: haskell-parsec: update to version 3.1.4 --- pkgs/development/libraries/haskell/parsec/3.1.4.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/parsec/3.1.4.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/parsec/3.1.4.nix b/pkgs/development/libraries/haskell/parsec/3.1.4.nix new file mode 100644 index 000000000000..82032dda61c8 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsec/3.1.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "parsec"; + version = "3.1.4"; + sha256 = "0milmi4q5jdcmmwjqa4lcs1vcw5frkrlrxc8q17lkas3p2m10kh5"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + description = "Monadic parser combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1b6d333705b2..2e8e5c741ba9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,7 +158,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; - parsec = self.parsec_3_1_3; + parsec = self.parsec_3_1_4; QuickCheck = self.QuickCheck_2_6; random = self.random_1_0_1_1; regexBase = self.regexBase_0_93_2; @@ -1701,8 +1701,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x parsec_3_1_1 = callPackage ../development/libraries/haskell/parsec/3.1.1.nix {}; parsec_3_1_2 = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {}; parsec_3_1_3 = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {}; + parsec_3_1_4 = callPackage ../development/libraries/haskell/parsec/3.1.4.nix {}; parsec2 = self.parsec_2_1_0_1; - parsec3 = self.parsec_3_1_3; + parsec3 = self.parsec_3_1_4; parsec = self.parsec3; parsers_0_9 = callPackage ../development/libraries/haskell/parsers/0.9.nix {}; -- cgit 1.4.1 From e9848e3b792cedbe8cebb26b05f565252dce3c25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-cmdargs: update to version 0.10.7 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 1bd39a387bba..7678849930e4 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.6"; - sha256 = "1ckzznza8nqidwq7vd6jlxkjgb7xd4rvqi7gm8ca9laj0cvwkclw"; + version = "0.10.7"; + sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; - patchPhase = "touch cmdargs.cabal"; meta = { homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Command line argument processing"; -- cgit 1.4.1 From 00b20b6caf51b9f98fa3521a5dd0dd6d6ec714eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-haskell-names: update to version 0.3.2.2 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 7e6619d4f357..b77cd134dc81 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.1"; - sha256 = "1ddixm37y1wkqsrs4cxvnmjczapwq1n67xg5rhkj0k7d04c8agha"; + version = "0.3.2.2"; + sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass -- cgit 1.4.1 From 55ed7d9466b634cb8df5fe99b8f02dab1a1c120e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-hoogle: update to version 4.2.25 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index fb4c33d73374..40d475421141 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.24"; - sha256 = "01q0pr82wscnrm7flb1sd9fv8sym1pkdfvdmp6qcfwzzvrcsh5h2"; + version = "4.2.25"; + sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From a21f8721c4a6d8af300ef2e2ff414da35e2c7dd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-persistent-template: update to version 1.2.0.5 --- pkgs/development/libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index c3bb228933d3..e54ebce96762 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.4"; - sha256 = "0lhqv4mcai9r5mzj5h6fsd1hd8mv1458id0rb6q157192gywxhzf"; + version = "1.2.0.5"; + sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; -- cgit 1.4.1 From 702370e3cdd228f060009528a99bbc4c8b5f14df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-shakespeare-css: update to version 1.0.6.6 --- pkgs/development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 7dedf465f655..853a6294131f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.5"; - sha256 = "1jmi5rh4a9x7md90sgzk6pmn0pn4h9mn44z8z0haq3fzflravqdk"; + version = "1.0.6.6"; + sha256 = "1xjavlw88nj5ila2b4m44zj0qgkpq147b30x1arwv0ik8szgml9k"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { -- cgit 1.4.1 From cd3a9434fee4c8c50688a5542ec418b89995e1f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-unix-process-conduit: update to version 0.2.2.1 --- pkgs/development/libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 1f04d939d9c1..8470a2d3f821 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.2"; - sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6"; + version = "0.2.2.1"; + sha256 = "0zix8m38dza95g6ijip4r5nxz6y9vkh5jy8ksg4qpx1v2ib1m2cc"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { -- cgit 1.4.1 From 3242e0d495d3ff12d30c229ba3d2807f61f1e83b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:03:13 +0100 Subject: haskell-wai-app-static: update to version 2.0.0.1 --- .../libraries/haskell/wai-app-static/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 3bcf63e17963..a6b8eeb4058b 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,18 +1,18 @@ { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , cereal, cryptoApi, cryptoConduit, cryptohashCryptoapi, fileEmbed -, hspec, httpDate, httpTypes, mimeTypes, network, systemFileio -, systemFilepath, text, time, transformers, unixCompat -, unorderedContainers, wai, waiTest, zlib +, filepath, hspec, httpDate, httpTypes, mimeTypes, network +, systemFileio, systemFilepath, text, time, transformers +, unixCompat, unorderedContainers, wai, waiTest, zlib }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0"; - sha256 = "0zbjwghkg4xsjfxq74s6c041mvkj168r8nhh946yz6n660bkisai"; + version = "2.0.0.1"; + sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal - cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed httpDate - httpTypes mimeTypes systemFileio systemFilepath text time + cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath + httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat unorderedContainers wai zlib ]; testDepends = [ -- cgit 1.4.1 From 9d38ae8bcf7168987b99e07369fb43ccb47d5975 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:10:50 +0100 Subject: haskell-http-conduit: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 403fdbe59b79..30dacc9b6b1c 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void wai warp warpTls zlibConduit ]; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; -- cgit 1.4.1 From 12a3008d4c0683818976508f62bf10eb205d80cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 11:46:18 +0100 Subject: haskell-http-reverse-proxy: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/http-reverse-proxy/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index f745554e4891..a8e0afc786ea 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { blazeBuilder conduit hspec httpConduit httpTypes liftedBase network networkConduit transformers wai warp ]; + doCheck = false; meta = { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; -- cgit 1.4.1 From c9a52836c83d8e455092e0a1e210f59aec22c077 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:18:54 +0100 Subject: haskell-pretty-show: resurrect version 1.2, which is required to build hledger on old versions of GHC This reverts commit 54bfef6fc3d88eabfbd17c440c906170f7bc00ef. --- pkgs/development/libraries/haskell/pretty-show/1.2.nix | 16 ++++++++++++++++ .../libraries/haskell/pretty-show/1.6.2.nix | 18 ++++++++++++++++++ .../libraries/haskell/pretty-show/default.nix | 18 ------------------ pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix create mode 100644 pkgs/development/libraries/haskell/pretty-show/1.6.2.nix delete mode 100644 pkgs/development/libraries/haskell/pretty-show/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 000000000000..545816a57a02 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ cabal, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellLexer ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived Show instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix new file mode 100644 index 000000000000..ea3b7ed27cbf --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.6.2.nix @@ -0,0 +1,18 @@ +{ cabal, filepath, happy, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.6.2"; + sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ filepath haskellLexer ]; + buildTools = [ happy ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived `Show` instances and generic inspection of values"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix deleted file mode 100644 index ea3b7ed27cbf..000000000000 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, filepath, happy, haskellLexer }: - -cabal.mkDerivation (self: { - pname = "pretty-show"; - version = "1.6.2"; - sha256 = "0xhxyxymdjag2xczjrda5dkjc51m5k1nanpg9dmw0gr6wjaijbnp"; - isLibrary = true; - isExecutable = true; - buildDepends = [ filepath haskellLexer ]; - buildTools = [ happy ]; - meta = { - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e8e5c741ba9..5e4488add3fe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1772,9 +1772,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ppm = callPackage ../development/libraries/haskell/ppm {}; - prettyShow = callPackage ../development/libraries/haskell/pretty-show { + prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {}; + prettyShow_1_6_2 = callPackage ../development/libraries/haskell/pretty-show/1.6.2.nix { happy = self.happy_1_19_2; }; + prettyShow = self.prettyShow_1_6_2; punycode = callPackage ../development/libraries/haskell/punycode {}; -- cgit 1.4.1 From 0262a86ad1ae97d792c73f221994873b03973d7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-blaze-builder: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/blaze-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 36b8f57cc400..51dda936687d 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder"; - version = "0.3.3.0"; - sha256 = "0j6nrwcnpcr7c17cxw3v85m19q8z91wb6jir8c6kls5m321hwd63"; + version = "0.3.3.2"; + sha256 = "038ig1a1iz0hc36l53f5g7h6aiz7b1lggq1d04y3ql9a0553vd40"; buildDepends = [ text ]; meta = { homepage = "http://github.com/meiersi/blaze-builder"; -- cgit 1.4.1 From d5a0a812ddb993ea2a3816d42dd8ec08516d3fbf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-digestive-functors-heist: update to version 0.8.3.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 91d1bf0bcbcd..f83488b850d9 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.1.0"; - sha256 = "0f9nhfy8rc1w9nnhq1yf9y2kwxlb9b6v8y1jz5q3lrpb1cnq31j0"; + version = "0.8.3.0"; + sha256 = "1im9247mvqngknvkjncjrjj3wydz2k9wlsin53vyddjcqbqxa54g"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; -- cgit 1.4.1 From 6e0f60a5395fa1e453607046bab60dd4f559de1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-digestive-functors-snap: update to version 0.6.0.1 --- .../development/libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index f23ee6d06910..6b20ed6ae89e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.6.0.0"; - sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88"; + version = "0.6.0.1"; + sha256 = "0y26fqhjb78mv6rzp3x6cbxrq4dqh2dzd81wd5sgsm079j5frjj7"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; -- cgit 1.4.1 From 7534476fada3910714ab740e7535be42c3f4dbb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-digestive-functors: update to version 0.6.1.1 --- pkgs/development/libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 1d3f31e55688..2207f18c35cd 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.0"; - sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; + version = "0.6.1.1"; + sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; buildDepends = [ mtl text ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit -- cgit 1.4.1 From c97000f77c068c8aecbc73d2ac4d4deb07f92771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-hoogle: update to version 4.2.26 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 40d475421141..70c8ecb249d8 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.25"; - sha256 = "0s62h90hbmq1w11iqf44r1lx4acad9h6h62i8qjbsygbnmgkbn95"; + version = "4.2.26"; + sha256 = "07nc58vqdj5x3h6d7z8ilbff0pkqd3r7g789xyaalnh6wjkd7380"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 9d3022ec35305d8ff2b5a60496828153190f29e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-http-client: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 3658bc6bf8d1..2724b27673db 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.1"; - sha256 = "0iqlq0drylxc9ir362pdbljghh5mxrmqjl51s02381y7jc0mfjs0"; + version = "0.2.0.2"; + sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time -- cgit 1.4.1 From 66bd60896df4343c2e7b1e1e8fffb9d6dc6b5052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-http-conduit: update to version 2.0.0.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 30dacc9b6b1c..b041957e555b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.1"; - sha256 = "1xkq11yylh4mdx8ml69h17fldmfpxclriw1kl0j44vddqdryn6zd"; + version = "2.0.0.2"; + sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers -- cgit 1.4.1 From e51fe9c496cab1f236129768d07592f54316eb44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-path-pieces: update to version 0.1.3.1 --- pkgs/development/libraries/haskell/path-pieces/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index cdfe320a0609..b29527488436 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.3"; - sha256 = "03x9kfcaz1zsdpdzs05pcl0hv4hffgsl2js8xiy5slba6n841v4l"; + version = "0.1.3.1"; + sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; buildDepends = [ text time ]; testDepends = [ hspec HUnit QuickCheck text ]; meta = { -- cgit 1.4.1 From 303ce435511963cb83e517f3049f1b956f01762f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 12:21:53 +0100 Subject: haskell-persistent-template: update to version 1.2.0.6 --- pkgs/development/libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index e54ebce96762..9dc42ea5e39c 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.2.0.5"; - sha256 = "1i1rfs1x9dfm89zib1wy0wsksk3cfwkz84b492v6751v8ysdfsjh"; + version = "1.2.0.6"; + sha256 = "1vkrxf2dabk9z0igfbvb2ib2bxcxi5af2vpxllv74cbjz9r6ip3s"; buildDepends = [ aeson monadControl monadLogger persistent text transformers ]; -- cgit 1.4.1 From 878227d7aa7383bf8a0daeaeeae7614673c50ea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:39:20 +0100 Subject: haskell-ListLike: jailbreak to fix the build with text 1.x --- pkgs/development/libraries/haskell/ListLike/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index d8e1e0c6f429..973fca3fb991 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; + jailbreak = true; meta = { homepage = "http://software.complete.org/listlike"; description = "Generic support for list-like structures"; -- cgit 1.4.1 From 5afc2d5cf323cf40bbce5c8978c3e35e751d6740 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: haskell-http-client: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 2724b27673db..221d82033bc5 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.2.0.2"; - sha256 = "1b6057yvbcrd01qp9gcmqh27zbla4d5krrsl279hmklkm2fd2zm3"; + version = "0.2.0.3"; + sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefault deepseq failure httpTypes network publicsuffixlist text time -- cgit 1.4.1 From 8248ffc9e4681bf67b9db11ba491b964208eb5ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: haskell-lifted-async: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index 8fbfd1f51b01..fa48f289a4ca 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.1.0"; - sha256 = "09ns06qgnwls6zcqsjvr7ykhpr1w12vq49ix4bkqriarl1q3ap7b"; + version = "0.1.0.1"; + sha256 = "03b89cixfin7ksdjh12g0pfrmgzw9mnx6nyvywv3rjc1sra3b8f0"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ HUnit liftedBase monadControl mtl testFramework testFrameworkHunit -- cgit 1.4.1 From 49536b487f7448bc93e2ab37b120251a0b888dc6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: haskell-tasty-ant-xml: update to version 1.0.0.4 --- pkgs/development/libraries/haskell/tasty-ant-xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 3d68e8232755..4d90d51fceb9 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-ant-xml"; - version = "1.0.0.2"; - sha256 = "1c13gmqsp33cfqim7aqqjypabkx42rmmhmjj8fpcr0ainpmvwkwi"; + version = "1.0.0.4"; + sha256 = "09qgakwqaqgppplxybkgyhyryxrw1pwlgkiqpixrqqhjans3z0hn"; buildDepends = [ genericDeriving mtl reducers stm tagged tasty transformers xml ]; -- cgit 1.4.1 From bf34b53746231b553c3c163b77207f367683eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: haskell-tasty-golden: update to version 2.2.0.1 --- pkgs/development/libraries/haskell/tasty-golden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index 2f27e50d8f9c..14c642239399 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2"; - sha256 = "0z49w4ksbbih3x0j170pfy93r2d68jw34hdni4s2p43kds52cakb"; + version = "2.2.0.1"; + sha256 = "0zr8ikg1j1nc29b6i23wb7zwbq0kmvjry7a1a6ldnz4p13m05q6d"; buildDepends = [ filepath mtl optparseApplicative tagged tasty temporary ]; -- cgit 1.4.1 From 28ba549fa8b02de5c16da37f8fc205e64230ced9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:18 +0100 Subject: haskell-tasty: update to version 0.5.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 9ad53093c68b..8153eb9f6a76 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.2"; - sha256 = "06348zdagaxk0axdmfj38r2h6pcacr0kqwx6hz6f499xdj8g74g9"; + version = "0.5.1"; + sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; -- cgit 1.4.1 From e32ee4acf9f5fd8b8fadcfb92d2bde3993cfae9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: haskell-vault: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 3f2842844443..8786838ab3db 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.3.0.2"; - sha256 = "1m9vanwzlw61fbdcy7qvv2prmbax5y9dsl52dldcf5zr7vip2hpb"; + version = "0.3.0.3"; + sha256 = "0wpj73jbwgcva1hfjc0bpf9l3lfc3iwdz70m29dh1785wvzxhsh5"; buildDepends = [ hashable unorderedContainers ]; jailbreak = true; meta = { -- cgit 1.4.1 From 4df80c3c2edc1b709423c3b00b293e22968178bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: haskell-warp: update to version 2.0.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0b6d3403c46f..04fb88de0d6b 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "2.0.0.1"; - sha256 = "12n1r1qahngfhrqhlbfjl11rmy5la9mpd0h4ai0lzdxkakb89pxl"; + version = "2.0.1"; + sha256 = "1sgsiw75xm3b1bv0cnpkx6vn6k0r1an3c94xw5bab4h7blb9jk4a"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpDate httpTypes liftedBase network networkConduit -- cgit 1.4.1 From 43070fe84f2d70de650987de5e92248290d9152d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 20:45:19 +0100 Subject: haskell-yesod-platform: update to version 1.2.5 --- .../libraries/haskell/yesod-platform/default.nix | 77 +++++++++++----------- 1 file changed, 40 insertions(+), 37 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 7d56ca1142cd..ee9cd3b1fd3b 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -2,56 +2,59 @@ , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie -, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash -, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault -, dataDefaultClass, dataDefaultInstancesBase +, certificate, cipherAes, cipherRc4, clientsession, conduit +, connection, controlMonadLoop, cookie, cprngAes, cryptoApi +, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi +, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom +, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist -, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate -, entropy, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit -, httpAttoparsec, httpConduit, httpDate, httpTypes -, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph -, monadControl, monadLogger, networkConduit, pathPieces, pem -, persistent, persistentTemplate, poolConduit, primitive -, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA -, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs -, shakespeareText, silently, simpleSendfile, skein, socks -, stringsearch, systemFileio, systemFilepath, tagged, tagsoup -, tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat -, unorderedContainers, utf8Light, utf8String, vector, void, wai -, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 -, xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth -, yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic -, yesodTest, zlibBindings, zlibConduit +, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy +, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin +, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient +, httpClientConduit, httpClientTls, httpConduit, httpDate +, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes +, mmorph, monadControl, monadLogger, monadLoops, networkConduit +, pathPieces, pem, persistent, persistentTemplate, poolConduit +, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast +, quickcheckIo, resourcePool, resourcet, safe, securemem +, semigroups, setenv, SHA, shakespeare, shakespeareCss +, shakespeareI18n, shakespeareJs, shakespeareText, silently +, simpleSendfile, skein, socks, stmChans, stringsearch +, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit +, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers +, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra +, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes +, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm +, yesodPersistent, yesodRoutes, yesodStatic, yesodTest +, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.4.4"; - sha256 = "0avqaqx81rald37j4qxp75ixgq5q4a3b8fnlmfsp9d54nfp3hxji"; + version = "1.2.5"; + sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes - cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers - cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault - dataDefaultClass dataDefaultInstancesBase - dataDefaultInstancesContainers dataDefaultInstancesDlist - dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy - failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec - hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate - httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph - monadControl monadLogger networkConduit pathPieces pem persistent - persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + clientsession conduit connection controlMonadLoop cookie cprngAes + cryptoApi cryptoCipherTypes cryptoConduit cryptohash + cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandom cssText dataDefault dataDefaultClass + dataDefaultInstancesBase dataDefaultInstancesContainers + dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist + emailValidate entropy failure fastLogger fileEmbed + filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit + httpAttoparsec httpClient httpClientConduit httpClientTls + httpConduit httpDate httpTypes languageJavascript liftedBase + mimeMail mimeTypes mmorph monadControl monadLogger monadLoops + networkConduit pathPieces pem persistent persistentTemplate + poolConduit primitive processConduit publicsuffixlist pureMD5 pwstoreFast quickcheckIo resourcePool resourcet safe securemem semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs shakespeareText silently simpleSendfile skein socks - stringsearch systemFileio systemFilepath tagged tagsoup + stmChans stringsearch systemFileio systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra transformersBase unixCompat unorderedContainers utf8Light utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit -- cgit 1.4.1 From 6cd149f2a975e9db3716bc5aa0e95674064bef0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 21:47:39 +0100 Subject: hoogle: disable test suite to fix the build See issue . --- pkgs/development/libraries/haskell/hoogle/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 70c8ecb249d8..b461b5a1fd41 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { tagsoup text time transformers uniplate wai warp ]; testDepends = [ filepath ]; + doCheck = false; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; -- cgit 1.4.1 From 48f24712dca6859a4f66dcb46c5b5056a12f0ef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Dec 2013 23:20:23 +0100 Subject: Fix a lots of evaluation errors on Hydra. --- pkgs/development/libraries/haskell/HFuse/default.nix | 2 +- pkgs/development/libraries/haskell/alsa-core/default.nix | 2 +- pkgs/development/libraries/haskell/alsa-pcm/default.nix | 2 +- pkgs/development/libraries/haskell/gloss-accelerate/default.nix | 1 + .../libraries/haskell/gloss-raster-accelerate/default.nix | 1 + pkgs/development/libraries/imlib2/default.nix | 6 +++--- pkgs/development/libraries/json-c/default.nix | 2 +- pkgs/development/libraries/libmng/default.nix | 2 +- pkgs/development/libraries/pango/default.nix | 2 +- pkgs/tools/X11/bgs/default.nix | 7 +++---- pkgs/tools/backup/bup/default.nix | 3 +-- pkgs/tools/networking/pdsh/default.nix | 2 +- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- pkgs/tools/typesetting/lhs2tex/default.nix | 1 + 14 files changed, 18 insertions(+), 17 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 9d37b580d802..2012739afb45 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/toothbrush/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index 140d554e88c6..f38082fba88b 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 3d1091f27027..39123a176dc7 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix index c4a31d541b58..2c53925f975d 100644 --- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Extras to interface Gloss and Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix index 7ed70bc092cf..db5b62169c40 100644 --- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel rendering of raster images using Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d77e2052f811..b1c154badd8e 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "imlib2-1.4.5"; - + src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; meta = { - platforms = stdenv.lib.platforms.gnu; # random choice + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 7953b04183a9..78100521584b 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { and parse JSON formatted strings back into the C representation of JSON objects. ''; - platforms = platforms.linux; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index fcaf95672e18..818789173844 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.libmng.com; license = "zlib/libpng"; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ca1db1372064..f57ee931fafa 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index 0c6951aa3e76..ed700fa63569 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -14,11 +14,10 @@ stdenv.mkDerivation rec { preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; - meta = { + meta = { description = "Extremely fast and small background setter for X"; license = "MIT"; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [pSub]; + hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [pSub]; }; } - diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 54b089bd08e9..d1748cc252ef 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation { Capable of doing *fast* incremental backups of virtual machine images. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 80fc075107c1..d6952b8e3757 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { while timeouts occur on some connections. ''; - platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 723741b2c836..8a5eb6ad759e 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + hydraPlatforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ec1c9021522f..ade7fd202d53 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) -- cgit 1.4.1 From da88a3a81e09d052f162122e112f987981da65e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 15:11:19 +0100 Subject: haskell-markdown-unlit: cannot generate documentation with Haddock shipped with ghc 7.0.4 or earlier --- pkgs/development/libraries/haskell/markdown-unlit/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 06c1b9e2fcae..e09feb10d905 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; testDepends = [ hspec QuickCheck silently stringbuilder ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { description = "Literate Haskell support for Markdown"; license = self.stdenv.lib.licenses.mit; -- cgit 1.4.1 From a9a5bde463e59b1a186de15fff3be5e1943efe61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:28:54 +0100 Subject: haskell-HTTP: update to version 4000.2.10 --- .../libraries/haskell/HTTP/4000.2.10.nix | 24 ++++++++++++++++++++++ .../libraries/haskell/HTTP/4000.2.9.nix | 24 ---------------------- pkgs/top-level/haskell-packages.nix | 6 +++--- 3 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.10.nix delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.9.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix new file mode 100644 index 000000000000..c893d2f1e750 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix @@ -0,0 +1,24 @@ +{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes +, HUnit, mtl, network, parsec, pureMD5, split, testFramework +, testFrameworkHunit, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.10"; + sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; + buildDepends = [ mtl network parsec ]; + testDepends = [ + caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl + network pureMD5 split testFramework testFrameworkHunit wai warp + ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix deleted file mode 100644 index 4ab03112189c..000000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes -, HUnit, mtl, network, parsec, pureMD5, split, testFramework -, testFrameworkHunit, wai, warp -}: - -cabal.mkDerivation (self: { - pname = "HTTP"; - version = "4000.2.9"; - sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; - buildDepends = [ mtl network parsec ]; - testDepends = [ - caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl - network pureMD5 split testFramework testFrameworkHunit wai warp - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/haskell/HTTP"; - description = "A library for client-side HTTP"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e8fac4ab52e1..c18848761504 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_9; + HTTP = self.HTTP_4000_2_10; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; network = self.network_2_4_2_1; @@ -1217,8 +1217,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_9 = callPackage ../development/libraries/haskell/HTTP/4000.2.9.nix {}; - HTTP = self.HTTP_4000_2_9; + HTTP_4000_2_10 = callPackage ../development/libraries/haskell/HTTP/4000.2.10.nix {}; + HTTP = self.HTTP_4000_2_10; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; -- cgit 1.4.1 From 524935ebd567f388d2c9130ddd1cac018b8ce07a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:12 +0100 Subject: haskell-assert-failure: add version 0.1 --- .../libraries/haskell/assert-failure/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/assert-failure/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix new file mode 100644 index 000000000000..abc520e7b4ba --- /dev/null +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -0,0 +1,14 @@ +{ cabal, prettyShow, text }: + +cabal.mkDerivation (self: { + pname = "assert-failure"; + version = "0.1"; + sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + buildDepends = [ prettyShow text ]; + meta = { + homepage = "https://github.com/Mikolaj/assert-failure"; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c18848761504..1eeb36ddea25 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -548,6 +548,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x arrows = callPackage ../development/libraries/haskell/arrows {}; + assertFailure = callPackage ../development/libraries/haskell/assert-failure {}; + asn1Data = callPackage ../development/libraries/haskell/asn1-data {}; asn1Types = callPackage ../development/libraries/haskell/asn1-types {}; -- cgit 1.4.1 From b30738afe2511725a8909748b1c9178317b4f5e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:29:23 +0100 Subject: haskell-enummapset-th: add version 0.6.0.0 --- .../libraries/haskell/enummapset-th/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/enummapset-th/default.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix new file mode 100644 index 000000000000..0b992a9daaff --- /dev/null +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "enummapset-th"; + version = "0.6.0.0"; + sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/liyang/enummapset-th"; + description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1eeb36ddea25..9747583549d6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -964,6 +964,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x enummapset = callPackage ../development/libraries/haskell/enummapset {}; + enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {}; + entropy = callPackage ../development/libraries/haskell/entropy {}; erf = callPackage ../development/libraries/haskell/erf {}; -- cgit 1.4.1 From ae58890b21757756053c321d5d54fee03eaae957 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:09 +0100 Subject: haskell-monad-par: update to version 0.3.4.6 --- .../libraries/haskell/monad-par/0.3.4.5.nix | 28 ---------------------- .../libraries/haskell/monad-par/0.3.4.6.nix | 28 ++++++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix create mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix deleted file mode 100644 index 58cbb522fa24..000000000000 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras -, mtl, mwcRandom, parallel, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh -, time -}: - -cabal.mkDerivation (self: { - pname = "monad-par"; - version = "0.3.4.5"; - sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; - buildDepends = [ - abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom - parallel - ]; - testDepends = [ - abstractDeque abstractPar deepseq HUnit monadParExtras mtl - mwcRandom QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time - ]; - doCheck = false; - meta = { - homepage = "https://github.com/simonmar/monad-par"; - description = "A library for parallel programming based on a monad"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix new file mode 100644 index 000000000000..911d984a88c0 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -0,0 +1,28 @@ +{ cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras +, mtl, mwcRandom, parallel, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh +, time +}: + +cabal.mkDerivation (self: { + pname = "monad-par"; + version = "0.3.4.6"; + sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; + buildDepends = [ + abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom + parallel + ]; + testDepends = [ + abstractDeque abstractPar deepseq HUnit monadParExtras mtl + mwcRandom QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 testFrameworkTh time + ]; + doCheck = false; + meta = { + homepage = "https://github.com/simonmar/monad-par"; + description = "A library for parallel programming based on a monad"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9747583549d6..af8eb5ea7dfa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1536,8 +1536,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_5 = callPackage ../development/libraries/haskell/monad-par/0.3.4.5.nix {}; - monadPar = self.monadPar_0_3_4_5; + monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; + monadPar = self.monadPar_0_3_4_6; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; -- cgit 1.4.1 From 6a3e496f6b0bf960587c3e2e643021ed0b00e444 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-ListLike: update to version 4.0.2 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 973fca3fb991..a9723721e1e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.1"; - sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; + version = "4.0.2"; + sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; jailbreak = true; -- cgit 1.4.1 From c89a0aab3cf46bee7dc424eeac530ef99dd0c032 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-cufft: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/cufft/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 5caec8341392..df9f686383e1 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.1"; - sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx"; + version = "0.1.0.3"; + sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- cgit 1.4.1 From 03ed01551002ee53725196f3592afd116423e598 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-data-memocombinators: update to version 0.5.1 --- pkgs/development/libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index df6777313264..3bdaf941c837 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.5.0"; - sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74"; + version = "0.5.1"; + sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; -- cgit 1.4.1 From 9fe0d3696346f41d821b36cc8b1a2cc6e0eb5f0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-digestive-functors: update to version 0.6.2.0 --- .../libraries/haskell/digestive-functors/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 2207f18c35cd..43f0c4337e74 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,15 +1,15 @@ { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.1"; - sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; - buildDepends = [ mtl text ]; + version = "0.6.2.0"; + sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7"; + buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text + testFrameworkQuickcheck2 text time ]; jailbreak = true; meta = { -- cgit 1.4.1 From 8df4a267a139135134243ef78d45fad3a43f0bb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger-lib: update to version 0.22 --- .../libraries/haskell/hledger-lib/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 87d5181fa7de..89a6622cf1ce 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,20 +1,20 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow -, regexCompat, regexpr, safe, split, testFramework +{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec +, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework , testFrameworkHunit, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21.3"; - sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870"; + version = "0.22"; + sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split time transformers utf8String + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split time transformers utf8String ]; testDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split testFramework testFrameworkHunit time - transformers + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split testFramework testFrameworkHunit + time transformers ]; meta = { homepage = "http://hledger.org"; -- cgit 1.4.1 From e759fa2d558f595f9cd186a229b23dcf01e224ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger-web: update to version 0.22 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index e4dd6ef1faad..f846dba7fc87 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,20 +1,20 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec -, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe -, shakespeareText, text, time, transformers, wai, waiExtra -, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic -, yesodTest +, httpClient, httpConduit, HUnit, json, networkConduit, parsec +, regexpr, safe, shakespeareText, text, time, transformers, wai +, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore +, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21.3"; - sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy"; + version = "0.22"; + sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit json + hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json networkConduit parsec regexpr safe shakespeareText text time transformers wai waiExtra waiHandlerLaunch warp yaml yesod yesodCore yesodStatic -- cgit 1.4.1 From 4271c59830bd3bc536ce9c0758ec1ab8f590d2e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-hledger: update to version 0.22 --- .../libraries/haskell/hledger/default.nix | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 36012251e077..47a5ed381f6b 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,23 +1,24 @@ -{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl -, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText -, split, testFramework, testFrameworkHunit, text, time -, transformers, utf8String +{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe +, shakespeareText, split, tabular, testFramework +, testFrameworkHunit, text, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21.3"; - sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2"; + version = "0.22"; + sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe - shakespeareText split text time utf8String + cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec + regexpr safe shakespeareText split tabular text time utf8String ]; testDepends = [ - cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec - prettyShow regexCompat regexpr safe shakespeareText split - testFramework testFrameworkHunit text time transformers + cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl + parsec prettyShow regexCompatTdfa regexpr safe shakespeareText + split tabular testFramework testFrameworkHunit text time + transformers ]; meta = { homepage = "http://hledger.org"; -- cgit 1.4.1 From afe71506652e5ab99ac93a4d78a077e87360deeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-scotty: update to version 0.6.1 --- pkgs/development/libraries/haskell/scotty/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 3f50ed381523..d72aed42852f 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai -, waiExtra, warp +, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra +, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.0"; - sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; + version = "0.6.1"; + sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat resourcet text transformers wai waiExtra warp + mtl regexCompat text transformers wai waiExtra warp ]; meta = { homepage = "https://github.com/scotty-web/scotty"; -- cgit 1.4.1 From 62aecb91995129e0215107077243bf236a2726d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:18 +0100 Subject: haskell-tasty: update to version 0.5.2 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 8153eb9f6a76..39ee7f2d168d 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.1"; - sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; + version = "0.5.2"; + sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; -- cgit 1.4.1 From 23fbd4bb4bd9cd3edaf8b6cd87e1fabaec0d347a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-th-lift: update to version 0.6 --- pkgs/development/libraries/haskell/th-lift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index c479955db645..c10feac4ba68 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.6"; - sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4"; + version = "0.6"; + sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; -- cgit 1.4.1 From f3de4df1c5fc1c22597668ce32f4e0b95a1c4034 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-vty-ui: update to version 1.6.1 --- pkgs/development/libraries/haskell/vty-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 3b38db8c1de4..ad3ab7823c0e 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6"; - sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + version = "1.6.1"; + sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From d7dd97c5da6efcf019c543dc0894e0484d5a82fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-wai-app-static: update to version 2.0.0.2 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index a6b8eeb4058b..8f2c6ebb342c 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.1"; - sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; + version = "2.0.0.2"; + sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath -- cgit 1.4.1 From ac0734056435a15ec11ad4b8854ceb2d1eb195a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-wai-extra: update to version 2.0.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d3b835879650..c6f8752f8b00 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.0.1"; - sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; + version = "2.0.1"; + sha256 = "0asjd7v1zdbs1rixqanwwn4n5b417gj48nv2qva6pfj09hs5dzhh"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase -- cgit 1.4.1 From fe7d9b733594b19be88ec38f02e01e0390247d20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-yesod-bin: update to version 1.2.5.2 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index dbee52da8680..851d152eac56 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.5.1"; - sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; + version = "1.2.5.2"; + sha256 = "00n957gbq03qrbwxa29hpqkmyfnbr7n4bah4185rpjdvnywq3l8x"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 1098138e2ee25a7b2defc7b30f8be2e3f45ab3ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-yesod-core: update to version 1.2.6.2 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 86b2eec8945c..3a8bbb2cdf73 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.6.1"; - sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; + version = "1.2.6.2"; + sha256 = "11q70zc837d0sdwgh8c60pv1x4zki2klamcr5vw5zsjj0qsb9pby"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault -- cgit 1.4.1 From f5587ef7519ba95f8c3da08cf5f86eb2b2cd25f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-yesod-form: update to version 1.3.4.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index c26d88b50807..936c4ab741b6 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.4"; - sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; + version = "1.3.4.1"; + sha256 = "01h9k7qwp26i57akbm9236r8gbil4mh2317caa4bcva7m1dclvpj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet -- cgit 1.4.1 From 5971b942a225995fbb5c504059caa9092f0d6019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-yesod-platform: update to version 1.2.5.2 --- pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index ee9cd3b1fd3b..e17ed799c0e1 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -31,8 +31,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.5"; - sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; + version = "1.2.5.2"; + sha256 = "0pvdaz860zlgizdrsjm4v1vsx0bvcmilz0si0skrx980gysxd0nn"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder -- cgit 1.4.1 From 3fe71f1c52696e647a03b71d565d270820e73a25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-yesod-routes: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d651e90a8a7f..87b4d059dc5b 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.2"; - sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; + version = "1.2.0.3"; + sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { -- cgit 1.4.1 From bf870cfde0adb9c79d89f0ebb537dde7a781befa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 11:30:19 +0100 Subject: haskell-zip-archive: update to version 0.2 --- pkgs/development/libraries/haskell/zip-archive/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index bddf09bc405d..bfe648f449b0 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,14 +1,12 @@ -{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String -, zlib -}: +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.4"; - sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb"; + version = "0.2"; + sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + buildDepends = [ binary digest filepath mtl text time zlib ]; testDepends = [ HUnit time ]; doCheck = false; meta = { -- cgit 1.4.1 From ab0438f128def9f328c9c5b5304ed92b5616b1f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 12:16:25 +0100 Subject: haskell-th-orphans: jailbreak to fix build with th-lift 0.6 --- pkgs/development/libraries/haskell/th-orphans/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9196e9ef76b2..dd9fbc198bff 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.8"; sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr"; buildDepends = [ thLift ]; + jailbreak = true; meta = { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; -- cgit 1.4.1 From 3aef83f451ca7ba479802c8935c93d7341ed22ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 13:21:00 +0100 Subject: haskell-pandoc: jailbreak to fix build with unzip-archive --- pkgs/development/libraries/haskell/pandoc/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 01ce4cc5bfb8..b2e4020703c5 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -27,6 +27,7 @@ cabal.mkDerivation (self: { ]; buildTools = [ alex happy ]; doCheck = false; + jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; -- cgit 1.4.1 From e57309963cc831501eaf6156f6c4c3d756416eaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 21:32:56 +0100 Subject: pandoc: cosmetic --- pkgs/development/libraries/haskell/pandoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b2e4020703c5..b42fc3633f09 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -26,8 +26,8 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text ]; buildTools = [ alex happy ]; - doCheck = false; jailbreak = true; + doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; -- cgit 1.4.1 From e5e30f9ec96b2a33b810f0989a181bf79d0db169 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2013 22:13:22 +0100 Subject: haskell-wai-test: trigger re-build to fix broken reference to HUnit --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 9cae0a85d6c9..7d97fe4b4fe1 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { httpTypes HUnit network text transformers wai ]; testDepends = [ hspec wai ]; + postBuild = ":"; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; -- cgit 1.4.1 From 66fa31308c06e7ce8e588b8b2a33ce6b270b42c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:03:17 +0100 Subject: haskell-ghc-mod: re-enable the test suite --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index fb3ccb8e50ec..411c4a963f74 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { ioChoice syb time transformers ]; buildTools = [ emacs ]; - doCheck = false; postInstall = '' cd $out/share/$pname-$version make -- cgit 1.4.1 From 41f0df10681a88305cbd75c7e997e614a096fee3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 20:08:33 +0100 Subject: haskell-ghc-mod: don't rely on /bin/sh --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 411c4a963f74..b764d69fb3ba 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { mv $pname-$version emacs/site-lisp mv $out/bin/ghc-mod $out/ghc-mod cat - > $out/bin/ghc-mod < Date: Sun, 15 Dec 2013 20:09:31 +0100 Subject: haskell-ghc-mod: keep the original 'ghc-mod' binary in $out/bin, not $out --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b764d69fb3ba..472d25790481 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -24,12 +24,12 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/ghc-mod + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod < Date: Sun, 15 Dec 2013 18:04:49 +0100 Subject: haskell-mime-mail: update to version 0.4.3 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 691029ac5de2..4f7353dfdb6f 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.2.1"; - sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g"; + version = "0.4.3"; + sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; -- cgit 1.4.1 From be8d22c05d476b544c6576f2ec460b9403df9239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Dec 2013 19:54:13 +0100 Subject: haskell-github: patch to fix build --- pkgs/development/libraries/haskell/github/default.nix | 1 + pkgs/development/libraries/haskell/github/fix-build.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/github/fix-build.patch (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 5a45e48bdc7b..74368defc9c8 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; + patches = [ ./fix-build.patch ]; jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch new file mode 100644 index 000000000000..2d3483b38ec1 --- /dev/null +++ b/pkgs/development/libraries/haskell/github/fix-build.patch @@ -0,0 +1,13 @@ +diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs +--- github-0.7.2-orig/Github/Private.hs 2013-12-15 19:45:00.611789227 +0100 ++++ github-0.7.2/Github/Private.hs 2013-12-15 19:45:46.359954006 +0100 +@@ -104,9 +104,6 @@ + in Just (Data.List.takeWhile (/= '>') s') + else Nothing + +-doHttps :: Method -> String -> Maybe GithubAuth +- -> Maybe (RequestBody (ResourceT IO)) +- -> IO (Either E.SomeException (Response LBS.ByteString)) + doHttps reqMethod url auth body = do + let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body + reqHeaders = maybe [] getOAuth auth -- cgit 1.4.1 From ec00fe09654d44c1b5a3625b95e73c66de865fbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 13:59:42 +0100 Subject: haskell-doctest: don't build haddock documentation with pre-7.4 versions of GHC --- pkgs/development/libraries/haskell/doctest/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 687314266839..46e69c95f940 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { stringbuilder syb transformers ]; doCheck = false; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; -- cgit 1.4.1 From 1e5e9a402b062a85264f3ec765a97486b66a76cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-DAV: update to version 0.5.1 --- pkgs/development/libraries/haskell/DAV/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c24ceacc0216..4a908e46d934 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,16 +1,16 @@ -{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens -, liftedBase, mtl, network, optparseApplicative, resourcet +{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes +, lens, liftedBase, mtl, network, optparseApplicative, resourcet , transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.5"; - sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; + version = "0.5.1"; + sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpClient httpConduit httpTypes lens liftedBase + caseInsensitive httpClient httpClientTls httpTypes lens liftedBase mtl network optparseApplicative resourcet transformers xmlConduit xmlHamlet ]; -- cgit 1.4.1 From ee755fa3bccbad9044f2631c537c81fbbecea580 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-HsOpenSSL: update to version 0.10.3.6 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index eb7c406e81e4..d7736a5d9b9a 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.5"; - sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; + version = "0.10.3.6"; + sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { -- cgit 1.4.1 From a3c0e40e521ffe4a723495cc519a8b3fbb76f01f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-ansi-terminal: update to version 0.6.1 --- pkgs/development/libraries/haskell/ansi-terminal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 6d598f29ec95..2e9b1c0c25f4 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.6"; - sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg"; + version = "0.6.1"; + sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://batterseapower.github.com/ansi-terminal"; + homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- cgit 1.4.1 From c1413dc30b9266b3f9f0fb358fe1d5b01184b8f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-enummapset-th: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/enummapset-th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix index 0b992a9daaff..a675d4d74ea6 100644 --- a/pkgs/development/libraries/haskell/enummapset-th/default.nix +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "enummapset-th"; - version = "0.6.0.0"; - sha256 = "0d5pb49raxamz6g9w5kgm4papv3wj21xd8zysfvfn19jkwhkd6mn"; + version = "0.6.0.1"; + sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/liyang/enummapset-th"; -- cgit 1.4.1 From 0bbe648085a6a48b862b53374093bd427033cb92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-snaplet-acid-state: update to version 0.2.6 --- pkgs/development/libraries/haskell/snaplet-acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 838f45eccaad..8a9a594e45d7 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snaplet-acid-state"; - version = "0.2.5"; - sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + version = "0.2.6"; + sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9"; buildDepends = [ acidState snap text ]; meta = { homepage = "https://github.com/mightybyte/snaplet-acid-state"; -- cgit 1.4.1 From 9a313321365287fe3388d8ce7661aee1cdab3005 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-tasty: update to version 0.5.2.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 39ee7f2d168d..6ba25cdc99b2 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.2"; - sha256 = "0zj6bpqld04sivfkpzjp2c587mmygl3699znqmhp1dbv0fpq6949"; + version = "0.5.2.1"; + sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; -- cgit 1.4.1 From 60103a4bd99cce63dab60be358e0ba90724b8b21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Dec 2013 16:36:18 +0100 Subject: haskell-wai-test: update to version 2.0.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 7d97fe4b4fe1..9cae0a85d6c9 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -12,7 +12,6 @@ cabal.mkDerivation (self: { httpTypes HUnit network text transformers wai ]; testDepends = [ hspec wai ]; - postBuild = ":"; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; -- cgit 1.4.1 From 6200fc9ffaafc5ecb01d39a9027eb40d330df230 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:39 +0100 Subject: haskell-async: add version 2.0.1.5 --- pkgs/development/libraries/haskell/async/2.0.1.5.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/async/2.0.1.5.nix (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix new file mode 100644 index 000000000000..d3340fb3678a --- /dev/null +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -0,0 +1,17 @@ +{ cabal, HUnit, stm, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "async"; + version = "2.0.1.5"; + sha256 = "0g587b64zgn971qb2lh846ihg4z89037f18821kyaqsgixasq4yd"; + buildDepends = [ stm ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; + jailbreak = true; + meta = { + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f00ac2465462..37d560ff439d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -141,7 +141,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; + async = self.async_2_0_1_5; attoparsec = self.attoparsec_0_10_4_0; caseInsensitive = self.caseInsensitive_1_1_0_2; cgi = self.cgi_3001_1_8_4; @@ -558,7 +558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; - async = self.async_2_0_1_4; + async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {}; + async = self.async_2_0_1_5; atomicPrimops = callPackage ../development/libraries/haskell/atomic-primops {}; -- cgit 1.4.1 From d1f0c0325c8ef426e15755394b9ba136e88925f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: haskell-DAV: update to version 0.6 --- pkgs/development/libraries/haskell/DAV/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 4a908e46d934..a7e15f2d6b4d 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,18 +1,18 @@ { cabal, caseInsensitive, httpClient, httpClientTls, httpTypes -, lens, liftedBase, mtl, network, optparseApplicative, resourcet -, transformers, xmlConduit, xmlHamlet +, lens, liftedBase, monadControl, mtl, network, optparseApplicative +, transformers, transformersBase, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.5.1"; - sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj"; + version = "0.6"; + sha256 = "1lqc1w40mzj5gvpd3gc4qwgz3zrivwkz6ssa5592dsnwz81k1dxk"; isLibrary = true; isExecutable = true; buildDepends = [ caseInsensitive httpClient httpClientTls httpTypes lens liftedBase - mtl network optparseApplicative resourcet transformers xmlConduit - xmlHamlet + monadControl mtl network optparseApplicative transformers + transformersBase xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; -- cgit 1.4.1 From 378c821a626afed196357dfc4af7470f696ef5f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: haskell-language-c-quote: update to version 0.7.6 --- pkgs/development/libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index f4774ecd14b0..94eb72633de3 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.5"; - sha256 = "1ms6bjcqm0mfv0kqznn68svclbpvbwy5rlni0b8i0axhwfgq1l73"; + version = "0.7.6"; + sha256 = "15sfasbrr9wzqkwv9xg9nvb3gnn4drkll3b3cappiyzkmawp2hkr"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol -- cgit 1.4.1 From 705b317fee6aefb9d6b6c22737179a176766bb67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:43 +0100 Subject: haskell-mainland-pretty: update to version 0.2.7 --- pkgs/development/libraries/haskell/mainland-pretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 2bcf2037cbeb..60990d2dbcac 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.6"; - sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy"; + version = "0.2.7"; + sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; -- cgit 1.4.1 From 714f20806b9e8c9fc0e15a447af8b0886148f236 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:44 +0100 Subject: haskell-scientific: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/scientific/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index 42d1c4b86122..8494168df15d 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.1.0.0"; - sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r"; + version = "0.1.0.1"; + sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; doCheck = false; -- cgit 1.4.1 From 580c339699b6e17cb98aec28158fadd31d062297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Dec 2013 11:27:44 +0100 Subject: haskell-smallcheck: update to version 1.1.1 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index ef8f0e5e5ba4..e81a8872f7ac 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.1.0.1"; - sha256 = "02yv4pa6hilxl7fwskayd5nzs4hq46k91wh04sqj4yfk2s3pgb0m"; + version = "1.1.1"; + sha256 = "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; -- cgit 1.4.1 From 743159515920e01a5d4377053d15dc5874ba698f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: haskell-OpenAL: update to version 1.6.0.0 --- pkgs/development/libraries/haskell/OpenAL/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index a04aea993fa2..36d3b41583fb 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,13 +1,13 @@ -{ cabal, ObjectName, openal, StateVar, Tensor }: +{ cabal, openal, OpenGL }: cabal.mkDerivation (self: { pname = "OpenAL"; - version = "1.4.0.2"; - sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz"; - buildDepends = [ ObjectName StateVar Tensor ]; + version = "1.6.0.0"; + sha256 = "0bw20ykn8vi3g4im4nsrfz7p1qq9qwnx8da83zwdbr3wjm9934gd"; + buildDepends = [ OpenGL ]; extraLibraries = [ openal ]; meta = { - homepage = "http://connect.creativelabs.com/openal/"; + homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- cgit 1.4.1 From 481678ed08af96484d8ad7182797adf88b95e565 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: haskell-doctest: update to version 0.9.10 --- pkgs/development/libraries/haskell/doctest/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 46e69c95f940..687314266839 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,7 +14,6 @@ cabal.mkDerivation (self: { stringbuilder syb transformers ]; doCheck = false; - noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; -- cgit 1.4.1 From 200305d3e390924dd02f6912edce62ab5e4a6f40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:13 +0100 Subject: haskell-haskell-names: update to version 0.3.2.3 --- pkgs/development/libraries/haskell/haskell-names/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index b77cd134dc81..bac417b618b5 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.3.2.2"; - sha256 = "0imr0kgxkm2j2xx9ryll5s1b5bn8s4bkwpqdvvb4z44jhrgcgz7b"; + version = "0.3.2.3"; + sha256 = "0vh88qkvlljqviy5mqjz8gbpwnl2wq65c2rm9kyjnc2cpyp4i8zx"; buildDepends = [ aeson Cabal dataLens dataLensTemplate filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass -- cgit 1.4.1 From a415fcc5c58a649449f426ccaf102732f07b28c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-http-client-conduit: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/http-client-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix index df4b49b47f39..1c47b68f06ce 100644 --- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-client-conduit"; - version = "0.2.0.0"; - sha256 = "1pb47mms5qfi185nrz675if4pb7xji97xdqpmyrplqaxqygwih1y"; + version = "0.2.0.1"; + sha256 = "0fy9vkxh7hvmp9ijifq8nx6y5y92n6d3s1vdyg53ln65pclc6jn5"; buildDepends = [ conduit httpClient resourcet transformers ]; meta = { homepage = "https://github.com/snoyberg/http-client"; -- cgit 1.4.1 From 6066969c92e53f6bac5a2b30b59eaa174e40544e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-http-client-tls: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/http-client-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index f92ddcd7d551..f0b28ab16124 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.0.0"; - sha256 = "06ywjmhdgnwdyfj0qvmabb5bvgrdfyf7dfxm0hzqvkh2i104s7g0"; + version = "0.2.0.1"; + sha256 = "0wzbxah6pkglpgl4ax12crw3cl8w48b8pbasb3xkbqcxpaakvbkx"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; doCheck = false; -- cgit 1.4.1 From 0939566a80dadfbf9c22257fa603c5a76a48e3f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-http-conduit: update to version 2.0.0.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index b041957e555b..bb237f16d587 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.0.0.2"; - sha256 = "0ypwn63brdjxyh70x10wb26xbsymj5x9v664nzc3nwvlh22ldhyw"; + version = "2.0.0.3"; + sha256 = "1s3nyc3wwpqildhmkv5fps2a0552yrnwcqjv4bxcvg581k5sj42i"; buildDepends = [ conduit httpClient httpClientConduit httpClientTls httpTypes liftedBase resourcet transformers -- cgit 1.4.1 From 178c4ed9d03d15e630e82905b8bc8fe01659d6b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-monad-logger: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 83cd57ce39b7..afd968227103 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.3.1"; - sha256 = "1amihx9jl42w7sm01ihnldvgv9cilg89im7gr9l0x2f6q4nbhbl2"; + version = "0.3.3.2"; + sha256 = "0s75q974q6jwp89xj5kkqziy4crm9484dqvrpgd8ms7rw613jjz6"; buildDepends = [ conduit fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text transformers transformersBase -- cgit 1.4.1 From 1d96322785168dfc06b8c8c6486beb22f9b744fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-resourcet: update to version 0.4.10 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index b4d0fccd8a0b..913e77483e44 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.9"; - sha256 = "1jpaphmwvykjshjqwmmyfx64w1j99f6dphy9ygrzc32fjffk5laz"; + version = "0.4.10"; + sha256 = "0mgwcgacf4ilyh54s862p8jqv1f42dkp287sdkpswyai1pxlvipz"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; -- cgit 1.4.1 From 63a33906837e82674bee9a9baf5a98f89606ad4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-stylish-haskell: update to version 0.5.9.0 --- pkgs/development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 74646c9acca4..c430dfc36a66 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.8.0"; - sha256 = "1wjrn4cq47jjmqkb2zv02x90l2mv6n7zh4mvcav25s9bwvvca10r"; + version = "0.5.9.0"; + sha256 = "1iy0d437yd6hgmxmiqa0b6lvg4gw838jxqwn83kdpy1mlykqwmgq"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From cedf33fafc8e15912df8be82630f05abea73098d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-yesod-auth: update to version 1.2.4.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 87cbe9f3d438..d6bab2c5da53 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.4"; - sha256 = "1bpcz8ihjqdhyxxm4ib4yhgj5h491lxv34mpc3x55wl2daq731qi"; + version = "1.2.4.1"; + sha256 = "05csxa0mgqnam375fq38r0rl51zdjq0bki2dzrr99469mg33fzh4"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network -- cgit 1.4.1 From 640547334370ee4fd3c29cda3b838ef56c7eebeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Dec 2013 17:42:14 +0100 Subject: haskell-yesod-routes: update to version 1.2.0.4 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/haskell') diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 87b4d059dc5b..1c2922fe069c 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.3"; - sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; + version = "1.2.0.4"; + sha256 = "1c3fpfvcdx8ijvjxxfjwld5zl6x4xl2587a8gdj2qmsr94f8lgb9"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { -- cgit 1.4.1