From 0db6ea6f760500d740f49756918c1807e2f48da5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 22:34:08 +0100 Subject: Remove some oversized packages from the channel E.g. urbanterror takes up 2x720 MiB. --- pkgs/development/libraries/ncbi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index 0b795e78ad50..a74cd81854e1 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -49,6 +49,6 @@ rec { maintainers = [ a.lib.maintainers.raskin ]; - platforms = a.lib.platforms.linux ; + #platforms = a.lib.platforms.linux ; }; } -- cgit 1.4.1 From 1d94f9051174f0c884ef596d13390d91e4d96bef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: haskell-hs-bibutils: update to version 4.16 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 8acb621fe3f0..b9f3eb3cb8e5 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.15"; - sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9"; + version = "4.16"; + sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; -- cgit 1.4.1 From 069c587237b0abfdf2e38ad6b034da9ae2c04db1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: haskell-http-conduit: update to version 1.8.7 --- .../libraries/haskell/http-conduit/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5009d4132de9..b9f47b440068 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,23 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, httpTypes, liftedBase, monadControl, mtl, network, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, zlibConduit +, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl +, network, random, regexCompat, resourcet, socks, text, time, tls +, tlsExtra, transformers, transformersBase, utf8String, void +, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.3"; - sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; + version = "1.8.7"; + sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault deepseq failure httpTypes liftedBase - monadControl mtl network regexCompat resourcet socks text time tls - tlsExtra transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure filepath httpTypes liftedBase + mimeTypes monadControl mtl network random regexCompat resourcet + socks text time tls tlsExtra transformers transformersBase + utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; -- cgit 1.4.1 From fd6c95461b5983840b2ca40ac2a392a233ecfe8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:56 +0100 Subject: haskell-smallcheck: update to version 0.6.2 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 1086a1929a80..a11eb501a861 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 = "0.6.1"; - sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb"; + version = "0.6.2"; + sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; -- cgit 1.4.1 From 7e8fc622e5e0b7887d43d9885da289531d34ed0d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 15:50:21 -0500 Subject: libnatspec: Needs libiconv --- pkgs/development/libraries/libnatspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fbab569e38cc..d2747b50ce05 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt }: +{ stdenv, fetchurl, popt, libiconvOrEmpty }: stdenv.mkDerivation rec { name = "libnatspec-0.2.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ]; + buildInputs = [ popt ] ++ libiconvOrEmpty; meta = { homepage = http://natspec.sourceforge.net/ ; -- cgit 1.4.1 From 23853fa81b86517a8a5705b77d4c816b42c917e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 17:01:56 -0500 Subject: libnatspec: The build process doesn't respect buildInputs, so force use of libiconv on not-Linux --- pkgs/development/libraries/libnatspec/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index d2747b50ce05..985745c38986 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, popt, libiconvOrEmpty }: +{ stdenv, fetchurl, popt, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libnatspec-0.2.6"; src = fetchurl { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ] ++ libiconvOrEmpty; + buildInputs = [ popt ]; meta = { homepage = http://natspec.sourceforge.net/ ; @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_CFLAGS_COMPILE = "-I${libiconv}/include"; + + NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv"; +}) -- cgit 1.4.1 From 46843e60a1aca56c2ff6e505be95058430968297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: haskell-certificate: update to version 1.3.5 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index eb40a4744f9c..036e7ddc124c 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.3"; - sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2"; + version = "1.3.5"; + sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 5b3e861748467b7756446377811906a73331457a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: haskell-hakyll: update to version 4.1.1.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9b708eff0203..2824234ede3c 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.0.0.0"; - sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + version = "4.1.1.0"; + sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 0184ed349bf0d2dec1ec3ee023354fd46c827f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: haskell-highlighting-kate: update to version 0.5.3.5 --- pkgs/development/libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index cc591acf2022..afb6a4be662a 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.4"; - sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77"; + version = "0.5.3.5"; + sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; -- cgit 1.4.1 From f13f0860152f596a85376659fe609240c3616c70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: haskell-pandoc-types: update to version 1.10 --- pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 6dfbc1fc15ff..d4f49791d306 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.1"; - sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; + version = "1.10"; + sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; -- cgit 1.4.1 From 3a4f88d02bc0bfb56c1253f807807d86395d07c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: haskell-pandoc: update to version 1.10 --- pkgs/development/libraries/haskell/pandoc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b3bfbc50b5f4..98f4dfb05016 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,20 +1,20 @@ { cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs -, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl -, network, pandocTypes, parsec, random, syb, tagsoup, temporary -, texmath, time, utf8String, xml, zipArchive, zlib +, dataDefault, extensibleExceptions, filepath, highlightingKate +, HTTP, json, mtl, network, pandocTypes, parsec, random, syb +, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4.5"; - sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb"; + version = "1.10"; + sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml blazeMarkup citeprocHs + base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault extensibleExceptions filepath highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath - time utf8String xml zipArchive zlib + text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; meta = { -- cgit 1.4.1 From 6eec1e54c9ef11d771a8db659f02a5af92dbd56a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: haskell-tls-extra: update to version 0.6.1 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5bcce9df16b7..c9ab989ed76d 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.0"; - sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; + version = "0.6.1"; + sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; isLibrary = true; isExecutable = true; buildDepends = [ -- cgit 1.4.1 From 58dc4a76ad36bb9de719e9019194fac215cf0b13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: haskell-yst: update to version 0.3.1 --- pkgs/development/libraries/haskell/yst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries') diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 5cb5fb6a2099..5087bfce12cf 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.3.0.1"; - sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv"; + version = "0.3.1"; + sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig"; isLibrary = false; isExecutable = true; buildDepends = [ -- cgit 1.4.1