From 94f2013c0cc006cec80f42b8d956f6022db571a2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 13 Mar 2013 13:09:58 +0100 Subject: [PATCH 01/16] pythonDocs: recurseIntoAttrs does not recurse, bypass problem --- pkgs/development/interpreters/python/docs/default.nix | 4 ++++ pkgs/development/interpreters/python/docs/generate.sh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix index 7e3ff6abbe9..16ade3af3f9 100644 --- a/pkgs/development/interpreters/python/docs/default.nix +++ b/pkgs/development/interpreters/python/docs/default.nix @@ -3,6 +3,7 @@ let pythonDocs = { html = { + recurseForDerivations = true; python33 = import ./3.3-html.nix { inherit stdenv fetchurl lib; }; @@ -23,6 +24,7 @@ pythonDocs = { }; }; pdf_a4 = { + recurseForDerivations = true; python33 = import ./3.3-pdf-a4.nix { inherit stdenv fetchurl lib; }; @@ -43,6 +45,7 @@ pythonDocs = { }; }; pdf_letter = { + recurseForDerivations = true; python33 = import ./3.3-pdf-letter.nix { inherit stdenv fetchurl lib; }; @@ -63,6 +66,7 @@ pythonDocs = { }; }; text = { + recurseForDerivations = true; python33 = import ./3.3-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/docs/generate.sh b/pkgs/development/interpreters/python/docs/generate.sh index 554bf79e334..bebefc10ccd 100755 --- a/pkgs/development/interpreters/python/docs/generate.sh +++ b/pkgs/development/interpreters/python/docs/generate.sh @@ -16,7 +16,11 @@ pythonDocs = { EOF for type in $TYPES; do - echo " ${type/-/_} = {" >> default.nix + cat >>default.nix < Date: Wed, 13 Mar 2013 11:58:44 +0100 Subject: [PATCH 02/16] haskell-NumInstances: update to version 1.2 --- pkgs/development/libraries/haskell/NumInstances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 4d258f5634d..4f06a97002d 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.0"; - sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy"; + version = "1.2"; + sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59"; meta = { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; From 2ead0aa4c69b84ccfb65e9db6fc81297a9c95433 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:44 +0100 Subject: [PATCH 03/16] haskell-conduit: update to version 1.0.3 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 21f81ee038c..8614b24bacc 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.2"; - sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f"; + version = "1.0.3"; + sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void From b8550949a82f534d008cb08ab717542cb50e7b01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 04/16] haskell-ghc-mod: update to version 1.12.2 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 1109a512a8d..3e86d440d5d 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.12.1"; - sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r"; + version = "1.12.2"; + sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9"; isLibrary = false; isExecutable = true; buildDepends = [ From 2533c325951d46db30e17406d188a372b5999157 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 05/16] haskell-hint: update to version 0.3.3.6 --- pkgs/development/libraries/haskell/hint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 106b8591778..8cf1accca9c 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.5"; - sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq"; + version = "0.3.3.6"; + sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can"; buildDepends = [ extensibleExceptions filepath ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String From 72d80f0419e649ba3d2f73902f95e89fc153dc02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 06/16] haskell-http-conduit: update to version 1.9.2.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 683396eea81..715d5ce7dba 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.9.1"; - sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial"; + version = "1.9.2.1"; + sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From 79d3d6e698f329b7247817a8e574417d0534c04d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 07/16] haskell-liblastfm: update to version 0.1.1.0 --- pkgs/development/libraries/haskell/liblastfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index d9a04355e2e..3222f4607e7 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.1.0.0"; - sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x"; + version = "0.1.1.0"; + sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95"; buildDepends = [ aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text ]; From 865a59815bc1735b2c234b9840dbc0d49a3a11db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 08/16] haskell-monad-logger: update to version 0.3.1.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 5b580a8594e..c06809c261d 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.1"; - sha256 = "09bgj436hyyc5x0flkwcxx3m97y5pm8whd5cc6a0q7bc4bnzf80j"; + version = "0.3.1.1"; + sha256 = "11qqmflcydjfm5py7rkbi9qd0mkhw4kxzxff95wf0jmaia9knvx6"; buildDepends = [ conduit fastLogger monadControl mtl resourcet text transformers transformersBase From 9d52ffce0288ebe3bff1ded360a75111debc5e15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 09/16] haskell-numbers: update to version 3000.1.0.3 --- pkgs/development/libraries/haskell/numbers/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index e0136ad5d45..81a3e866dc0 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -2,14 +2,13 @@ cabal.mkDerivation (self: { pname = "numbers"; - version = "3000.1.0.1"; - sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4"; + version = "3000.1.0.3"; + sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz"; testDepends = [ QuickCheck testFramework testFrameworkQuickcheck2 ]; - doCheck = false; meta = { - homepage = "https://github.com/DanBurton/numbers"; + homepage = "https://github.com/DanBurton/numbers#readme"; description = "Various number types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 67e72eea764761a66590bda280511bb64cfb205c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 10/16] haskell-persistent-template: update to version 1.1.2.5 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 117a63618d4..8cdc7caafc9 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.1.2.4"; - sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9"; + version = "1.1.2.5"; + sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj"; buildDepends = [ aeson monadControl persistent text transformers ]; testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { From a48730439780d5985d82f845cfb2955eebe165a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 11/16] haskell-smallcheck: update to version 1.0.2 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index b7b0dc8e974..6d82e7e5132 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.0.1"; - sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk"; + version = "1.0.2"; + sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From a356a2e59fd4a445b6db86670639ed5141863932 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 12/16] haskell-threads: update to version 0.5.0.2 --- pkgs/development/libraries/haskell/threads/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 533a67c99c8..d802790da9d 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threads"; - version = "0.5.0.1"; - sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy"; + version = "0.5.0.2"; + sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm"; buildDepends = [ baseUnicodeSymbols stm ]; testDepends = [ baseUnicodeSymbols concurrentExtra HUnit stm testFramework From 4a1d32134bcd23f4e25cab8035ecff2c7e439376 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 11:58:45 +0100 Subject: [PATCH 13/16] haskell-wai-extra: update to version 1.3.3.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 53a1ccaf55a..7e331d69da0 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 = "1.3.2.4"; - sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9"; + version = "1.3.3.1"; + sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From 6d5c6af42734a04903360b799b6c58bb999a3c94 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 13:59:19 +0100 Subject: [PATCH 14/16] lzip: update to version 1.14 --- pkgs/tools/compression/lzip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 710c58029aa..87faacddff0 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lzip-1.14-rc3"; + name = "lzip-1.14"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz"; - sha256 = "040mmfadvhry68bv10baqi1bs8g5wwbf5rx0widyz69llpn64mw9"; + sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz"; }; doCheck = true; From 0a52bc5d8eb2f8809e781bb5cf8b034435781596 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 13 Mar 2013 09:01:47 -0400 Subject: [PATCH 15/16] Add Catalyst::Action::REST perlPackage Signed-off-by: Shea Levy --- pkgs/top-level/perl-packages.nix | 106 +++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a03abaf73e7..12702dbb105 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -335,6 +335,19 @@ rec { [ CatalystRuntime HTTPRequestAsCGI DataVisitor MROCompat ]; }; + CatalystActionREST = buildPerlPackage { + name = "Catalyst-Action-REST-1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-REST-1.06.tar.gz; + sha256 = "0z72cf8zgmwmcqlhkawz9fikc0g44972sidfs16x7rwdhzavd01k"; + }; + propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; + meta = { + description = "Automated REST Method Dispatching"; + license = "perl"; + }; + }; + CatalystAuthenticationStoreHtpasswd = buildPerlPackage rec { name = "Catalyst-Authentication-Store-Htpasswd-1.003"; src = fetchurl { @@ -837,6 +850,14 @@ rec { }; }; + ClassISA = buildPerlPackage { + name = "Class-ISA-0.36"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz; + sha256 = "0r5r574i6wgxm8zsq4bc34d0dzprrh6h6mpp1nhlks1qk97g65l8"; + }; + }; + ClassMakeMethods = buildPerlPackage rec { name = "Class-MakeMethods-1.009"; src = fetchurl { @@ -1323,6 +1344,27 @@ rec { propagatedBuildInputs = [TestException ClassAccessorChained]; }; + DataSerializer = buildPerlPackage { + name = "Data-Serializer-0.59"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.59.tar.gz; + sha256 = "1mydpbacrkirafcjxcg1c0gnls1kxiv0qvdd4q2yd6vsyay0ayqr"; + }; + meta = { + description = "Modules that serialize data structures"; + license = "perl"; + }; + }; + + DataTaxi = buildPerlPackage { + name = "Data-Taxi-0.96"; + propagatedBuildInputs = [DebugShowStuff]; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; + sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; + }; + }; + DataUUID = buildPerlPackage rec { name = "Data-UUID-1.217"; src = fetchurl { @@ -1428,6 +1470,19 @@ rec { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; }; + DebugShowStuff = buildPerlPackage { + name = "Debug-ShowStuff-1.14"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.14.tar.gz; + sha256 = "023c6f7y93k9qxxfa2fsvc5jkbv3rh6i3nw6zvxa5cg57xfypd7h"; + }; + propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; + meta = { + description = "Debug::ShowStuff - A collection of handy debugging routines for displaying the values of variables with a minimum of coding."; + license = "perl"; + }; + }; + DevelCaller = buildPerlPackage { name = "Devel-Caller-2.06"; src = fetchurl { @@ -1998,6 +2053,7 @@ rec { url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.43.tar.gz; sha256 = "1qamc5aggp35xk590a4hy660f2rhc2l7j65hbyxdya9yvg7z437l"; }; + doCheck = false; }; GD = buildPerlPackage rec { @@ -3837,6 +3893,18 @@ rec { }; }; + PHPSerialization = buildPerlPackage { + name = "PHP-Serialization-0.34"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz; + sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; + }; + meta = { + description = "Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."; + license = "unknown"; + }; + }; + Plack = buildPerlPackage { name = "Plack-1.0015"; src = fetchurl { @@ -4305,6 +4373,18 @@ rec { [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; }; + StringUtil = buildPerlPackage { + name = "String-Util-1.21"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.21.tar.gz; + sha256 = "1ndvm9pbngf1j0fm02ghl4nfcqi5404sxdlm42g3ismf1ms1fnxa"; + }; + meta = { + description = "String::Util -- String processing utilities"; + license = "perl"; + }; + }; + SubExporter = buildPerlPackage { name = "Sub-Exporter-0.984"; src = fetchurl { @@ -5132,6 +5212,20 @@ rec { }; }; + URIFind = buildPerlModule { + name = "URI-Find-20111103"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20111103.tar.gz; + sha256 = "1igbbj14j5fssdqrbr60mg3w95wldfxdikplqdmqgf2zn5j65ibr"; + }; + propagatedBuildInputs = [ URI URIURL ]; + meta = { + homepage = http://search.cpan.org/dist/URI-Find; + description = "Find URIs in arbitrary text"; + license = "perl5"; + }; + }; + UriGoogleChart = buildPerlPackage rec { name = "URI-GoogleChart-1.02"; src = fetchurl { @@ -5141,6 +5235,18 @@ rec { buildInputs = [URI TestMore]; }; + URIURL = buildPerlPackage { + name = "URI-URL-5.04"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz; + sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz"; + }; + meta = { + description = "Uniform Resource Identifiers (absolute and relative)"; + license = "perl"; + }; + }; + VariableMagic = buildPerlPackage rec { name = "Variable-Magic-0.48"; src = fetchurl { From a07ae64cee3d3d1c0623d3543f4b5f5a26fc27c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Mar 2013 13:36:56 +0100 Subject: [PATCH 16/16] haskell-punycode: disable the test suite The test suite runs for 20+ minutes on my EeePC. That seems a little excessive. --- pkgs/development/libraries/haskell/punycode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix index ade7685be6e..a4ad760d8ff 100644 --- a/pkgs/development/libraries/haskell/punycode/default.nix +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr"; buildDepends = [ cereal mtl text ]; testDepends = [ cereal encoding HUnit mtl QuickCheck text ]; + doCheck = false; meta = { homepage = "https://github.com/litherum/punycode"; description = "Encode unicode strings to ascii forms according to RFC 3492";