From bce5681e533fa206cf6720c98a15d7e1f4e217e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 May 2013 12:27:08 +0200 Subject: [PATCH 001/193] gnupg: update to version 2.0.20 --- pkgs/tools/security/gnupg/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index ba680cb8ba4..b94e2e50a40 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.19"; + name = "gnupg-2.0.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg"; + sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; }; buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ] @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = { + homepage = "http://gnupg.org/"; description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' GnuPG is the GNU project's complete and free implementation of @@ -49,12 +51,7 @@ stdenv.mkDerivation rec { S/MIME. ''; - homepage = http://gnupg.org/; - - license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; - platforms = stdenv.lib.platforms.all; }; } From 6655840a870c5131eaa9e13f9776afb93f33dbdd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 May 2013 17:03:20 +0200 Subject: [PATCH 002/193] ReviewBoard: Update to 1.6.16 --- pkgs/top-level/python-packages.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee972646aef..076e8a8d9b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1415,11 +1415,11 @@ pythonPackages = python.modules // rec { django_1_3 = buildPythonPackage rec { - name = "Django-1.3.3"; + name = "Django-1.3.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "0snlrcvk92qj1v0n9dpycn6sw56w4zns4mpc30837q6yi7ylrx4f"; + sha256 = "12pv8y2x3fhrcrjayfm6z40r57iwchfi5r19ajs8q8z78i3z8l7f"; }; # error: invalid command 'test' @@ -1433,11 +1433,11 @@ pythonPackages = python.modules // rec { django_evolution = buildPythonPackage rec { - name = "django_evolution-0.6.7"; + name = "django_evolution-0.6.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz"; - md5 = "24b8373916f53f74d701b99a6cf41409"; + md5 = "c0d7d10bc41898c88b14d434c48766ff"; }; propagatedBuildInputs = [ django_1_3 ]; @@ -1450,14 +1450,14 @@ pythonPackages = python.modules // rec { djblets = buildPythonPackage rec { - name = "Djblets-0.6.23"; + name = "Djblets-0.6.28"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; - sha256 = "1d8vg5a9q2ldnbxqap1893lqb66jwcsli2brbjx7mcnqrzcz449x"; + sha256 = "11fsi911cqkjgv9j7646ljc2fgxsdfyq44kzmv01xhysm50fn6xx"; }; - propagatedBuildInputs = [ pil django_1_3 ]; + propagatedBuildInputs = [ pil django_1_3 feedparser ]; meta = { description = "A collection of useful extensions for Django"; @@ -3932,15 +3932,15 @@ pythonPackages = python.modules // rec { reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.13"; + name = "ReviewBoard-1.6.16"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "06q9vgvmmwiyqj6spw6sbhrcxwds02pvqir50psbpps74nxn2mph"; + sha256 = "0vg3ypm57m43bscv8vswjdllv3d2j8lxqwwvpd65cl7jd1in0yr1"; }; propagatedBuildInputs = - [ recaptcha_client pytz memcached dateutil paramiko flup pygments + [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_1_3 django_evolution pycrypto python.modules.sqlite3 pysvn pil psycopg2 ]; From 2767a01042eb2625099eb1ee61ae5a60c2f69b01 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 May 2013 11:29:16 -0400 Subject: [PATCH 003/193] pam_ssh_agent_auth: Add to channel --- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index eae62c9e197..6a3bb78d639 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -21,5 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamsshagentauth.sourceforge.net/; description = "PAM module for authentication through the SSH agent"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.maintainers.linux; }; } From dad18680e5f289f986a3fc223695ac0d64e19e4b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 May 2013 11:33:01 -0400 Subject: [PATCH 004/193] pam_ssh_agent_auth: Update to 0.9.5 --- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 6a3bb78d639..694bc4a8f08 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pam, openssl, perl }: stdenv.mkDerivation rec { - name = "pam_ssh_agent_auth-0.9.4"; + name = "pam_ssh_agent_auth-0.9.5"; src = fetchurl { url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; - sha256 = "1a8cv223f30mvkxnyh9hk6kya0ynkwwkc5nhlz3rcqhxfw0fcva9"; + sha256 = "1aihfyj17nvqhf0d5i0dg2lsly3r24xjyx0sfqpf60s0libkp4y0"; }; patches = From f93971ef0c3400cab6ade101fc836cf527c91f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 May 2013 23:20:20 +0200 Subject: [PATCH 005/193] filegive: update to 0.6.1 --- pkgs/tools/networking/filegive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 6f5a0b3950b..3072ba3bd4f 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -11,7 +11,7 @@ let sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; }; - version = "0.5.2"; + version = "0.6.1"; in stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; name = "${name}.tar.gz"; - sha256 = "0n5ilhccdy2nsdvl871nn2isr1jdlm7yncxff7zm5qzsx8k9skkz"; + sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1"; }; buildInputs = [ go ]; From 229661eed38a95f2f29095b1f8837d5731d6752c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 May 2013 23:21:03 +0200 Subject: [PATCH 006/193] go: setting default to 1.1 I hope it won't break anything. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 324b15be0dc..00cf16c05df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2533,10 +2533,12 @@ let fsharp = callPackage ../development/compilers/fsharp {}; - go = callPackage ../development/compilers/go { }; + go_1_0 = callPackage ../development/compilers/go { }; go_1_1 = callPackage ../development/compilers/go/1.1.nix { }; + go = go_1_1; + gprolog = callPackage ../development/compilers/gprolog { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; From 200fd97b046bef3f923af80ef9a776af582e7714 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 23 May 2013 02:11:21 +0000 Subject: [PATCH 007/193] chrony: Add readline and libcap (on Linux) as dependencies libcap is needed for chronyd to drop privileges when starting up. readline was added as a convenience for when using chronyc. --- pkgs/tools/networking/chrony/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 96e2ecccd0b..d7fe0757057 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libcap, readline }: + +assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-1.27"; @@ -8,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l"; }; + buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + meta = with stdenv.lib; { description = "A pair of programs which are used to maintain the accuracy of the system clock on a computer."; homepage = "http://chrony.tuxfamily.org/"; From 33eb2832c3767d2df76b35a809cbd2c9365e3874 Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Thu, 23 May 2013 11:27:49 +0200 Subject: [PATCH 008/193] Add R15B03-1 --- .../interpreters/erlang/R15B03.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/erlang/R15B03.nix diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15B03.nix new file mode 100644 index 00000000000..d282e45dc62 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R15B03.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, perl, gnum4, ncurses, openssl +, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: + +assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; + +let version = "15B03"; in + +stdenv.mkDerivation { + name = "erlang-" + version; + + src = fetchurl { + url = "http://www.erlang.org/download/otp_src_R15B03-1.tar.gz"; + sha256 = "4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c"; + }; + + buildInputs = + [ perl gnum4 ncurses openssl + ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + + preConfigure = '' + export HOME=$PWD/../ + sed -e s@/bin/pwd@pwd@g -i otp_build + ''; + + configureFlags = "--with-ssl=${openssl}"; + + meta = { + homepage = "http://www.erlang.org/"; + description = "Programming language used for massively scalable soft real-time systems"; + + longDescription = '' + Erlang is a programming language used to build massively scalable + soft real-time systems with requirements on high availability. + Some of its uses are in telecoms, banking, e-commerce, computer + telephony and instant messaging. Erlang's runtime system has + built-in support for concurrency, distribution and fault + tolerance. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3c5f57ede4..f311b6a3712 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2881,7 +2881,8 @@ let erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B02 = callPackage ../development/interpreters/erlang/R15B02.nix { }; - erlang = erlangR15B02; + erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; + erlang = erlangR15B03; groovy = callPackage ../development/interpreters/groovy { }; From 5779dfc8e443e9f1017561d68ab8150502f2472a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 May 2013 11:35:54 +0200 Subject: [PATCH 009/193] R: add version 3.0.1 --- pkgs/applications/science/math/R/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/science/math/R/default.nix diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix new file mode 100644 index 00000000000..5ceefb87af0 --- /dev/null +++ b/pkgs/applications/science/math/R/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt +, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl +, texLive, tk, xz, zlib, less, texinfo, graphviz +}: + +stdenv.mkDerivation rec { + name = "R-3.0.1"; + + src = fetchurl { + url = "http://ftp5.gwdg.de/pub/misc/cran/src/base/R-3/${name}.tar.gz"; + sha256 = "0d3iv382bsyz6ad5fk382x7sy3qzgpqvd0fw26r0648lyf54i45g"; + }; + + buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt + libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl + texLive tk xz zlib less texinfo graphviz ]; + + enableParallelBuilding = true; + + meta = { + description = "a free software environment for statistical computing and graphics"; + homepage = "http://www.r-project.org/"; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00cf16c05df..1a161bfd909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8994,6 +8994,11 @@ let pari = callPackage ../applications/science/math/pari {}; + R = callPackage ../applications/science/math/R { + inherit (xlibs) libX11 libXt; + texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + }; + singular = callPackage ../applications/science/math/singular {}; scilab = callPackage ../applications/science/math/scilab { From d8d6fd741220aa97ea7ab04c491290c0f8c64a09 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 23 May 2013 15:24:15 +0200 Subject: [PATCH 010/193] pam_ssh_agent_auth: fix nix eval --- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 694bc4a8f08..db6f04674a0 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = http://pamsshagentauth.sourceforge.net/; description = "PAM module for authentication through the SSH agent"; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.maintainers.linux; + platforms = stdenv.lib.platforms.linux; }; } From 1572a1f2a43a000b2bda751da29d469c2bf16cd1 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Fri, 19 Apr 2013 10:55:56 +0200 Subject: [PATCH 011/193] Add perl CatalystTraitForRequestProxyBase, with dependencies: CatalystXRoleApplicator MooseXRelatedClassRoles --- pkgs/top-level/perl-packages.nix | 40 ++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3cd4da0612f..1c28f8cc89e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -694,6 +694,26 @@ rec { [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ]; }; + CatalystXRoleApplicator = buildPerlPackage rec { + name = "CatalystX-RoleApplicator-0.005"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; + }; + buildInputs = [ ]; + propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; + }; + + CatalystTraitForRequestProxyBase = buildPerlPackage rec { + name = "Catalyst-TraitFor-Request-ProxyBase-0.000005"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + sha256 = "02kir63d5cs2ipj3fn1qlmmx3gqi1xqzrxfr4pv5vjhjgsm0zgx7"; + }; + buildInputs = [ CatalystRuntime ]; + propagatedBuildInputs = [ Moose URI CatalystXRoleApplicator ]; + }; + CatalystXScriptServerStarman = buildPerlPackage { name = "CatalystX-Script-Server-Starman-0.02"; src = fetchurl { @@ -3458,14 +3478,14 @@ rec { }; }; - MooseXSetOnce = buildPerlPackage rec { - name = "MooseX-SetOnce-0.200001"; + MooseXRelatedClassRoles = buildPerlPackage rec { + name = "MooseX-RelatedClassRoles-0.004"; src = fetchurl { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose ]; + buildInputs = [ ]; + propagatedBuildInputs = [ MooseXRoleParameterized ]; }; MooseXParamsValidate = buildPerlPackage { @@ -3521,6 +3541,16 @@ rec { propagatedBuildInputs = [ Moose ]; }; + MooseXSetOnce = buildPerlPackage rec { + name = "MooseX-SetOnce-0.200001"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + sha256 = "0qa2i45g2zn4r0wg7hba9va68nin5l63gr9l8b5q3hr4cjn97ll6"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ Moose ]; + }; + MooseXTraits = buildPerlPackage rec { name = "MooseX-Traits-0.11"; src = fetchurl { From bba3b07055aa534d1b55a449ab54b935baf3e855 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 May 2013 13:20:01 -0400 Subject: [PATCH 012/193] CatalystX::RoleApplicator: Fix URL --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1c28f8cc89e..25ab520bf4e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -697,7 +697,7 @@ rec { CatalystXRoleApplicator = buildPerlPackage rec { name = "CatalystX-RoleApplicator-0.005"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + url = "mirror://cpan/authors/id/H/HD/HDP/${name}.tar.gz"; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; buildInputs = [ ]; From f34d24f14c3d697637622e0dc7ed637969d91baf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 May 2013 13:48:17 -0400 Subject: [PATCH 013/193] Update LWP and LWP::Protocol::https --- pkgs/top-level/perl-packages.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25ab520bf4e..31b452ae200 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3045,10 +3045,10 @@ rec { }; LWP = buildPerlPackage { - name = "libwww-perl-6.04"; + name = "libwww-perl-6.05"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.04.tar.gz; - sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr"; + url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.05.tar.gz; + sha256 = "08wgwyz7748pv5cyngxia0xl6nragfnhrp4p9s78xhgfyygpj9bv"; }; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; doCheck = false; # tries to start a daemon @@ -3071,14 +3071,18 @@ rec { }; LWPProtocolHttps = buildPerlPackage rec { - name = "LWP-Protocol-https-6.02"; + name = "LWP-Protocol-https-6.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "0y2an4v7g4jm8fsszk2489m179i28kx79ywwiywkwk1aw3yqh0y5"; + url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz; + sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; propagatedBuildInputs = [ LWP IOSocketSSL ]; doCheck = false; # tries to connect to https://www.apache.org/. + meta = { + description = "Provide https support for LWP::UserAgent"; + license = "perl5"; + }; }; LWPUserAgent = buildPerlPackage { From 8ac0a0ac46616f270861df50936cdecf7054875f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 23 May 2013 21:00:07 +0200 Subject: [PATCH 014/193] firmware-linux-nonfree: set platform as linux --- .../linux/firmware/firmware-linux-nonfree/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6d921d55338..8567dadec50 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -61,6 +61,7 @@ in stdenv.mkDerivation { description = "Binary firmware collection packaged by Debian"; homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; license = stdenv.lib.licenses.unfreeRedistributable; + platforms = stdenv.lib.platforms.linux; priority = 10; # low priority so that other packages can override this big package }; } From da70c21cf72e320e643e16751883ae00334ef16c Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 23 May 2013 22:17:55 +0200 Subject: [PATCH 015/193] Fix boost-1.49.0 on Darwin --- pkgs/development/libraries/boost/1.49.nix | 2 +- .../libraries/boost/boost-149-darwin.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/boost-149-darwin.patch diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index e0ba0630cd0..6035232caf6 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { }; # See . - patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ]; + patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch ); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost-149-darwin.patch b/pkgs/development/libraries/boost/boost-149-darwin.patch new file mode 100644 index 00000000000..2485f883afc --- /dev/null +++ b/pkgs/development/libraries/boost/boost-149-darwin.patch @@ -0,0 +1,40 @@ +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam +*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013 +*************** +*** 498,504 **** + flags darwin.compile OPTIONS shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +--- 498,504 ---- + flags darwin.compile OPTIONS shared : -dynamic ; + + # Misc options. +! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ; + #~ flags darwin.link OPTIONS : -fexceptions ; + + # Add the framework names to use. +diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py +*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009 +--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013 +*************** +*** 37,43 **** + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', 'shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '') +--- 37,43 ---- + feature.feature ('framework', [], ['free']) + + toolset.flags ('darwin.compile', 'OPTIONS', 'shared', ['-dynamic']) +! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double']) + toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates']) + + toolset.flags ('darwin.link', 'FRAMEWORK', '') From 1739aab3f2f94ad4bcb3cdd1eaabf2d6e2b78d79 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Fri, 24 May 2013 00:56:00 +0200 Subject: [PATCH 016/193] Add ncursesw compatibility link also for includes This is needed for the ncurses cabal package to compile. It uses include/ncursesw/curses.h, without trying include/curses.h first. The files are provided through include/ncursesw on a clean Debian too, in the unicode case (when the libncursesw5-dev is installed). --- pkgs/development/libraries/ncurses/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 569d7fe2a32..d6d19b4a5c5 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation (rec { ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5 fi done; + ln -svf . $out/include/ncursesw '' else ""; meta = { From 325f7a6bb836c1e0a36d5e871e3c3992181cc090 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Fri, 24 May 2013 16:21:34 +0800 Subject: [PATCH 017/193] add sxiv-1.1 --- pkgs/applications/graphics/sxiv/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/graphics/sxiv/default.nix diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix new file mode 100644 index 00000000000..26d910943ef --- /dev/null +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libX11, imlib2, giflib }: + +stdenv.mkDerivation { + name = "sxiv-1.1"; + + src = fetchurl { + url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz"; + name = "sxiv-1.1.tar.gz"; + sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx"; + }; + + buildInputs = [ libX11 imlib2 giflib ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = { + description = "Simple X Image Viewer"; + homepage = "https://github.com/muennich/sxiv"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a161bfd909..e72e775685b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7911,6 +7911,8 @@ let st = callPackage ../applications/misc/st { }; + sxiv = callPackage ../applications/graphics/sxiv { }; + bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; dropbox = callPackage ../applications/networking/dropbox { }; From a403f55ccfe601470f11cfd2fb47a943d938855b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 May 2013 23:43:26 +0200 Subject: [PATCH 018/193] Adding megatools --- pkgs/tools/networking/megatools/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/megatools/default.nix diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix new file mode 100644 index 00000000000..022d09d0fb8 --- /dev/null +++ b/pkgs/tools/networking/megatools/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, glib, curl, pkgconfig, fuse }: + +stdenv.mkDerivation rec { + name = "megatools-1.9.91"; + + src = fetchurl { + url = "http://megatools.megous.com/builds/${name}.tar.gz"; + sha256 = "0hb83wqsn6mggcmk871hl8cski5x0hxz9dhaka42115s4mdfbl1i"; + }; + + buildInputs = [ glib curl pkgconfig fuse ]; + + meta = { + description = "Command line client for Mega.co.nz"; + homepage = http://megatools.megous.com/; + license = "GPLv2+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e72e775685b..86884642923 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1171,6 +1171,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + megatools = callPackage ../tools/networking/megatools { }; + minecraft = callPackage ../games/minecraft { }; minetest = callPackage ../games/minetest { }; From 7e7b669b3e499ee62967d54af8fd69982a0243a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 25 May 2013 00:08:42 +0200 Subject: [PATCH 019/193] megatools: fixing the network part It requires some env vars to work --- pkgs/tools/networking/megatools/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 022d09d0fb8..25dbd634c8c 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, glib, curl, pkgconfig, fuse }: +{ stdenv, fetchurl, glib, curl, pkgconfig, fuse, glib_networking, makeWrapper +, gsettings_desktop_schemas }: stdenv.mkDerivation rec { name = "megatools-1.9.91"; @@ -8,7 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0hb83wqsn6mggcmk871hl8cski5x0hxz9dhaka42115s4mdfbl1i"; }; - buildInputs = [ glib curl pkgconfig fuse ]; + buildInputs = [ glib curl pkgconfig fuse makeWrapper ]; + + postInstall = '' + for a in $out/bin/*; do + wrapProgram "$a" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" + + done + ''; meta = { description = "Command line client for Mega.co.nz"; From fb906e44accce334d283cc48cdee4e24b6236e9c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:41:28 +0300 Subject: [PATCH 020/193] shared-mime-info: update to 1.1 --- pkgs/data/misc/shared-mime-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index a761594d07f..1e424aca46b 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,11 +2,11 @@ , libxml2, glib}: stdenv.mkDerivation rec { - name = "shared-mime-info-1.0"; + name = "shared-mime-info-1.1"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "13xf09c4vc4hl5qhk7i4gc6z8knc32b5wjb4ds8ds4z2mbjk1s6j"; + sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q"; }; buildInputs = [ From 8b8129d47877dee548834579e20611e3a5424c3f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:41:57 +0300 Subject: [PATCH 021/193] libattica: update to 0.4.1 --- pkgs/development/libraries/attica/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 9a5002551cb..99fe36faa4b 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "attica-0.4.0"; + name = "attica-0.4.1"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "172d1z97aw9iscq6wh23i31s4hgq7mmhr3mk4xgifqv0hjcmzyhq"; + sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n"; }; buildInputs = [ qt4 ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to access Open Collaboration Service providers"; license = "LGPL"; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; inherit (qt4.meta) platforms; }; } From a62d29d4488c9f07319452caac466c3a6f5c9e67 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:42:27 +0300 Subject: [PATCH 022/193] strigi: update to 0.7.8 --- pkgs/development/libraries/strigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 465a5d80ae0..fc8dc123032 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "strigi-${version}"; - version = "0.7.5"; + version = "0.7.8"; src = fetchurl { url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; - sha256 = "16qqnlh0dy3r92shzm2q36h5qi3m06pihr4h5cq944hpvqz5w7qi"; + sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; includeAllQtDirs = true; From ce084cd4e640dfbef549478a4ff6f8f2572ce186 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:43:21 +0300 Subject: [PATCH 023/193] grantlee: update to 0.3.0 --- pkgs/development/libraries/grantlee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 47d3d22f043..4fc7b681baa 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.2.0"; + name = "grantlee-0.3.0"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://downloads.grantlee.org/${name}.tar.gz" "http://www.loegria.net/grantlee/${name}.tar.gz" ]; - sha256 = "0x6lvn5i9025vdbs6sybs2mm5ay5y40f7nvb58mc2k518rmjb9j3"; + sha256 = "0c2zwaickp7han0zbxg78qrxv06jjfc4xyz2lmvl1xxmpv4vqzpv"; }; buildInputs = [ cmake qt4 ]; From e15a244a74ba6ae00327c240f1871540fc87b612 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:43:45 +0300 Subject: [PATCH 024/193] KDE 4.10: Akonadi: update to 1.9.2 --- pkgs/desktops/kde-4.10/support/akonadi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.10/support/akonadi/default.nix b/pkgs/desktops/kde-4.10/support/akonadi/default.nix index 0ba61722621..e1d8a5ef9ae 100644 --- a/pkgs/desktops/kde-4.10/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.10/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: stdenv.mkDerivation rec { - name = "akonadi-1.9.1"; + name = "akonadi-1.9.2"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "1w10kb4m8ri6yi1mii2j0sckj3vq11y6qkzijm3lbh4w0fi4kbjk"; + sha256 = "1ndzc7a1q1hqy4pn9xnihq6ni02zsqfdyy6z6lwn27bkb7pg64p7"; }; buildInputs = [ qt4 soprano libxslt boost sqlite ]; From c1a76a04dc6b5e32dd543dc49c87f4923b4472dc Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:44:23 +0300 Subject: [PATCH 025/193] Soprano: update to 2.9.2 --- pkgs/development/libraries/soprano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index c5fac00be14..8ca16ff72c7 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.9.0"; + name = "soprano-2.9.2"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1sz4d1rqvdhfmbf7afdwdd49ynvjwawhym3qwbld83nydqw274xk"; + sha256 = "105xlng1ka0661gk2ap39rjjy7znp670df0c5569x04vppgd45g1"; }; patches = [ ./find-virtuoso.patch ]; From 92d81b1952113cd0f760bcca1a8e5f4d1d11cbb1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:44:53 +0300 Subject: [PATCH 026/193] libdbusmenu-qt: update to 0.9.2 --- pkgs/development/libraries/libdbusmenu-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 6fa6ca4b6f8..d49f4cc6a72 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -2,7 +2,7 @@ let baseName = "libdbusmenu-qt"; - v = "0.9.0"; + v = "0.9.2"; homepage = "http://launchpad.net/${baseName}"; name = "${baseName}-${v}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2"; - sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787"; + sha256 = "1v0ri5g9xw2z64ik0kx0ra01v8rpjn2kxprrxppkls1wvav1qv5f"; }; buildInputs = [ qt4 ]; From 6b9c2218c65f7f3b58713a89627cfeb460029df2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:45:45 +0300 Subject: [PATCH 027/193] KDE 4.10: kdelibs, kdepim: remove todo notices, fix compilation against openEXR. --- pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix | 41 +++++----------------- pkgs/desktops/kde-4.10/kdepim.nix | 2 +- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix index 6bb6b7ebfdf..4386317309f 100644 --- a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix +++ b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix @@ -3,54 +3,31 @@ , openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg, xz +, getopt, udev, herqq, phonon, libjpeg, xz, ilmbase , pkgconfig }: kde { buildInputs = - [ pkgconfig -# attr - attica #todo: update to 4.1 - avahi - bzip2 - enchant - fam -# getopt - giflib - grantlee # todo: update to 0.3 - herqq - jasper - libdbusmenu_qt #todo: update to 0.9.2 - libXScrnSaver - libxslt -# pcre - polkit_qt_1 qca2 - shared_desktop_ontologies xz udev -# libxml2 - libjpeg - kerberos - -#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated + [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper + libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2 + shared_desktop_ontologies xz udev libjpeg kerberos openexr ]; - propagatedBuildInputs = [ qt4 soprano - strigi # todo: update to 0.7.8 - phonon ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - propagatedNativeBuildInputs = [ automoc4 cmake perl - shared_mime_info #todo: update to 1.1 - ]; + propagatedBuildInputs = [ qt4 soprano strigi phonon ]; + + propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; # TODO: make sonnet plugins (dictionaries) really work. # There are a few hardcoded paths. - # Let kdelibs find openexr # Split plugins from libs? patches = [ ../files/polkit-install.patch ]; # cmake fails to find acl.h because of C++-style comment - # TODO: OpenEXR + cmakeFlags = [ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix index fffab0010e3..dca60d3d4b6 100644 --- a/pkgs/desktops/kde-4.10/kdepim.nix +++ b/pkgs/desktops/kde-4.10/kdepim.nix @@ -3,7 +3,7 @@ , nepomuk_widgets, dblatex }: kde { -#todo: update grantlee to 0.3 + buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex From 64661b0a2b7aaf0519d4afb30eeb77b4eeceea63 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 25 May 2013 11:59:24 +0300 Subject: [PATCH 028/193] KDE4.10: kde-runtime: fix build against openEXR --- pkgs/desktops/kde-4.10/kde-runtime.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index 6b642eb0b22..b562d8cadd5 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -1,18 +1,20 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager, kactivities, kdepimlibs +, networkmanager, kactivities, kdepimlibs, openexr, ilmbase }: kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba (libcanberra.override { gtk = null; }) pulseaudio - networkmanager kactivities kdepimlibs -#todo: add openslp, openexr + networkmanager kactivities kdepimlibs openexr +#todo: add openslp ]; nativeBuildInputs = [ pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + passthru.propagatedUserEnvPackages = [ virtuoso ]; meta = { From 7ef3aea9210c985a589c67a023518157cfe78f28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 May 2013 11:11:37 +0200 Subject: [PATCH 029/193] erlang: drop obsolete version R15B02 --- .../interpreters/erlang/R15B02.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 46 deletions(-) delete mode 100644 pkgs/development/interpreters/erlang/R15B02.nix diff --git a/pkgs/development/interpreters/erlang/R15B02.nix b/pkgs/development/interpreters/erlang/R15B02.nix deleted file mode 100644 index 858f7753177..00000000000 --- a/pkgs/development/interpreters/erlang/R15B02.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: - -assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; - -let version = "15B02"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158"; - }; - - buildInputs = - [ perl gnum4 ncurses openssl - ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl}"; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c3059ebceb..d4b529d3fcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2886,7 +2886,6 @@ let }; erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; - erlangR15B02 = callPackage ../development/interpreters/erlang/R15B02.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; erlang = erlangR15B03; From 30fc3b8d73c1166304ba8bef15c63523d92cb2d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 May 2013 11:31:00 +0200 Subject: [PATCH 030/193] haskell-digestive-functors-heist: update to version 0.6.2.1 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 845495f7e77..0bff7f191b1 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.6.2.0"; - sha256 = "03wxdmgwc6qialwhp5zdj3s3a8a8yz6vswfgryjx4izaaq7pdhl1"; + version = "0.6.2.1"; + sha256 = "1hs1qiaakxgv1lyd74cahqphrpqch1wayx0c9zpgjja3bnwjcj8n"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; From c573a659276df679f342deec371108ddea8c30ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 May 2013 11:31:00 +0200 Subject: [PATCH 031/193] haskell-entropy: update to version 0.2.2 --- pkgs/development/libraries/haskell/entropy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 004d7492c51..f98903d3dc1 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "entropy"; - version = "0.2.1"; - sha256 = "1qp8hvdzfgg2wk7d431qycwbn2zpzlplc1c7dbhimj1had5jscrs"; + version = "0.2.2"; + sha256 = "1zri5qs19cbz9ydbh076q6834pspf2gqn06ssz4hsq6j65cnd9x2"; meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; + homepage = "https://github.com/TomMD/entropy"; description = "A platform independent entropy source"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 6d865e5c38301e5d88bbb848d1836936d022fa73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 May 2013 11:31:00 +0200 Subject: [PATCH 032/193] haskell-language-c-quote: update to version 0.7.2 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 1d3fee0f94f..4c281642277 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.1"; - sha256 = "14gh944wpwg4csxwswr9jlll4p5wc3x1fhbqsfh9lqf98ys7ij3z"; + version = "0.7.2"; + sha256 = "01ki78qh39gbd9md3pq783vx2p86gyzhclci7pcppz2rd3man51m"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 2bd7aa7a65ee63bafc44b5fe62b667ba7546e986 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 May 2013 11:31:00 +0200 Subject: [PATCH 033/193] haskell-timeplot: update to version 1.0.20 --- pkgs/development/tools/haskell/timeplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index d95c8cea03f..62a03cae14e 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.19"; - sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx"; + version = "1.0.20"; + sha256 = "0zlpqfd1l1ss9jjjb967a7jnn1h560ygv8zfiikcx6iagsjmysh2"; isLibrary = false; isExecutable = true; buildDepends = [ From b08d6a39f8319c9ed593701893ee6b683d3a8ccc Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 May 2013 01:18:48 +0200 Subject: [PATCH 034/193] mplayer(2): Add support and library for bs2b. This also adds a new package "libbs2b", which is needed in order to support Bauer stereophonic-to-binaural DSP as an audio filter. Signed-off-by: aszlig --- pkgs/applications/video/mplayer/default.nix | 3 +++ pkgs/applications/video/mplayer2/default.nix | 3 +++ .../libraries/audio/libbs2b/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/audio/libbs2b/default.nix diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index d86b81be756..a1ec200aaf0 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -16,6 +16,7 @@ , x264Support ? false, x264 ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? false, pulseaudio ? null +, bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null , useUnfreeCodecs ? false @@ -38,6 +39,7 @@ assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; +assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; let @@ -112,6 +114,7 @@ stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional libpngSupport libpng + ++ optional bs2bSupport libbs2b ; nativeBuildInputs = [ yasm ]; diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 9e89d538414..24f53884e39 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -12,6 +12,7 @@ , theoraSupport ? true, libtheora ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? true, pulseaudio ? null +, bs2bSupport ? false, libbs2b ? null # For screenshots , libpngSupport ? true, libpng ? null , useUnfreeCodecs ? false @@ -29,6 +30,7 @@ assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; +assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; let @@ -92,6 +94,7 @@ stdenv.mkDerivation rec { ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex + ++ optional bs2bSupport libbs2b ++ optional libpngSupport libpng ; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix new file mode 100644 index 00000000000..e43a5acb6bd --- /dev/null +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + name = "libbs2b-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/bs2b/${name}.tar.bz2"; + sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7"; + }; + + buildInputs = [ pkgconfig libsndfile ]; + + meta = { + homepage = "http://bs2b.sourceforge.net/"; + description = "Bauer stereophonic-to-binaural DSP library"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4b529d3fcd..7eec0aa05fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4198,6 +4198,8 @@ let libbluray = callPackage ../development/libraries/libbluray { }; + libbs2b = callPackage ../development/libraries/audio/libbs2b { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; From 25b4b5aeb41d0b506bd51a9928acc882a2fc35d9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 May 2013 03:17:14 +0200 Subject: [PATCH 035/193] chromium: Update dev channel to v28.0.1500.11. Build and tests successful on my machine. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 3f0cb0e3f83..7d5a805148d 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "28.0.1500.5"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.5.tar.xz"; - sha256 = "1jpjmqag875bpy4rwvr362nzx0r8ffcrisil9ci2ar6ayjd4lfhd"; + version = "28.0.1500.11"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.11.tar.xz"; + sha256 = "1gnm803y7da7n4c3awh77vmsb0f4d8czs9svgqvvwk9bb7d1kc65"; }; beta = { version = "27.0.1453.81"; From f94d623ba87e661c0df28e7e50b8187c33b54f7f Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 24 May 2013 22:14:49 +0200 Subject: [PATCH 036/193] gajim: Update to version 0.15.3. Signed-off-by: aszlig --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1def7e2b1f0..bf7b050cd0d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.15.1" a; + version = a.lib.attrByPath ["version"] "0.15.3" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver @@ -15,7 +15,7 @@ in rec { src = fetchurl { url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b"; + sha256 = "139yl7v1i6g9q66fdmzw0x7hhp7c4x44n4l8hl9g6m9zig5v3s28"; }; inherit buildInputs; From 64128b7297d005aa1ebc38f0812f97313c0549b0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 May 2013 18:33:48 +0200 Subject: [PATCH 037/193] haxe: Update to stable version 3.00. So, finally, Haxe 3 is stable :-) An overview of the new features can be found here: http://haxe.org/manual/haxe3/features This version now has a new build target "tools", so let's use it. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 1b4f237cca5..93ee1a87edd 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchsvn, ocaml, zlib, neko }: stdenv.mkDerivation { - name = "haxe-2.10"; + name = "haxe-3.00"; buildInputs = [ocaml zlib neko]; srcs = fetchsvn { - url = "http://haxe.googlecode.com/svn/tags/v2-10"; - sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh"; + url = "http://haxe.googlecode.com/svn/trunk"; + sha256 = "0yfqqyr2jyd9b15xadcvv3fiaipxzgnilqnbbgd6pnaj1zsm31lr"; + rev = 6706; ignoreExternals = true; }; ocamllibs = fetchsvn { url = "http://ocamllibs.googlecode.com/svn/trunk"; - sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q"; - rev = 256; + sha256 = "0ngcsp1qksz98r3qixj1b3l2k9qp7wgn7jxc2fpl8pvv9bc3b52f"; + rev = 287; ignoreExternals = true; }; @@ -29,6 +30,8 @@ stdenv.mkDerivation { rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib ''; + buildFlags = [ "all" "tools" ]; + installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" install -vt "$out/bin" haxe haxelib haxedoc From 565b5b522f0369316c0b4e0e258b8f16aa3e28bb Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 May 2013 18:41:11 +0200 Subject: [PATCH 038/193] haxe: Cosmetics - use -f flag on rm. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 93ee1a87edd..b36caaf04a0 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { postBuild = '' find std/tools -name '*.n' -delete - rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib + rm -f std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib ''; buildFlags = [ "all" "tools" ]; From b59d53cc2de17bd6185773d2eaeb4e176699c32a Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 May 2013 18:44:15 +0200 Subject: [PATCH 039/193] Revert "haxe: Use ignoreExternals and fix build." This reverts commit a0716f28afd5b3f9028f40ea17d8b0a9097fcff8. Starting with r6706, externals now have a fixed revision, so we no longer need to ignore them. Signed-off-by: aszlig Conflicts: pkgs/development/compilers/haxe/default.nix --- pkgs/development/compilers/haxe/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index b36caaf04a0..b2d69f2ea7d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -5,23 +5,13 @@ stdenv.mkDerivation { buildInputs = [ocaml zlib neko]; - srcs = fetchsvn { + src = fetchsvn { url = "http://haxe.googlecode.com/svn/trunk"; - sha256 = "0yfqqyr2jyd9b15xadcvv3fiaipxzgnilqnbbgd6pnaj1zsm31lr"; + sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4"; rev = 6706; - ignoreExternals = true; - }; - - ocamllibs = fetchsvn { - url = "http://ocamllibs.googlecode.com/svn/trunk"; - sha256 = "0ngcsp1qksz98r3qixj1b3l2k9qp7wgn7jxc2fpl8pvv9bc3b52f"; - rev = 287; - ignoreExternals = true; }; prePatch = '' - cp -r "$ocamllibs" libs - chmod -R u+w libs sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; From f55117ab8aeaa8bad45f3a199674c3ad5eee375e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Apr 2013 22:47:01 +0200 Subject: [PATCH 040/193] Add Sourcery CodeBench Lite toolchain(s) Sourcery CodeBench toolchains are prebuilt GCC toolchains from Mentor Graphics. Start out by adding ARM EABI and ARM GNU/Linux toolchains. Sourcery CodeBench is also available for MIPS, Power, SuperH, ColdFire (and more), so it should be easy to add later, if needed. AFAIK, the EABI toolchains use newlib and the GNU/Linux ones use glibc. --- pkgs/development/compilers/mentor/default.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/development/compilers/mentor/default.nix diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix new file mode 100644 index 00000000000..e053599e5dd --- /dev/null +++ b/pkgs/development/compilers/mentor/default.nix @@ -0,0 +1,75 @@ +# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics + +{ stdenv, fetchurl, patchelf, ncurses }: + +let + + buildToolchain = + { name, src, description }: + + stdenv.mkDerivation rec { + inherit name src; + + buildInputs = [ patchelf ]; + + buildCommand = '' + # Unpack tarball + mkdir -p "$out" + tar --strip-components=1 -xjf "$src" -C "$out" + + # Patch binaries + interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do + # Skip non-executable files + case "$file" in + *README.txt) echo "skipping $file"; continue;; + *liblto_plugin.so*) echo "skipping $file"; continue;; + esac + + # Skip directories + test -d "$file" && continue + + echo "patchelf'ing $file" + patchelf --set-interpreter "$interpreter" "$file" + + # GDB needs ncurses + case "$file" in + *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";; + esac + done + ''; + + meta = with stdenv.lib; { + inherit description; + homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + +in + +{ + + armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec { + name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}"; + description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics"; + src = fetchurl { + url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr"; + }; + }; + + armEabi = let version = "2013.05-23"; in buildToolchain rec { + name = "sourcery-codebench-lite-arm-eabi-${version}"; + description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics"; + src = fetchurl { + url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923"; + }; + }; + + # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH, + # ColdFire (and more). +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86884642923..f92ad085417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2612,6 +2612,10 @@ let else stdenv; }; + mentorToolchains = recurseIntoAttrs ( + callPackage_i686 ../development/compilers/mentor {} + ); + mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { }; From a31ba7ed654b08d216c56f22f3421ed975740503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 11 May 2013 13:33:54 +0200 Subject: [PATCH 041/193] eagle: new package Eagle is a schematic capture and PCB layout program from CadSoft. This is proprietary software; CadSoft provide a self-extracting shell script with embedded tarball of the prebuilt application. Add the latest Eagle version, 6.4.0. I've added a small LD_PRELOAD library that redirects operations on the license file from /bin/eagle.key to $HOME/.eagle.key. Without this Eagle will never get past the license dialog (because you cannot write to the nix store). Eagle also has issues copying its example projects to other locations; it seems that it wants to preserve the read-only permissions from the source over to the destination. Because of this it cannot complete the copy operation because it cannot write the project files into to the (read-only) project directory it just created. So wrap chmod by OR'ing in the write-by-owner bit. --- .../science/electronics/eagle/default.nix | 86 +++++++++++ .../science/electronics/eagle/eagle_fixer.c | 134 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 222 insertions(+) create mode 100644 pkgs/applications/science/electronics/eagle/default.nix create mode 100644 pkgs/applications/science/electronics/eagle/eagle_fixer.c diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix new file mode 100644 index 00000000000..04c9a9b79ec --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig +, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi +}: + +let + + libPath = stdenv.lib.makeLibraryPath + [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11 + libXext libXi + ]; + +in + +stdenv.mkDerivation rec { + name = "eagle-${version}"; + version = "6.4.0"; + + src = fetchurl { + url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run"; + sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8"; + }; + + desktopItem = makeDesktopItem { + name = "Eagle"; + exec = "eagle"; + icon = "eagle"; + comment = "Schematic capture and PCB layout"; + desktopName = "Eagle"; + genericName = "Schematic editor"; + categories = "Application;Development;"; + }; + + buildInputs = + [ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor + libX11 libXext libXi + ]; + + phases = [ "installPhase" ]; + + # NOTES: + # Eagle for Linux comes as a self-extracting shell script with embedded + # tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker. + # + # Eagle apparently doesn't like binary patching. This is what happens: + # $ ./result/eagle-6.4.0/bin/eagle + # argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version! + installPhase = '' + # Extract eagle tarball + mkdir "$out" + sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out" + + # Install manpage + mkdir -p "$out"/share/man/man1 + ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1 + + # Build LD_PRELOAD library that redirects license file access to the home + # directory of the user + mkdir -p "$out"/lib + gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl + + # Make wrapper script + dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" + mkdir -p "$out"/bin + cat > "$out"/bin/eagle << EOF + #!${stdenv.shell} + export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}" + export LD_PRELOAD="$out/lib/eagle_fixer.so" + exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" + EOF + chmod a+x "$out"/bin/eagle + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png + ''; + + meta = with stdenv.lib; { + description = "Schematic editor and PCB layout tool from CadSoft"; + homepage = http://www.cadsoftusa.com/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/science/electronics/eagle/eagle_fixer.c b/pkgs/applications/science/electronics/eagle/eagle_fixer.c new file mode 100644 index 00000000000..da9da4dcbd3 --- /dev/null +++ b/pkgs/applications/science/electronics/eagle/eagle_fixer.c @@ -0,0 +1,134 @@ +/* + * LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from + * CadSoft) work from a read-only installation directory. + * + * When Eagle starts, it looks for the license file in /bin/eagle.key + * (where is the install path). If eagle.key is not found, Eagle checks + * for write access to /bin/, shows a license dialog to the user and + * then attempts to write a license file to /bin/. + * + * This will of course fail when Eagle is installed in the read-only Nix store. + * Hence this library that redirects accesses to the those paths in the + * following way: + * + * /bin => $HOME + * /bin/eagle.key => $HOME/.eagle.key + * + * Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle + * chmod's the destination with read-only permission bits (presumably because + * the source is read-only) and fails to complete the copy operation. + * Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR + * bit (write by owner). + * + * Usage: + * gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl + * LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle + * + * To see the paths that are modified at runtime, set the environment variable + * EAGLE_FIXER_DEBUG to 1. + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef EAGLE_PATH +#error Missing EAGLE_PATH, path to the eagle-${version} installation directory. +#endif + +typedef FILE *(*fopen_func_t)(const char *path, const char *mode); +typedef int (*access_func_t)(const char *pathname, int mode); +typedef int (*chmod_func_t)(const char *path, mode_t mode); + +/* + * Map /bin to $HOME and /bin/eagle.key to $HOME/.eagle.key + * + * Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's + * OK. + */ +static const char *redirect(const char *pathname) +{ + static char buffer[PATH_MAX]; + const char *homepath; + const char *new_path; + static int have_warned; + + homepath = getenv("HOME"); + if (!homepath) { + homepath = "/"; + if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n"); + have_warned = 1; + } + } + + new_path = pathname; + if (strcmp(EAGLE_PATH "/bin", pathname) == 0) { + /* redirect to $HOME */ + new_path = homepath; + } else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) { + /* redirect to $HOME/.eagle.key */ + snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath); + buffer[PATH_MAX-1] = '\0'; + new_path = buffer; + } + + return new_path; +} + +FILE *fopen(const char *pathname, const char *mode) +{ + FILE *fp; + const char *path; + fopen_func_t orig_fopen; + + orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen"); + path = redirect(pathname); + fp = orig_fopen(path, mode); + + if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp); + } + + return fp; +} + +int access(const char *pathname, int mode) +{ + int ret; + const char *path; + access_func_t orig_access; + + orig_access = (access_func_t)dlsym(RTLD_NEXT, "access"); + path = redirect(pathname); + ret = orig_access(path, mode); + + if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret); + } + + return ret; +} + +int chmod(const char *pathname, mode_t mode) +{ + int ret; + mode_t new_mode; + chmod_func_t orig_chmod; + + orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod"); + new_mode = mode | S_IWUSR; + ret = orig_chmod(pathname, new_mode); + + if (getenv("EAGLE_FIXER_DEBUG")) { + fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret); + } + + return ret; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86884642923..7807ce6fdf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8969,6 +8969,8 @@ let ### SCIENCE / ELECTRONICS + eagle = callPackage_i686 ../applications/science/electronics/eagle { }; + caneda = callPackage ../applications/science/electronics/caneda { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { }; From 9229f669fcf8918fc227139b936bc1522f133dcd Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 26 May 2013 00:11:13 +0200 Subject: [PATCH 042/193] release-cross: add raspberrypi --- pkgs/top-level/release-cross.nix | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 2c688ea71bd..1cb3f584495 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -318,6 +318,46 @@ let in { nanonote = mapTestOnCross crossSystem { + coreutils.crossDrv = nativePlatforms; + ed.crossDrv = nativePlatforms; + inetutils.crossDrv = nativePlatforms; + nixUnstable.crossDrv = nativePlatforms; + patch.crossDrv = nativePlatforms; + zile.crossDrv = nativePlatforms; + prboom.crossDrv = nativePlatforms; + vim.crossDrv = nativePlatforms; + lynx.crossDrv = nativePlatforms; + patchelf.crossDrv = nativePlatforms; + nix.crossDrv = nativePlatforms; + fossil.crossDrv = nativePlatforms; + binutils.crossDrv = nativePlatforms; + mpg123.crossDrv = nativePlatforms; + yacas.crossDrv = nativePlatforms; + }; +}) // ( + + +/* Linux on Raspberrypi */ +let + crossSystem = { + config = "armv6l-unknown-linux-gnueabi"; + bigEndian = false; + arch = "arm"; + float = "hard"; + fpu = "vfp"; + withTLS = true; + libc = "glibc"; + platform = pkgs.platforms.raspberrypi; + openssl.system = "linux-generic32"; + gcc = { + arch = "armv6"; + fpu = "vfp"; + float = "softfp"; + abi = "aapcs-linux"; + }; + }; +in { + rpi = mapTestOnCross crossSystem { coreutils.crossDrv = nativePlatforms; ed.crossDrv = nativePlatforms; inetutils.crossDrv = nativePlatforms; From d31b8b2988993d70aa88d02eed77d63430ab7de7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 26 May 2013 12:54:13 +0200 Subject: [PATCH 043/193] rpi: more packages to cross-compile --- pkgs/top-level/release-cross.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 1cb3f584495..3895ee26779 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -363,9 +363,14 @@ in { inetutils.crossDrv = nativePlatforms; nixUnstable.crossDrv = nativePlatforms; patch.crossDrv = nativePlatforms; - zile.crossDrv = nativePlatforms; - prboom.crossDrv = nativePlatforms; vim.crossDrv = nativePlatforms; + tmux.crossDrv = nativePlatforms; + screen.crossDrv = nativePlatforms; + unrar.crossDrv = nativePlatforms; + unzip.crossDrv = nativePlatforms; + hdparm.crossDrv = nativePlatforms; + ddrescue.crossDrv = nativePlatforms; + git.crossDrv = nativePlatforms; lynx.crossDrv = nativePlatforms; patchelf.crossDrv = nativePlatforms; nix.crossDrv = nativePlatforms; From 431fc8b250335f8bed09605c998a458e9ddbf0e9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 10 May 2013 14:31:13 +0000 Subject: [PATCH 044/193] st: Update to 0.4.1 and add support for custom config --- pkgs/applications/misc/st/default.nix | 20 ++++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 70089759626..41575ce35a6 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,14 +1,22 @@ -{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }: +{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig +, conf? null}: + +with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.3"; + name = "st-0.4.1"; src = fetchurl { url = "http://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d"; + sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf"; }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - buildInputs = [ libX11 ncurses libXext libXft ]; + buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; + + NIX_LDFLAGS = "-lfontconfig"; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out @@ -17,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; license = "MIT"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with maintainers; [viric]; + platforms = with platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd173c74486..cb5bffa9126 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7853,7 +7853,9 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; - st = callPackage ../applications/misc/st { }; + st = callPackage ../applications/misc/st { + conf = config.st.conf or null; + }; bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; From f55b58bcc0bc0d16548b26c9b4a097504119b3a4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 26 May 2013 13:23:28 +0000 Subject: [PATCH 045/193] Add offline as a maintainer, so i can latter add myself as maintainer to packages --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b2310d62ecb..e861203fb15 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -28,6 +28,7 @@ marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; neznalek = "Vladimír Čunát "; + offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; phreedom = "Evgeny Egorochkin "; From dddf921b51e2f6e510a31958d5a14fb452b43b73 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 May 2013 16:03:07 -0400 Subject: [PATCH 046/193] fetchsvn: Allow setting the name of the output Signed-off-by: Shea Levy --- pkgs/build-support/fetchsvn/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 39272b99608..30625a758f8 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,5 +1,5 @@ -{stdenv, subversion, sshSupport ? false, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}: +{stdenv, subversion, sshSupport ? false, openssh ? null}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}: let repoName = with stdenv.lib; @@ -18,10 +18,12 @@ let else if snd path == "tags" then "${trd path}-${fst path}" # ../repo (no trunk) -> repo else fst path; + + name_ = if name == null then "${repoName}-r${toString rev}" else name; in stdenv.mkDerivation { - name = "${repoName}-r${toString rev}"; + name = name_; builder = ./builder.sh; buildInputs = [subversion]; From afe180f74c01107832090bc00242939d2ffdf427 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 26 May 2013 20:53:09 +0200 Subject: [PATCH 047/193] xbmc: 12.1 -> 12.2 --- pkgs/applications/video/xbmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index e5deba4f97f..55734e49539 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -33,11 +33,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - name = "xbmc-12.1"; + name = "xbmc-12.2"; src = fetchurl { url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz"; - sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9"; + sha256 = "077apkq9sx6wlwkwmiz63w5dcqbbrbjbn6qk9fj2fgaizhs0ccxj"; }; buildInputs = [ From 5e064cc87167f1ad916bac809dd5127374f36fc7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 May 2013 16:04:32 -0400 Subject: [PATCH 048/193] v8: Bump Signed-off-by: Shea Levy --- pkgs/development/libraries/v8/default.nix | 10 ++++--- .../v8/fix-GetLocalizedMessage-usage.patch | 27 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 1634be1363a..b325c2a107d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,18 +5,22 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.11.10.22"; + version = "3.14.5.9"; in assert arch != ""; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "v8-${version}"; + src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "1bm3hg4pa17xvs8s895bwklxpaihl3f3vzghdg55s1wd0y4dj96j"; + sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr"; + name = "v8-${version}-src"; }; + patches = [ ./fix-GetLocalizedMessage-usage.patch ]; + configurePhase = '' mkdir build/gyp ln -sv ${gyp}/bin/gyp build/gyp/gyp diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch new file mode 100644 index 00000000000..3bc0fff4d50 --- /dev/null +++ b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch @@ -0,0 +1,27 @@ +From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 +From: Timothy J Fontaine +Date: Thu, 23 May 2013 13:57:59 -0700 +Subject: [PATCH] v8: fix GetLocalizedMessage usage + +As is the backport of the abort on uncaught exception wouldn't compile +because we it was passing in `this` when it was unnecessary. +--- + deps/v8/src/isolate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/isolate.cc b/src/isolate.cc +index 04a438b..5a5293e 100644 +--- a/src/isolate.cc ++++ b/src/isolate.cc +@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { + (report_exception || can_be_caught_externally)) { + fatal_exception_depth++; + fprintf(stderr, "%s\n\nFROM\n", +- *MessageHandler::GetLocalizedMessage(this, message_obj)); ++ *MessageHandler::GetLocalizedMessage(message_obj)); + PrintCurrentStackTrace(stderr); + OS::Abort(); + } +-- +1.8.1.6 + From 9d6e49382db5dcf050400241d285f735cb691aa5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 May 2013 16:58:23 -0400 Subject: [PATCH 049/193] Add http_parser library Signed-off-by: Shea Levy --- .../libraries/http_parser/build-shared.patch | 30 +++++++++++++ .../libraries/http_parser/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/development/libraries/http_parser/build-shared.patch create mode 100644 pkgs/development/libraries/http_parser/default.nix diff --git a/pkgs/development/libraries/http_parser/build-shared.patch b/pkgs/development/libraries/http_parser/build-shared.patch new file mode 100644 index 00000000000..5922cdfb584 --- /dev/null +++ b/pkgs/development/libraries/http_parser/build-shared.patch @@ -0,0 +1,30 @@ +diff -Naur http-parser-2.1-orig/http_parser.gyp http-parser-2.1/http_parser.gyp +--- http-parser-2.1-orig/http_parser.gyp 2013-03-26 18:35:20.000000000 -0400 ++++ http-parser-2.1/http_parser.gyp 2013-05-23 16:47:49.280488341 -0400 +@@ -21,7 +21,7 @@ + }, + 'Release': { + 'defines': [ 'NDEBUG' ], +- 'cflags': [ '-Wall', '-Wextra', '-O3' ], ++ 'cflags': [ '-Wall', '-Wextra', '-O3', '-fPIC' ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeLibrary': 0, # static release +@@ -50,7 +50,7 @@ + 'targets': [ + { + 'target_name': 'http_parser', +- 'type': 'static_library', ++ 'type': 'shared_library', + 'include_dirs': [ '.' ], + 'direct_dependent_settings': { + 'defines': [ 'HTTP_PARSER_STRICT=0' ], +@@ -73,7 +73,7 @@ + + { + 'target_name': 'http_parser_strict', +- 'type': 'static_library', ++ 'type': 'shared_library', + 'include_dirs': [ '.' ], + 'direct_dependent_settings': { + 'defines': [ 'HTTP_PARSER_STRICT=1' ], diff --git a/pkgs/development/libraries/http_parser/default.nix b/pkgs/development/libraries/http_parser/default.nix new file mode 100644 index 00000000000..8106dcff8da --- /dev/null +++ b/pkgs/development/libraries/http_parser/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, gyp, utillinux ? null }: + +let + version = "2.1"; +in stdenv.mkDerivation { + name = "http-parser-${version}"; + + src = fetchurl { + url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; + sha256 = "16a2w5z4g2bma25fqcrkpidqzlq8a2jxkk93ajl721q85406j105"; + }; + + patches = [ ./build-shared.patch ]; + + configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp"; + + buildFlags = [ "BUILDTYPE=Release" ]; + + buildInputs = [ gyp utillinux ]; + + doCheck = true; + + checkPhase = '' + out/Release/test-nonstrict + out/Release/test-strict + ''; + + installPhase = '' + mkdir -p $out + mv out/Release/lib.target $out/lib + + mkdir -p $out/include + mv http_parser.h $out/include + ''; + + meta = { + description = "An HTTP message parser written in C"; + + homepage = https://github.com/joyent/http-parser; + + license = stdenv.lib.licenses.mit; + + maintainer = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a161bfd909..5c76c8af204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4077,6 +4077,8 @@ let hsqldb = callPackage ../development/libraries/java/hsqldb { }; + http_parser = callPackage ../development/libraries/http_parser { inherit (pythonPackages) gyp; }; + hunspell = callPackage ../development/libraries/hunspell { }; hwloc = callPackage ../development/libraries/hwloc { From 428aae8c04aa9bd9b591427b67b4ef0470524e1f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 May 2013 17:09:04 -0400 Subject: [PATCH 050/193] Add c-ares DNS library I love it when packages just need name and src Signed-off-by: Shea Levy --- pkgs/development/libraries/c-ares/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/c-ares/default.nix diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix new file mode 100644 index 00000000000..c1b23179a1d --- /dev/null +++ b/pkgs/development/libraries/c-ares/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "c-ares-1.10.0"; + + src = fetchurl { + url = "http://c-ares.haxx.se/download/${name}.tar.gz"; + sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + }; + + meta = { + description = "A C library for asynchronous DNS requests"; + + homepage = http://c-ares.haxx.se; + + license = stdenv.lib.licenses.mit; + + maintainer = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c76c8af204..b7b40ef0f68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3554,6 +3554,8 @@ let bwidget = callPackage ../development/libraries/bwidget { }; + c-ares = callPackage ../development/libraries/c-ares { }; + caelum = callPackage ../development/libraries/caelum { }; scmccid = callPackage ../development/libraries/scmccid { }; From b0e6c66ad7532a0ec2983c92035b6f8a559f9f2e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 May 2013 17:46:07 -0400 Subject: [PATCH 051/193] nodejs: Update to v0.10.8 I removed darwin-specific bits, as I can't test them right now. If it's broken, let me know and I'll fix on darwin. Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/default.nix | 61 ++++++++----------- .../development/web/nodejs/no-arch-flag.patch | 21 ------- 2 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/web/nodejs/no-arch-flag.patch diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f9c3d9d27d3..f3025c97f16 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,54 +1,45 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares }: -stdenv.mkDerivation rec { - version = "0.8.23"; +let + version = "0.10.8"; + + # !!! Should we also do shared libuv? + deps = { + inherit v8 openssl zlib; + cares = c-ares; + http-parser = http_parser; + }; + + sharedConfigureFlags = name: [ + "--shared-${name}" + "--shared-${name}-includes=${builtins.getAttr name deps}/include" + "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + ]; + + inherit (stdenv.lib) concatMap optional maintainers licenses platforms; +in stdenv.mkDerivation { name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17gdvv0q95v5dn9mbwrm3pxcchfgmlwa7pamwsam9hpdi9ik491q"; + sha256 = "0m43y7ipd6d89dl97nvrwkx1zss3fdb9835509dyziycr1kggxpd"; }; - configureFlags = [ - "--openssl-includes=${openssl}/include" - "--openssl-libpath=${openssl}/lib" - ] - ++ (if !stdenv.isDarwin then [ # Shared V8 is broken on Mac OS X. Who can fix V8 on Darwin makes me very happy, but I gave up studying python-gyp. - "--shared-v8" - "--shared-v8-includes=${v8}/includes" - "--shared-v8-libpath=${v8}/lib" - ] else []); - - #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; - - # Expose the host compiler on darwin, which is the only compiler capable of building it - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export OLDPATH=$PATH - export PATH=/usr/bin:$PATH - ''; + configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - export PATH=$OLDPATH - '' + '' - sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js - '' /*+ stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node - ''*/; - - buildInputs = [ python openssl zlib ] - ++ stdenv.lib.optional stdenv.isLinux utillinux - ++ stdenv.lib.optional (!stdenv.isDarwin) v8; + buildInputs = [ python ] + ++ optional stdenv.isLinux utillinux; setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = http://nodejs.org; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.goibhniu maintainers.shlevy ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/web/nodejs/no-arch-flag.patch b/pkgs/development/web/nodejs/no-arch-flag.patch deleted file mode 100644 index bbe96c0c552..00000000000 --- a/pkgs/development/web/nodejs/no-arch-flag.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur node-v0.6.10-orig/wscript node-v0.6.10/wscript ---- node-v0.6.10-orig/wscript 2012-02-02 19:56:42.000000000 -0500 -+++ node-v0.6.10/wscript 2012-02-25 14:18:50.000000000 -0500 -@@ -443,17 +443,6 @@ - if sys.platform.startswith("darwin"): - # used by platform_darwin_*.cc - conf.env.append_value('LINKFLAGS', ['-framework','Carbon']) -- # cross compile for architecture specified by DEST_CPU -- if 'DEST_CPU' in conf.env: -- arch = conf.env['DEST_CPU'] -- # map supported_archs to GCC names: -- arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'} -- if arch in arch_mappings: -- arch = arch_mappings[arch] -- flags = ['-arch', arch] -- conf.env.append_value('CCFLAGS', flags) -- conf.env.append_value('CXXFLAGS', flags) -- conf.env.append_value('LINKFLAGS', flags) - if 'DEST_CPU' in conf.env: - arch = conf.env['DEST_CPU'] - # TODO: -m32 is only available on 64 bit machines, so check host type From 4535c0bbfe187023979cb38c3bf9647139bbf5b3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 May 2013 05:18:08 +0200 Subject: [PATCH 052/193] gajim: Clean up and rewrite package expression. This should clean up the package expression significantly by actually using explicit input attributes and setting PYTHONPATH and GST_PLUGIN_PATH from environment variables in the builder. In addition, this adds a small patch from the upstream Mercurial repository to add an index.theme to the icons, so Gajim is able to load them correctly from the store. With this change, I'm adding myself to the maintainers list as well, because I'm switching over from TKabber to Gajim. Signed-off-by: aszlig --- .../instant-messengers/gajim/default.nix | 101 +++++++++++------- pkgs/top-level/all-packages.nix | 12 +-- 2 files changed, 61 insertions(+), 52 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index bf7b050cd0d..ecd3181134f 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,54 +1,73 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk +, pyopenssl, pythonDBus, pythonPackages + +, enableJingle ? true, farstream ? null, gst_plugins_bad ? null +, libnice ? null +, enableE2E ? true +, enableRST ? true +, enableSpelling ? true, gtkspell ? null +}: + +assert enableJingle -> farstream != null && gst_plugins_bad != null + && libnice != null; +assert enableE2E -> pythonPackages.pycrypto != null; +assert enableRST -> pythonPackages.docutils != null; +assert enableSpelling -> gtkspell != null; + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "gajim-${version}"; + version = "0.15.3"; - version = a.lib.attrByPath ["version"] "0.15.3" a; - buildInputs = with a; [ - python pyGtkGlade gtk perl intltool dbus gettext - pkgconfig makeWrapper libglade pyopenssl libXScrnSaver - libXt xproto libXext xextproto libX11 gtkspell aspell - scrnsaverproto pycrypto pythonDBus pythonSexy - docutils pyasn1 farstream gst_plugins_bad gstreamer - gst_ffmpeg gst_python - ]; -in -rec { src = fetchurl { url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; sha256 = "139yl7v1i6g9q66fdmzw0x7hhp7c4x44n4l8hl9g6m9zig5v3s28"; }; - inherit buildInputs; - configureFlags = []; + patches = singleton (fetchurl { + name = "gajim-icon-index.patch"; + url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; + sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; + }); - preConfigure = a.fullDepEntry ('' - export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" - export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" - sed -e '/-L[$]x_libraries/d' -i configure - sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py - '') ["addInputs" "doUnpack"]; + postPatch = '' + sed -i -e '0,/^[^#]/ { + /^[^#]/i export \\\ + PYTHONPATH="'"$PYTHONPATH\''${PYTHONPATH:+:}\$PYTHONPATH"'" \\\ + GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${"" + }$GST_PLUGIN_PATH"'" + }' scripts/gajim.in - fixScriptNames = a.fullDepEntry ('' - mkdir "$out"/bin-wrapped - for i in "$out"/bin/.*-wrapped; do - name="$i" - name="''${name%-wrapped}" - name="''${name##*/.}" - mv "$i" "$out/bin-wrapped/$name" - sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" - sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" - sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" - sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim" - done - '') ["wrapBinContentsPython"]; + sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ + src/features_window.py + sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py + '' + optionalString enableSpelling '' + sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ + src/gtkspell.py + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" - "wrapBinContentsPython" "fixScriptNames"]; + buildInputs = [ + python intltool pkgconfig libX11 + pythonPackages.pygobject pythonPackages.pyGtkGlade + pythonPackages.sqlite3 pythonPackages.pyasn1 + pythonPackages.pyxdg + pyopenssl pythonDBus + ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] + ++ optional enableE2E pythonPackages.pycrypto + ++ optional enableRST pythonPackages.docutils; + + postInstall = '' + install -m 644 -t "$out/share/gajim/icons/hicolor" \ + "icons/hicolor/index.theme" + ''; + + enableParallelBuilding = true; - name = "gajim-" + version; meta = { - description = "Jabber client with meta-contacts"; - maintainers = [a.lib.maintainers.raskin]; + homepage = "http://gajim.org/"; + description = "Jabber client written in PyGTK"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raskin maintainers.aszlig ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41ffa073a0a..2e6e5aafce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9075,17 +9075,7 @@ let freestyle = callPackage ../misc/freestyle { }; - gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { - inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject - pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; - dbus = dbus.libs; - inherit (gnome) libglade; - inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 - scrnsaverproto; - inherit (pythonPackages) pyasn1; - python = pythonFull; - }; + gajim = callPackage ../applications/networking/instant-messengers/gajim { }; gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; From d7380bcdc721ff50a44d03107c314e08a8c7e545 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 May 2013 18:28:35 +0200 Subject: [PATCH 053/193] gajim: Update gajim to version 0.15.4. This fixes the following bugs: * traceback on decryption of OpenPGP-encrypted messages * remote_control: use GED in send_chat_message * gajim-0.15.3 can't connect to server without StartTLS support * "make check" fails with complaining on src/command_system/mapping.py * Account Wizard: Make text selectable * Gajim crashes in connect.py Overview and details: https://trac.gajim.org/query?status=closed&milestone=0.15.4 Signed-off-by: aszlig --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ecd3181134f..7bb5207bb3d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -18,11 +18,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.15.3"; + version = "0.15.4"; src = fetchurl { url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; - sha256 = "139yl7v1i6g9q66fdmzw0x7hhp7c4x44n4l8hl9g6m9zig5v3s28"; + sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; }; patches = singleton (fetchurl { From bdeee9bcc4b34de7d6592738d86bc1cfd79bd8a9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 May 2013 20:44:31 +0200 Subject: [PATCH 054/193] chromium: Fix installing logo images. Actually a "*[0-9]" wildcard isn't enough for some unrelated icons to slip into the derivation output, so let's explicitely check again within the for loop. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5be67c888d9..33140c481f4 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -206,6 +206,7 @@ in stdenv.mkDerivation rec { for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do num_and_suffix="''${icon_file##*logo_}" icon_size="''${num_and_suffix%.*}" + expr "$icon_size" : "^[0-9][0-9]*$" || continue logo_output_prefix="$out/share/icons/hicolor" logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" mkdir -vp "$logo_output_path" From e7a57971c19bb66fc5e851f9348aa25a8dc52a5f Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 02:32:33 +0200 Subject: [PATCH 055/193] chromium: Switch build system to ninja. Wanted to do this a long time ago, but never had a reason to do it. But with Chromium 29 having no make target for chrome_sandbox, we now use ninja as well as the official build and most other distributions. The whole build/make flags cruft is now integrated into one buildPhase override and we just call ninja there by exporting the specific variables. And this also makes enableParallelBuilding obsolete, as we use NIX_BUILD_CORES directly now. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 33140c481f4..97dd719e7fc 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, which +{ stdenv, fetchurl, makeWrapper, ninja, which # default dependencies , bzip2, flac, speex @@ -165,28 +165,21 @@ in stdenv.mkDerivation rec { target_arch = "ia32"; }); - enableParallelBuilding = true; - configurePhase = '' - python build/gyp_chromium --depth "$(pwd)" ${gypFlags} + GYP_GENERATORS=ninja python build/gyp_chromium --depth "$(pwd)" ${gypFlags} ''; - makeFlags = let + buildPhase = let CC = "${gcc}/bin/gcc"; CXX = "${gcc}/bin/g++"; - in [ - "CC=${CC}" - "CXX=${CXX}" - "CC.host=${CC}" - "CXX.host=${CXX}" - "LINK.host=${CXX}" - ]; - - buildFlags = [ - "BUILDTYPE=${buildType}" - "library=shared_library" - "chrome" - ] ++ optional (!enableSELinux) "chrome_sandbox"; + in '' + CC="${CC}" CC_host="${CC}" \ + CXX="${CXX}" CXX_host="${CXX}" \ + LINK_host="${CXX}" \ + "${ninja}/bin/ninja" -C "out/${buildType}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + chrome ${optionalString (!enableSELinux) "chrome_sandbox"} + ''; installPhase = '' mkdir -vp "${libExecPath}" From f966e5268f9a59e2fed965be7690371e4890c620 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 05:00:06 +0200 Subject: [PATCH 056/193] chromium: Update all channels to latest versions. This brings in Chromium 27 as the new stable version. Specific versions of the updated channels: stable: 26.0.1410.63 -> 27.0.1453.93 (builds fine, tested) beta: 27.0.1453.81 -> 28.0.1500.20 (builds fine, tested) dev: 28.0.1500.11 -> 29.0.1516.3 (builds fine, tested) We now can finally drop the following patches: * glibc-2.16-use-siginfo_t.patch * pulseaudio_array_bounds.patch These were for version 26 only and thus are no longer needed. In addition, we no longer have to use the pre/post attributes, as there is just _one_ place that uses version specific stuff (path to webcore.gyp). Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 21 ++++----------- .../chromium/glibc-2.16-use-siginfo_t.patch | 27 ------------------- .../chromium/pulseaudio_array_bounds.patch | 12 --------- .../networking/browsers/chromium/sources.nix | 18 ++++++------- 4 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 97dd719e7fc..b0dc8721747 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,12 +12,9 @@ , utillinux, alsaLib , gcc, bison, gperf , glib, gtk, dbus_glib -, libXScrnSaver, libXcursor, mesa +, libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage -# dependencies for >= v27 -, libXtst - # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -81,11 +78,6 @@ let libusb1 libexif ]; - pre27 = versionOlder sourceInfo.version "27.0.0.0"; - pre28 = versionOlder sourceInfo.version "28.0.0.0"; - post26 = !pre27; - post27 = !pre28; - # build paths and release info packageName = "chromium"; buildType = "Release"; @@ -112,23 +104,20 @@ in stdenv.mkDerivation rec { gcc bison gperf krb5 glib gtk dbus_glib - libXScrnSaver libXcursor mesa + libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt - ++ optional pulseSupport pulseaudio - ++ optional post26 libXtst; + ++ optional pulseSupport pulseaudio; opensslPatches = optional useOpenSSL openssl.patches; prePatch = "patchShebangs ."; patches = [ ./sandbox_userns.patch ] - ++ optional cupsSupport ./cups_allow_deprecated.patch - ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch - ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch; + ++ optional cupsSupport ./cups_allow_deprecated.patch; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi @@ -136,7 +125,7 @@ in stdenv.mkDerivation rec { cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/${if post27 + third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0" then "core/core.gypi" else "WebCore/WebCore.gyp/WebCore.gyp"} ''; diff --git a/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch b/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch deleted file mode 100644 index d06555dda54..00000000000 --- a/pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig 2012-12-22 16:01:44.000000000 +0200 -+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-12-23 21:53:26.746069153 +0200 -@@ -250,7 +250,7 @@ - struct kernel_old_sigaction { - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_mask; - unsigned long sa_flags; -@@ -287,13 +287,13 @@ - unsigned long sa_flags; - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - struct kernel_sigset_t sa_mask; - #else - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_flags; - void (*sa_restorer)(void); diff --git a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch b/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch deleted file mode 100644 index ca78b6959c0..00000000000 --- a/pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/media/media.gyp b/media/media.gyp -index 2a8c6c6..66ca767 100644 ---- a/media/media.gyp -+++ b/media/media.gyp -@@ -399,6 +399,7 @@ - ['use_pulseaudio == 1', { - 'cflags': [ - ' Date: Mon, 27 May 2013 07:57:08 +0200 Subject: [PATCH 057/193] ldns: Update to 1.6.16 and enable drill. Drill is a lightweight DNS lookup command using ldns, which we are going to use in Gajim, to avoid a dependency on bind. Signed-off-by: aszlig --- pkgs/development/libraries/ldns/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index a357fccca16..8479551d28d 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, openssl, perl}: -stdenv.mkDerivation { - name = "ldns-1.6.11"; +stdenv.mkDerivation rec { + name = "ldns-1.6.16"; + src = fetchurl { - url = "http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz"; - sha256 = "1248c9gkgfmjdmpp3lfd56vvln94ii54kbxa5iykxvcxivmbi4b8"; + url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz"; + sha256 = "15gn9m95r6sq2n55dw4r87p2aljb5lvy1w0y0br70wbr0p5zkci4"; }; patchPhase = '' @@ -13,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ openssl perl ]; - configureFlags = [ "--with-ssl=${openssl}" ]; + configureFlags = [ "--with-ssl=${openssl}" "--with-drill" ]; meta = { description = "Library with the aim of simplifying DNS programming in C"; From bdedaae691dcf0661595fc1fe10dd7ae5972bf6b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 07:42:38 +0200 Subject: [PATCH 058/193] gajim: Enable SRV support using drill from ldns. Use a patch from Arch Linux to use drill instead of nslookup. The primary reason for this is because nslookup is in bind, and we don't want to depend on the whole bind package just for the sake of supporting SRV lookups. Signed-off-by: aszlig --- .../instant-messengers/gajim/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7bb5207bb3d..c8c3f3b7d2a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, pyopenssl, pythonDBus, pythonPackages +, ldns, pyopenssl, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -25,11 +25,19 @@ stdenv.mkDerivation rec { sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g"; }; - patches = singleton (fetchurl { - name = "gajim-icon-index.patch"; - url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; - sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; - }); + patches = [ + (fetchurl { + name = "gajim-drill-srv.patch"; + url = "https://projects.archlinux.org/svntogit/packages.git/" + + "plain/trunk/gajim-drill.patch?h=packages/gajim"; + sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w"; + }) + (fetchurl { + name = "gajim-icon-index.patch"; + url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb"; + sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv"; + }) + ]; postPatch = '' sed -i -e '0,/^[^#]/ { From f273e7629e5b1ce047418359a61efe90fae88b81 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 09:36:13 +0200 Subject: [PATCH 059/193] gajim: Add support for LaTeX markup. This needed a bit of patching the paths to the latex and dvipng executables. In addition, we also address a small bug by using sed: tmpfd, tmppng = mkstemp(prefix='gajim_tex', suffix='.png') tmpfd.close() This obviously won't work, because mkstemp() actually returns a file descriptor _number_ and not a Python file object. Signed-off-by: aszlig --- .../networking/instant-messengers/gajim/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index c8c3f3b7d2a..3c3cc5ccdfc 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -6,6 +6,7 @@ , enableE2E ? true , enableRST ? true , enableSpelling ? true, gtkspell ? null +, enableLaTeX ? false, texLive ? null }: assert enableJingle -> farstream != null && gst_plugins_bad != null @@ -13,6 +14,7 @@ assert enableJingle -> farstream != null && gst_plugins_bad != null assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; assert enableSpelling -> gtkspell != null; +assert enableLaTeX -> texLive != null; with stdenv.lib; @@ -53,6 +55,11 @@ stdenv.mkDerivation rec { '' + optionalString enableSpelling '' sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ src/gtkspell.py + '' + optionalString enableLaTeX '' + sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \ + -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|" \ + -e 's/tmpfd.close()/os.close(tmpfd)/' \ + src/common/latex.py ''; buildInputs = [ @@ -63,7 +70,8 @@ stdenv.mkDerivation rec { pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto - ++ optional enableRST pythonPackages.docutils; + ++ optional enableRST pythonPackages.docutils + ++ optional enableLaTeX texLive; postInstall = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \ From f4174f7df657800a2c450693f952869d7f58d074 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 10:05:15 +0200 Subject: [PATCH 060/193] python-notify: Fix build. There is no new upstream version available and the latest upstream release is still using calls to prehistoric versions of libnotify. Most other distro have patched this already, so no need to patch again. Patch is from Fedora (which is the most referenced source seen so far). Additionally the configure script cannot find the correct path to the codegen executable, so we're patching it accordingly as well. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 076e8a8d9b9..03bb433ae9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2672,6 +2672,18 @@ pythonPackages = python.modules // rec { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; + patches = pkgs.lib.singleton (fetchurl { + name = "libnotify07.patch"; + url = "http://pkgs.fedoraproject.org/cgit/notify-python.git/plain/" + + "libnotify07.patch?id2=289573d50ae4838a1658d573d2c9f4c75e86db0c"; + sha256 = "1lqdli13mfb59xxbq4rbq1f0znh6xr17ljjhwmzqb79jl3dig12z"; + }); + + postPatch = '' + sed -i -e '/^PYGTK_CODEGEN/s|=.*|="${pygtk}/bin/pygtk-codegen-2.0"|' \ + configure + ''; + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; From 2ad7c40a6699c7ea611654588f8db9efe9d35937 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 May 2013 10:09:24 +0200 Subject: [PATCH 061/193] gajim: Optional support for notifications. Actually, Gajim can use notifications through dbus if notification-daemon is available. Otherwise it falls back to notify-python, which is why I disabled it by default, especially because upstream support of that Python library isn't especially awesome ;-) Signed-off-by: aszlig --- .../networking/instant-messengers/gajim/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3c3cc5ccdfc..d5902d14359 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -6,6 +6,7 @@ , enableE2E ? true , enableRST ? true , enableSpelling ? true, gtkspell ? null +, enableNotifications ? false , enableLaTeX ? false, texLive ? null }: @@ -14,6 +15,7 @@ assert enableJingle -> farstream != null && gst_plugins_bad != null assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; assert enableSpelling -> gtkspell != null; +assert enableNotifications -> pythonPackages.notify != null; assert enableLaTeX -> texLive != null; with stdenv.lib; @@ -71,6 +73,7 @@ stdenv.mkDerivation rec { ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils + ++ optional enableNotifications pythonPackages.notify ++ optional enableLaTeX texLive; postInstall = '' From 8ca0c05859401e9859c3039af4f9051fa273bf25 Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Mon, 27 May 2013 11:28:00 +0200 Subject: [PATCH 062/193] Upgraded Redis version --- pkgs/servers/nosql/redis/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 1992164b3d1..777fb31ac97 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "redis-2.6.9"; + name = "redis-2.6.13"; src = fetchurl { url = "http://redis.googlecode.com/files/${name}.tar.gz"; - sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd"; + sha256 = "0j79a5vmdy0c1df89ymqk37kz8q2iqlzg81qwnz0djjqdiikk51v"; }; makeFlags = "PREFIX=$(out)"; @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://redis.io; description = "An open source, advanced key-value store"; license = "BSD"; - platforms = stdenv.lib.platforms.unix; }; } From 601e9dfd947e7f1cdb4989c60d3749ea968277d9 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 27 May 2013 12:10:19 +0200 Subject: [PATCH 063/193] Add vboot_reference: tools needed for installing custom OS on Chromebooks --- pkgs/tools/system/vboot_reference/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/system/vboot_reference/default.nix diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix new file mode 100644 index 00000000000..257a4ec4fd0 --- /dev/null +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, pkgconfig, libuuid, openssl }: + +let + arch = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "x86" + else throw "vboot_reference for: ${stdenv.system} not supported!"; + + version = "20130507"; + checkout = "25/50225/2"; +in stdenv.mkDerivation { + name = "vboot_reference-${version}"; + + src = fetchgit { + url = "http://git.chromium.org/git/chromiumos/platform/vboot_reference.git"; + rev = "refs/changes/${checkout}"; + sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; + }; + + buildInputs = [ pkgconfig openssl + (stdenv.lib.overrideDerivation libuuid + (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]; + + buildPhase = '' + make ARCH=${arch} `pwd`/build/cgpt/cgpt + make ARCH=${arch} `pwd`/build/utility/vbutil_kernel + make ARCH=${arch} `pwd`/build/utility/vbutil_key + make ARCH=${arch} `pwd`/build/utility/vbutil_keyblock + make ARCH=${arch} `pwd`/build/utility/vbutil_firmware + ''; + + installPhase = '' + ensureDir $out/bin + cp build/cgpt/cgpt $out/bin + cp build/utility/vbutil_kernel $out/bin + cp build/utility/vbutil_key $out/bin + cp build/utility/vbutil_keyblock $out/bin + cp build/utility/vbutil_firmware $out/bin + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e6e5aafce9..57dbbb0ec3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1748,6 +1748,8 @@ let vde2 = callPackage ../tools/networking/vde2 { }; + vboot_reference = callPackage ../tools/system/vboot_reference { }; + verilog = callPackage ../applications/science/electronics/verilog {}; vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; From d73c8ed79d95a007f6a9f92721c366382ca0bf49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 27 May 2013 18:29:08 +0200 Subject: [PATCH 064/193] Revert "Merge pull request #555 from errge/master" This reverts commit 8f7cfc0c7370e2b46a7692cc953ff7a43411d5d6, reversing changes made to cc85ad4b1c365533049ec4af7adee0fe7c83c7b8. The merge changed stdenv (a bit surprisingly, see #555 for details). --- pkgs/development/libraries/ncurses/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index d6d19b4a5c5..569d7fe2a32 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (rec { ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5 fi done; - ln -svf . $out/include/ncursesw '' else ""; meta = { From 296d11a0fb2cf9ce9d7cbb73b99c5d7d75f3a92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 May 2013 23:32:08 +0200 Subject: [PATCH 065/193] Updating libgpg-error (required for libgcrypt-git) --- pkgs/development/libraries/libgpg-error/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index f7052b90b42..eafa857598c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bash }: stdenv.mkDerivation (rec { - name = "libgpg-error-1.10"; + name = "libgpg-error-1.11"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0cal3jdnzdailr13qcy74grfbplbghkgr3qwk6qjjp4bass2j1jj"; + sha1 = "be209b013652add5c7e2c473ea114f58203cc6cd"; }; doCheck = true; From 7d9acc0866f90b041875cf71e68eafb34ce25dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 May 2013 23:32:21 +0200 Subject: [PATCH 066/193] libgcrypt: update to 1.5.2. Newer is better. --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d705bd80bdc..0438816b1b4 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation rec { - name = "libgcrypt-1.5.0"; + name = "libgcrypt-1.5.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1ykkh7dm0gyndz7bbpvn3agijj8xb2h02m02f42hm504c18zqqjb"; + sha1 = "c9998383532ba3e8bcaf690f2f0d65e814b48d2f"; }; propagatedBuildInputs = [ libgpgerror ]; From 42701dece8db489fadee3f83657841815f8f6ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 May 2013 23:33:51 +0200 Subject: [PATCH 067/193] Adding gnunet-svn and libgcrypt-git. gnunet-svn can't interoperate with gnunet. --- .../networking/p2p/gnunet/svn.nix | 89 +++++++++++++++++++ pkgs/development/libraries/libgcrypt/git.nix | 48 ++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 3 files changed, 143 insertions(+) create mode 100644 pkgs/applications/networking/p2p/gnunet/svn.nix create mode 100644 pkgs/development/libraries/libgcrypt/git.nix diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix new file mode 100644 index 00000000000..9335778d3d2 --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, libunistring, libidn +, makeWrapper, autoconf, automake }: + +let + rev = "27314"; +in +stdenv.mkDerivation rec { + name = "gnunet-svn-${rev}"; + + src = fetchsvn { + url = https://gnunet.org/svn/gnunet; + sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq"; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses libidn + pkgconfig gettext libunistring makeWrapper + autoconf automake + ]; + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\/127.0.0.1/g' + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + patchShebangs src/gns/nss/install-nss-plugin.sh + + sh contrib/pogen.sh + sh bootstrap + ''; + + doCheck = false; + + /* FIXME: Tests must be run this way, but there are still a couple of + failures. + + postInstall = + '' export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; + */ + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = http://gnunet.org/; + + license = "GPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ ludo viric ]; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/development/libraries/libgcrypt/git.nix b/pkgs/development/libraries/libgcrypt/git.nix new file mode 100644 index 00000000000..bf917464343 --- /dev/null +++ b/pkgs/development/libraries/libgcrypt/git.nix @@ -0,0 +1,48 @@ +{ fetchgit, stdenv, libgpgerror, autoconf, automake, libtool, transfig, ghostscript, texinfo }: + +stdenv.mkDerivation rec { + name = "libgcrypt-git-20130524"; + + src = fetchgit { + url = git://git.gnupg.org/libgcrypt.git; + rev = "99b18aa53"; + sha256 = "1rhbpxqrkfszlv8jvw8s4apwklal07k8zxv5q555l7binc1j1j3z"; + }; + + nativeBuildInputs = [ autoconf automake libtool transfig ghostscript texinfo ]; + + propagatedBuildInputs = [ libgpgerror ]; + + preConfigure = '' + sh autogen.sh + ''; + + preBuild = '' + (cd doc; make stamp-vti) + ''; + + doCheck = true; + + # For some reason the tests don't find `libgpg-error.so'. + checkPhase = '' + LD_LIBRARY_PATH="${libgpgerror}/lib:$LD_LIBRARY_PATH" \ + make check + ''; + + meta = { + description = "GNU Libgcrypt, a general-pupose cryptographic library"; + + longDescription = '' + GNU Libgcrypt is a general purpose cryptographic library based on + the code from GnuPG. It provides functions for all + cryptographic building blocks: symmetric ciphers, hash + algorithms, MACs, public key algorithms, large integer + functions, random numbers and a lot of supporting functions. + ''; + + license = "LGPLv2+"; + + homepage = https://www.gnu.org/software/libgcrypt/; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57dbbb0ec3c..19de3664b81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4339,6 +4339,8 @@ let libgcrypt = callPackage ../development/libraries/libgcrypt { }; + libgcrypt_git = lowPrio (callPackage ../development/libraries/libgcrypt/git.nix { }); + libgdiplus = callPackage ../development/libraries/libgdiplus { }; libgpgerror = callPackage ../development/libraries/libgpg-error { }; @@ -7293,6 +7295,10 @@ let gnunet = callPackage ../applications/networking/p2p/gnunet { }; + gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { + libgcrypt = libgcrypt_git; + }); + gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { From bb66651d681a513230d12677c54626684dba3bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 May 2013 23:35:02 +0200 Subject: [PATCH 068/193] gnunet: removing 0.8 I don't think anyone uses it. Feel free to revert, otherwise. --- .../networking/p2p/gnunet/0.8.nix | 85 ------------------- pkgs/top-level/all-packages.nix | 6 -- 2 files changed, 91 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/gnunet/0.8.nix diff --git a/pkgs/applications/networking/p2p/gnunet/0.8.nix b/pkgs/applications/networking/p2p/gnunet/0.8.nix deleted file mode 100644 index 586146bdd9d..00000000000 --- a/pkgs/applications/networking/p2p/gnunet/0.8.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, findutils -, gtkSupport ? false, gtk ? null, libglade ? null -, makeWrapper }: - -assert gtkSupport -> (gtk != null) && (libglade != null); - -let version = "0.8.1b"; -in - stdenv.mkDerivation { - name = "gnunet-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz"; - sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib guile adns sqlite libxml2 ncurses - pkgconfig gettext findutils - makeWrapper - ] ++ (if gtkSupport then [ gtk libglade ] else []); - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l localhost {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - substituteInPlace "$i" --replace "localhost" "127.0.0.1" - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - ''; - - doCheck = false; - - # 1. Run tests have once GNUnet is installed. - # 2. Help programs find the numerous modules that sit under - # `$out/lib/GNUnet'. - - # FIXME: `src/transports/test_udp' hangs forever. - postInstall = '' - #GNUNET_PREFIX="$out" make check - wrapProgram "$out/bin/gnunetd" \ - --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet" - ''; - - meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = http://gnunet.org/; - - license = "GPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19de3664b81..66139e41681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7287,12 +7287,6 @@ let inherit (gnome) libglade scrollkeeper; }; - gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { - inherit (gnome) libglade; - guile = guile_1_8; - gtkSupport = config.gnunet.gtkSupport or true; - }; - gnunet = callPackage ../applications/networking/p2p/gnunet { }; gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { From 29b6370b0c4678ea8ae8413001d9a2911594886e Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 27 May 2013 23:36:43 +0200 Subject: [PATCH 069/193] Fix vboot_reference's libuuid overriding to work on systems wo libuuid --- pkgs/tools/system/vboot_reference/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 257a4ec4fd0..4c3c58b35cd 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -16,9 +16,11 @@ in stdenv.mkDerivation { sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; }; - buildInputs = [ pkgconfig openssl - (stdenv.lib.overrideDerivation libuuid - (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]; + buildInputs = [ pkgconfig openssl ] ++ + (if libuuid == null + then [] + else [ (stdenv.lib.overrideDerivation libuuid + (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]); buildPhase = '' make ARCH=${arch} `pwd`/build/cgpt/cgpt From 2f1ab6b21b391a7cf80eb305e20c3ca58fc4084b Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 28 May 2013 00:50:05 +0200 Subject: [PATCH 070/193] Update bittorrent-sync to 1.0.134 --- pkgs/applications/networking/bittorrentsync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 91afc98bd4a..842dd8a8826 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -14,9 +14,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - version = "1.0.132"; - sha256 = if stdenv.system == "x86_64-linux" then "04mwzpbibzzbl384ziq07g7xxbc1rb5lyxgc7g8m1x5fvc6g1dk6" - else if stdenv.system == "i686-linux" then "0yz1y761gx612lczlqjc3wddnw73qf4b8rna9hmfzan7ikqb81z0" + version = "1.0.134"; + sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7" + else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From 239d53209542f4ca8e94ade11c30a396655bcb58 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 May 2013 22:29:00 -0400 Subject: [PATCH 071/193] node-packages.nix: Convert to new npm2nix style Starting with 1.0.0 (which is not released at the time of this commit but will be before it is pushed), npm2nix takes a JSON file with a list of names (and optionally version ranges) and generates a data-only (no functions, no rec, no let, etc.) nix expression representing the packages with those names and their dependencies. node-packages.nix now builds its package list from that generated expression. If a package needs native dependencies as build inputs, they can be added to the nativeDeps attribute set. If a package cannot be generated by npm2nix for some reason, it can be added manually to the set. I tried to capture the packages represented by the previous node-packages.nix in the new node-packages.json, but I almost certainly missed some that will have to be added manually. Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 1883 +++++++++++++++++++ pkgs/top-level/node-packages.json | 34 + pkgs/top-level/node-packages.nix | 1961 +------------------- 3 files changed, 1958 insertions(+), 1920 deletions(-) create mode 100644 pkgs/top-level/node-packages-generated.nix create mode 100644 pkgs/top-level/node-packages.json diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix new file mode 100644 index 00000000000..26d79d3f1f0 --- /dev/null +++ b/pkgs/top-level/node-packages-generated.nix @@ -0,0 +1,1883 @@ +[ + { + baseName = "abbrev"; + version = "1.0.4"; + fullName = "abbrev-1"; + hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "amdefine"; + version = "0.0.5"; + fullName = "amdefine-*"; + hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "amdefine"; + version = "0.0.5"; + fullName = "amdefine->=0.0.4"; + hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ansi"; + version = "0.1.2"; + fullName = "ansi-~0.1.2"; + hash = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "asn1"; + version = "0.1.11"; + fullName = "asn1-0.1.11"; + hash = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "assert"; + version = "0.4.9"; + fullName = "assert-*"; + hash = "976a12385f7286d123734fabc7355bbeecd2532daccfada02909818b905abeeb"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "util"; range = ">= 0.4.9"; } + ]; + } + { + baseName = "assert-plus"; + version = "0.1.2"; + fullName = "assert-plus-0.1.2"; + hash = "bd62e853460024d1e35d3f76065f4c856a271e55ef1ce684f3033314b7377c61"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.8"; + fullName = "async-*"; + hash = "45d7c5ef1b87dc183b9265b882ae3fb2c20608832adc3234b766717016be2346"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.8"; + fullName = "async-~0.2.7"; + hash = "45d7c5ef1b87dc183b9265b882ae3fb2c20608832adc3234b766717016be2346"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "aws-sdk"; + version = "1.1.0"; + fullName = "aws-sdk-*"; + hash = "124577c90a78db03356b9e13e704f55b774ac165ba67d539a3d2170ae02fb32d"; + patchLatest = true; + topLevel = true; + dependencies = [ + { name = "xml2js"; range = "0.2.4"; } + { name = "xmlbuilder"; range = "*"; } + ]; + } + { + baseName = "aws-sdk"; + version = "0.9.7-pre.8"; + fullName = "aws-sdk-0.9.7-pre.8"; + hash = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422"; + patchLatest = true; + topLevel = false; + dependencies = [ + { name = "xml2js"; range = "0.2.4"; } + { name = "xmlbuilder"; range = "*"; } + ]; + } + { + baseName = "aws-sign"; + version = "0.3.0"; + fullName = "aws-sign-~0.3.0"; + hash = "5acca27ed2b1b9f081e4dd230e03808b6a038f8a4afa698db985320efe6dda5e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "backbone"; + version = "1.0.0"; + fullName = "backbone-*"; + hash = "6c66edc5134bb531b33a7f140c75c4a65cdc21711eed64c29300a84cba84f3a7"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "underscore"; range = ">=1.4.3"; } + ]; + } + { + baseName = "backoff"; + version = "2.1.0"; + fullName = "backoff-2.1.0"; + hash = "d1f5bf32f2f5954f6259582ead30fc8a769db35bac9900c94593b77f915cee0d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "block-stream"; + version = "0.0.6"; + fullName = "block-stream-*"; + hash = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "boom"; + version = "0.4.2"; + fullName = "boom-0.4.x"; + hash = "294e022990269e7fa1e3015862d2d24847cc83c3e68d214dad5a2d0d3826a08f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.9.x"; } + ]; + } + { + baseName = "browserchannel"; + version = "1.0.4"; + fullName = "browserchannel-*"; + hash = "516add6af10f887500c5eaae7347ce92c0101a6bea1a67d5221a674d07bc7999"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "hat"; range = "*"; } + { name = "connect"; range = "~2"; } + { name = "request"; range = "~2"; } + ]; + } + { + baseName = "buffer-crc32"; + version = "0.2.1"; + fullName = "buffer-crc32-0.2.1"; + hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "buffertools"; + version = "1.1.1"; + fullName = "buffertools-*"; + hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "bunyan"; + version = "0.21.1"; + fullName = "bunyan-0.21.1"; + hash = "95dca2405dcbe5b700e15d7c89b2a64fb21a097fb7ada5c274979f2057adcbef"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mv"; range = "0.0.5"; } + { name = "dtrace-provider"; range = "0.2.8"; } + ]; + } + { + baseName = "bytes"; + version = "0.2.0"; + fullName = "bytes-0.2.0"; + hash = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "clone"; + version = "0.1.5"; + fullName = "clone-0.1.5"; + hash = "9fd586470ccc3fa585dcccad730b5e6fa9c471b49acdb38d724c110777a287d9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "clone"; + version = "0.1.6"; + fullName = "clone-0.1.6"; + hash = "9849c9faa2549d982106d3b43862dc4ceb308563badcd3ff59e30655d54e897a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "coffee-script"; + version = "1.6.2"; + fullName = "coffee-script-*"; + hash = "92785ad77e5d689fc7bfc62f3b519e65b77509457dda7a332ee1efd6cf9f08d6"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "combined-stream"; + version = "0.0.4"; + fullName = "combined-stream-~0.0.4"; + hash = "2502ed7a4406db1a65b09cae3106221051d6af20d3f1d7e8cc38cfc72a36432c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "delayed-stream"; range = "0.0.5"; } + ]; + } + { + baseName = "commander"; + version = "0.5.1"; + fullName = "commander-0.5.1"; + hash = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "commander"; + version = "0.6.1"; + fullName = "commander-0.6.1"; + hash = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "connect"; + version = "2.7.10"; + fullName = "connect-2.7.10"; + hash = "b1d9cf6b2932578618537a95471f9c0ae451e2ed8033647e420b4c67b1d28b3d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.6.5"; } + { name = "formidable"; range = "1.0.14"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "cookie"; range = "0.0.5"; } + { name = "send"; range = "0.1.0"; } + { name = "bytes"; range = "0.2.0"; } + { name = "fresh"; range = "0.1.0"; } + { name = "pause"; range = "0.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "connect"; + version = "2.7.10"; + fullName = "connect-~2"; + hash = "b1d9cf6b2932578618537a95471f9c0ae451e2ed8033647e420b4c67b1d28b3d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.6.5"; } + { name = "formidable"; range = "1.0.14"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "cookie"; range = "0.0.5"; } + { name = "send"; range = "0.1.0"; } + { name = "bytes"; range = "0.2.0"; } + { name = "fresh"; range = "0.1.0"; } + { name = "pause"; range = "0.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "cookie"; + version = "0.0.5"; + fullName = "cookie-0.0.5"; + hash = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie"; + version = "0.1.0"; + fullName = "cookie-0.1.0"; + hash = "aff5d22a617d744319cc70e42fc4ab11bcbcf924244af565495fa799c0639650"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie-jar"; + version = "0.3.0"; + fullName = "cookie-jar-~0.3.0"; + hash = "c7bac7739b9ceb194f431a4a9ac1a0ba4ffd4a60492c61dd1925dbcdb9030746"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cookie-signature"; + version = "1.0.1"; + fullName = "cookie-signature-1.0.1"; + hash = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cryptiles"; + version = "0.2.1"; + fullName = "cryptiles-0.2.x"; + hash = "a7ad8087bf6abbbfa0ae159756c04326a490f373212f6f2fd0f3a1f63f475892"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "boom"; range = "0.4.x"; } + ]; + } + { + baseName = "ctype"; + version = "0.5.0"; + fullName = "ctype-0.5.0"; + hash = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ctype"; + version = "0.5.2"; + fullName = "ctype-0.5.2"; + hash = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "debug"; + version = "0.7.2"; + fullName = "debug-*"; + hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "debug"; + version = "0.7.2"; + fullName = "debug-~0.7.0"; + hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "deep-equal"; + version = "0.0.0"; + fullName = "deep-equal-0.0.0"; + hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "delayed-stream"; + version = "0.0.5"; + fullName = "delayed-stream-0.0.5"; + hash = "f40e440dac0f853577d5225d7bd4b2026ea1447a724f4ba1096e29983ee595dd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "diff"; + version = "1.0.2"; + fullName = "diff-1.0.2"; + hash = "5de1d8c3f2bfc447a7e664cadd4aca2ef4952a43256310cc51a36b30b5be3045"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "dtrace-provider"; + version = "0.2.8"; + fullName = "dtrace-provider-0.2.8"; + hash = "200941239983fa0953415cf28e96d9347c50218d31280604cfc9252e448e714c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "escape-html"; + version = "0.0.1"; + fullName = "escape-html-*"; + hash = "03c24a492f80659c25f788809ae64277408a4c12594cff62f89db4b3259c6b58"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "events.node"; + version = "0.4.9"; + fullName = "events.node->= 0.4.0"; + hash = "aedaf9faa7a33f16e2bf1754ed988a836570d00064748a8c1c8ee48805b9f0b6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "express"; + version = "3.2.5"; + fullName = "express-*"; + hash = "f09dce2d0610795af88fe903242557526be269f27912b63309e3b3329218e20b"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "connect"; range = "2.7.10"; } + { name = "commander"; range = "0.6.1"; } + { name = "range-parser"; range = "0.0.4"; } + { name = "mkdirp"; range = "0.3.4"; } + { name = "cookie"; range = "0.1.0"; } + { name = "buffer-crc32"; range = "0.2.1"; } + { name = "fresh"; range = "0.1.0"; } + { name = "methods"; range = "0.0.1"; } + { name = "send"; range = "0.1.0"; } + { name = "cookie-signature"; range = "1.0.1"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "extend"; + version = "1.1.3"; + fullName = "extend-*"; + hash = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "extsprintf"; + version = "1.0.0"; + fullName = "extsprintf-1.0.0"; + hash = "9cae7f1f192e5f35746e13047ab4c13e8b5b686469feeaec301ba7d370df5670"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "extsprintf"; + version = "1.0.2"; + fullName = "extsprintf-1.0.2"; + hash = "ea000cf3e51cba7fac7fb1e425ddb79bf46f3ce40955955bf35fd487184a04ab"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "faye-websocket"; + version = "0.6.0"; + fullName = "faye-websocket-*"; + hash = "192f09ecd1c52fc357d2ad3ae3121be35556b7b09e30ce74117d80b9dbae3f60"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "websocket-driver"; range = ">=0.2.0"; } + ]; + } + { + baseName = "faye-websocket"; + version = "0.4.4"; + fullName = "faye-websocket-0.4.4"; + hash = "c682f6269bcaba0667ef4ae0ecb0b662e35ea6338b075e25ebce9e13019bc3a2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "forever-agent"; + version = "0.5.0"; + fullName = "forever-agent-~0.5.0"; + hash = "0a7eda1f87f3cfa7fad8ba655a642992033b38a1929becfa0bfcab8241b7d78b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "form-data"; + version = "0.0.8"; + fullName = "form-data-0.0.8"; + hash = "cf7d5669259ec4c5474b9c2100127ba065a4757ff33b878a1d99509b8e448220"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "combined-stream"; range = "~0.0.4"; } + { name = "mime"; range = "~1.2.2"; } + { name = "async"; range = "~0.2.7"; } + ]; + } + { + baseName = "form-data"; + version = "0.0.10"; + fullName = "form-data-~0.0.3"; + hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "combined-stream"; range = "~0.0.4"; } + { name = "mime"; range = "~1.2.2"; } + { name = "async"; range = "~0.2.7"; } + ]; + } + { + baseName = "formidable"; + version = "1.0.13"; + fullName = "formidable-1.0.13"; + hash = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "formidable"; + version = "1.0.14"; + fullName = "formidable-1.0.14"; + hash = "b36e58f659fd0d7c734b4ab2c611fa6e40bd988c2237a29d25025460f18f7ea1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "fresh"; + version = "0.1.0"; + fullName = "fresh-0.1.0"; + hash = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "fstream"; + version = "0.1.22"; + fullName = "fstream-0"; + hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "fstream"; + version = "0.1.22"; + fullName = "fstream-~0.1.8"; + hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob-3"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob-3.2.1"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-1"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-~1"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.1"; + fullName = "graceful-fs-~1.2.0"; + hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "growl"; + version = "1.7.0"; + fullName = "growl-1.7.x"; + hash = "52a6e9edae2fd5a66ddb87c52a398a17ee697eb0e8e1480e9506a6dcdbf3ffcf"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hat"; + version = "0.0.3"; + fullName = "hat-*"; + hash = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hawk"; + version = "0.13.1"; + fullName = "hawk-~0.13.0"; + hash = "659e5ada1e9dc44a634e07899937d5eaeaa1c06658f181ca187f7f6faa0c592a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.8.x"; } + { name = "boom"; range = "0.4.x"; } + { name = "cryptiles"; range = "0.2.x"; } + { name = "sntp"; range = "0.2.x"; } + ]; + } + { + baseName = "hoek"; + version = "0.8.5"; + fullName = "hoek-0.8.x"; + hash = "637e524cd4b48b66db137d6fa93cbe254f112ce638ea9fd399bab73591ede965"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "hoek"; + version = "0.9.1"; + fullName = "hoek-0.9.x"; + hash = "34480468d2e85781ecdd7134523b4d6fea978d333edd2bcb828edd33bbbe8a3f"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "htdigest"; + version = "1.0.7"; + fullName = "htdigest-1.0.7"; + hash = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.5.1"; } + ]; + } + { + baseName = "htpasswd"; + version = "1.1.0"; + fullName = "htpasswd-1.1.0"; + hash = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.5.1"; } + ]; + } + { + baseName = "http-auth"; + version = "1.2.7"; + fullName = "http-auth-1.2.7"; + hash = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "node-uuid"; range = "1.2.0"; } + { name = "htpasswd"; range = "1.1.0"; } + { name = "htdigest"; range = "1.0.7"; } + ]; + } + { + baseName = "http-signature"; + version = "0.9.11"; + fullName = "http-signature-0.9.11"; + hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "asn1"; range = "0.1.11"; } + { name = "ctype"; range = "0.5.2"; } + ]; + } + { + baseName = "http-signature"; + version = "0.9.11"; + fullName = "http-signature-~0.9.11"; + hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "asn1"; range = "0.1.11"; } + { name = "ctype"; range = "0.5.2"; } + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-1"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-1.x"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "inherits"; + version = "1.0.0"; + fullName = "inherits-~1.0.0"; + hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "jade"; + version = "0.26.3"; + fullName = "jade-0.26.3"; + hash = "ea314287eb192b6987f7bb9d7010bf2c35ff6288f125fa00796ad93bdba14d0b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.6.1"; } + { name = "mkdirp"; range = "0.3.0"; } + ]; + } + { + baseName = "jayschema"; + version = "0.1.5"; + fullName = "jayschema-*"; + hash = "66e17d82f0b24d882321d42da2f094ab2b14df8a3f558b88867800e672f5c80d"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "json-schema"; + version = "0.2.2"; + fullName = "json-schema-0.2.2"; + hash = "41b873a8fb542caf337ec17ad5593761e8db5ce8e33f4074b733b34ec656f0e8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "json-stringify-safe"; + version = "4.0.0"; + fullName = "json-stringify-safe-~4.0.0"; + hash = "2461befc8dab37d1d83927ab4bf4aa68b162a35b5a85c1a90c70f86500091b60"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "jsontool"; + version = "5.1.3"; + fullName = "jsontool-*"; + hash = "097889f294920e43c2a8f8d9156971860c67c61ecfe5a1e411c4d641e521985c"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "jsprim"; + version = "0.3.0"; + fullName = "jsprim-0.3.0"; + hash = "0fd12872374ee55cc0c005a1590ef65def0e96de04734a753e0d1480c3ffc4bd"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + { name = "json-schema"; range = "0.2.2"; } + { name = "verror"; range = "1.3.3"; } + ]; + } + { + baseName = "keep-alive-agent"; + version = "0.0.1"; + fullName = "keep-alive-agent-0.0.1"; + hash = "481f10eeb5b9759ad28d9556f30c1747a5e71fbbad55fb130b96eacc7ac1c7a1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "knox"; + version = "0.8.2"; + fullName = "knox-*"; + hash = "e4842cb834f27dc859fc6ab2389f7d0702f6cc6ecff469b89729dd33c33c0afd"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "mime"; range = "*"; } + { name = "xml2js"; range = "0.2.x"; } + { name = "debug"; range = "~0.7.0"; } + { name = "stream-counter"; range = "~0.1.0"; } + ]; + } + { + baseName = "lru-cache"; + version = "2.3.0"; + fullName = "lru-cache-2"; + hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "lru-cache"; + version = "2.2.0"; + fullName = "lru-cache-2.2.0"; + hash = "bdfb66f74cc4097f3bfd6062b2edbb7790d709f414c7d0f3419241840b1bffed"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "lru-cache"; + version = "2.3.0"; + fullName = "lru-cache-2.3.0"; + hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "methods"; + version = "0.0.1"; + fullName = "methods-0.0.1"; + hash = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-*"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.6"; + fullName = "mime-1.2.6"; + hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-1.2.9"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.2"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.7"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.9"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-0"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-~0.2.11"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0.3"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.0"; + fullName = "mkdirp-0.3.0"; + hash = "708366e3a89c976ae8418056f2c5f784147b9310e8093f9bb7246d2f55f7c27d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.3"; + fullName = "mkdirp-0.3.3"; + hash = "b67a12855b7522c3cfb767e36b95f4eaaf9d423c5bd01f7f0449172259957df9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.4"; + fullName = "mkdirp-0.3.4"; + hash = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mocha"; + version = "1.10.0"; + fullName = "mocha-*"; + hash = "d19c4fdcddb6498d0f303c3e5fd85401888a269f36ccdfcc92763dcc9e80bf97"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "commander"; range = "0.6.1"; } + { name = "growl"; range = "1.7.x"; } + { name = "jade"; range = "0.26.3"; } + { name = "diff"; range = "1.0.2"; } + { name = "debug"; range = "*"; } + { name = "mkdirp"; range = "0.3.3"; } + { name = "ms"; range = "0.3.0"; } + { name = "glob"; range = "3.2.1"; } + ]; + } + { + baseName = "ms"; + version = "0.3.0"; + fullName = "ms-0.3.0"; + hash = "f72eab0186a6dabbbea7118f83d4e2c01119e427f6671096a0c7ed522abe07f2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mv"; + version = "0.0.5"; + fullName = "mv-0.0.5"; + hash = "6ddbf4770ffd02170a8fc492cee418ad92ce2f1e2eb4c549febac1f60e6533b9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "negotiator"; + version = "0.2.5"; + fullName = "negotiator-0.2.5"; + hash = "37f567acba03ef7748802c4f6b41ca7e57a3fb556c4435cda515028c73d76542"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "nijs"; + version = "0.0.5"; + fullName = "nijs-*"; + hash = "c5e9f93f240757e1ab2d0ad341384db6e0b73ab2616ae9832d1ed772eaebd408"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "optparse"; range = ">= 1.0.3"; } + ]; + } + { + baseName = "node-expat"; + version = "2.0.0"; + fullName = "node-expat-*"; + hash = "9d5b7efd708fc546f5c17e98f4ee322abafaaa02fbb6c281f651d10d9523c83f"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "node-gyp"; + version = "0.9.6"; + fullName = "node-gyp-*"; + hash = "937090ffd7de10079861ef562d0282dd4100873aa7bba7de9cd6ea7982b41b0b"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "glob"; range = "3"; } + { name = "graceful-fs"; range = "1"; } + { name = "fstream"; range = "0"; } + { name = "minimatch"; range = "0"; } + { name = "mkdirp"; range = "0"; } + { name = "nopt"; range = "2"; } + { name = "npmlog"; range = "0"; } + { name = "osenv"; range = "0"; } + { name = "request"; range = ">= 2 && <= 2.14"; } + { name = "rimraf"; range = "2"; } + { name = "semver"; range = "1"; } + { name = "tar"; range = "0"; } + { name = "which"; range = "1"; } + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-*"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.2.0"; + fullName = "node-uuid-1.2.0"; + hash = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.3.3"; + fullName = "node-uuid-1.3.3"; + hash = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-1.4.0"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "node-uuid"; + version = "1.4.0"; + fullName = "node-uuid-~1.4.0"; + hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "nopt"; + version = "2.1.1"; + fullName = "nopt-2"; + hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "abbrev"; range = "1"; } + ]; + } + { + baseName = "nopt"; + version = "2.0.0"; + fullName = "nopt-2.0.0"; + hash = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "abbrev"; range = "1"; } + ]; + } + { + baseName = "npmlog"; + version = "0.0.2"; + fullName = "npmlog-0"; + hash = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ansi"; range = "~0.1.2"; } + ]; + } + { + baseName = "oauth-sign"; + version = "0.3.0"; + fullName = "oauth-sign-~0.3.0"; + hash = "a202acb9ea84ef53e6a82a6ee5113328cd4bfd68d6ba04d15f1da933660b087e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "once"; + version = "1.1.1"; + fullName = "once-1.1.1"; + hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "optimist"; + version = "0.5.0"; + fullName = "optimist-*"; + hash = "b0c4b65a456618f179946e0b0641643b9d70ea5d884afa5bbf94419f740b1ccf"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } + { + baseName = "optparse"; + version = "1.0.4"; + fullName = "optparse-*"; + hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "optparse"; + version = "1.0.4"; + fullName = "optparse->= 1.0.3"; + hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "osenv"; + version = "0.0.3"; + fullName = "osenv-0"; + hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "pause"; + version = "0.0.1"; + fullName = "pause-0.0.1"; + hash = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "posix-getopt"; + version = "1.0.0"; + fullName = "posix-getopt-1.0.0"; + hash = "134cea188854422ab047db9ebfcb7e2610f0a239fe27382b55c10894c4f5ba9d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.5.5"; + fullName = "qs-0.5.5"; + hash = "8ed820b83bf4aff299422dc406c7a52793e05f510803cc1cc2da7de1528837f1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.6.5"; + fullName = "qs-0.6.5"; + hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "qs"; + version = "0.6.5"; + fullName = "qs-~0.6.0"; + hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "range-parser"; + version = "0.0.4"; + fullName = "range-parser-0.0.4"; + hash = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "rbytes"; + version = "0.0.2"; + fullName = "rbytes-*"; + hash = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "readable-stream"; + version = "1.0.2"; + fullName = "readable-stream-~1.0.2"; + hash = "45a918b25f0799f87d7144dbbb7d2b5974dc079fcb1a2149a305d080f1155754"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "request"; + version = "2.12.0"; + fullName = "request->= 2 && <= 2.14"; + hash = "a26790d2179da11a644d5deaa2ae5d37472bf0e73355fde02ea5923106308997"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "form-data"; range = "~0.0.3"; } + { name = "mime"; range = "~1.2.7"; } + ]; + } + { + baseName = "request"; + version = "2.21.0"; + fullName = "request-~2"; + hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "~0.6.0"; } + { name = "json-stringify-safe"; range = "~4.0.0"; } + { name = "forever-agent"; range = "~0.5.0"; } + { name = "tunnel-agent"; range = "~0.3.0"; } + { name = "http-signature"; range = "~0.9.11"; } + { name = "hawk"; range = "~0.13.0"; } + { name = "aws-sign"; range = "~0.3.0"; } + { name = "oauth-sign"; range = "~0.3.0"; } + { name = "cookie-jar"; range = "~0.3.0"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "mime"; range = "~1.2.9"; } + { name = "form-data"; range = "0.0.8"; } + ]; + } + { + baseName = "restify"; + version = "2.4.1"; + fullName = "restify-2.4.1"; + hash = "b46ed86ef17f1896a4dd961de8cc8ec96b57b7f44ef7421f3804764289f5b563"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "backoff"; range = "2.1.0"; } + { name = "bunyan"; range = "0.21.1"; } + { name = "deep-equal"; range = "0.0.0"; } + { name = "formidable"; range = "1.0.13"; } + { name = "http-signature"; range = "0.9.11"; } + { name = "keep-alive-agent"; range = "0.0.1"; } + { name = "lru-cache"; range = "2.3.0"; } + { name = "mime"; range = "1.2.9"; } + { name = "negotiator"; range = "0.2.5"; } + { name = "node-uuid"; range = "1.4.0"; } + { name = "once"; range = "1.1.1"; } + { name = "qs"; range = "0.5.5"; } + { name = "semver"; range = "1.1.4"; } + { name = "spdy"; range = "1.7.1"; } + { name = "verror"; range = "1.3.6"; } + { name = "dtrace-provider"; range = "0.2.8"; } + ]; + } + { + baseName = "rimraf"; + version = "2.1.4"; + fullName = "rimraf-2"; + hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "~1"; } + ]; + } + { + baseName = "s3http"; + version = "0.0.1"; + fullName = "s3http-*"; + hash = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "aws-sdk"; range = "0.9.7-pre.8"; } + { name = "commander"; range = "0.5.1"; } + { name = "http-auth"; range = "1.2.7"; } + ]; + } + { + baseName = "sax"; + version = "0.5.2"; + fullName = "sax-0.5.2"; + hash = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "sax"; + version = "0.5.4"; + fullName = "sax->=0.4.2"; + hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-*"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-1"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "1.1.4"; + fullName = "semver-1.1.4"; + hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "send"; + version = "0.1.0"; + fullName = "send-0.1.0"; + hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "debug"; range = "*"; } + { name = "mime"; range = "1.2.6"; } + { name = "fresh"; range = "0.1.0"; } + { name = "range-parser"; range = "0.0.4"; } + ]; + } + { + baseName = "sigmund"; + version = "1.0.0"; + fullName = "sigmund-~1.0.0"; + hash = "ddf823295db284ac4720b9d40f381d7375dc0b05881b98269346b33fe9835e25"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "smartdc"; + version = "7.0.0-rc2"; + fullName = "smartdc-*"; + hash = "239433d13dbbfd6461cf34743d628bdb39d061ca562e15901528acc52dda8d46"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "lru-cache"; range = "2.2.0"; } + { name = "nopt"; range = "2.0.0"; } + { name = "restify"; range = "2.4.1"; } + { name = "bunyan"; range = "0.21.1"; } + { name = "clone"; range = "0.1.6"; } + { name = "smartdc-auth"; range = "1.0.0"; } + ]; + } + { + baseName = "smartdc-auth"; + version = "1.0.0"; + fullName = "smartdc-auth-1.0.0"; + hash = "7611510ac66507398f6e371b25068c7ad193ecd69a3031fdfca0e3c652cfdcbf"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "clone"; range = "0.1.5"; } + { name = "ssh-agent"; range = "0.2.1"; } + { name = "once"; range = "1.1.1"; } + { name = "vasync"; range = "1.3.3"; } + ]; + } + { + baseName = "sntp"; + version = "0.2.4"; + fullName = "sntp-0.2.x"; + hash = "1f91a8d60fd48751e4b169885f530012ce2a8223ed29006abcee175f2b10d779"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.9.x"; } + ]; + } + { + baseName = "sockjs"; + version = "0.3.7"; + fullName = "sockjs-*"; + hash = "711a6c41e6a7b2a9cd0dc44abc7407f09729d400be450d94887391997b07a1a5"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "node-uuid"; range = "1.3.3"; } + { name = "faye-websocket"; range = "0.4.4"; } + ]; + } + { + baseName = "source-map"; + version = "0.1.22"; + fullName = "source-map-*"; + hash = "6ebe1b2b3c730e5e206a34a25192aa43307b84dfe3aaaafd71c5c6b6a02a4700"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "amdefine"; range = ">=0.0.4"; } + ]; + } + { + baseName = "spdy"; + version = "1.7.1"; + fullName = "spdy-1.7.1"; + hash = "d90516bb6b6cf39fb52face8ec332be98de116ce84d7d400fbb19529a30fa678"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "ssh-agent"; + version = "0.2.1"; + fullName = "ssh-agent-0.2.1"; + hash = "b420d5816d4a8a242a8d1454f064954eab8fec9856310e867a2e7f1b2432f934"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ctype"; range = "0.5.0"; } + { name = "posix-getopt"; range = "1.0.0"; } + ]; + } + { + baseName = "stream-counter"; + version = "0.1.0"; + fullName = "stream-counter-~0.1.0"; + hash = "8c51bd894bf905ec607654a1d7d3fe4fdc4763ccec4d37723cb8d0a0fd7cb69c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "readable-stream"; range = "~1.0.2"; } + ]; + } + { + baseName = "swig"; + version = "0.13.5"; + fullName = "swig-*"; + hash = "d1cc435c623829e5672df45c14a878304a41bec2b2c6b2a13bb956aeed22d1c9"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "underscore"; range = ">=1.1.7"; } + ]; + } + { + baseName = "tar"; + version = "0.1.17"; + fullName = "tar-0"; + hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "inherits"; range = "1.x"; } + { name = "block-stream"; range = "*"; } + { name = "fstream"; range = "~0.1.8"; } + ]; + } + { + baseName = "temp"; + version = "0.5.0"; + fullName = "temp-*"; + hash = "082285c060c7519b9d8a6dbc1a51e3caa7de43a807d3f7cec4eab220ad1207be"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "tunnel-agent"; + version = "0.3.0"; + fullName = "tunnel-agent-~0.3.0"; + hash = "5b23c1d29e85143e213ba5aca118419ab42d25774da92e816074a73f423bcabd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore-*"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore->=1.1.7"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore->=1.4.3"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "util"; + version = "0.4.9"; + fullName = "util->= 0.4.9"; + hash = "30ecc26c9e749650562c1ef20bc3f1a0d8d7c109134b510be34526d1ceae90e5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "events.node"; range = ">= 0.4.0"; } + ]; + } + { + baseName = "vasync"; + version = "1.3.3"; + fullName = "vasync-1.3.3"; + hash = "603d15b81e25b6a634d7ff2025487b3460a60d0d7e1a1ed02e66faff5ef7b699"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "jsprim"; range = "0.3.0"; } + { name = "verror"; range = "1.1.0"; } + ]; + } + { + baseName = "verror"; + version = "1.1.0"; + fullName = "verror-1.1.0"; + hash = "ac0fc2dfbcdfc3440c281cf272d902ec74bf2abdf2f9c9eb5c0c3505dc6646d7"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + ]; + } + { + baseName = "verror"; + version = "1.3.3"; + fullName = "verror-1.3.3"; + hash = "9b3e9307cb5a788c1a4c6706ed32582893ffcd64dc55a14a153be1ea15bb916a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.0"; } + ]; + } + { + baseName = "verror"; + version = "1.3.6"; + fullName = "verror-1.3.6"; + hash = "96135dd5fef7b75bfe26513658ca3fc1ab38e17a9bec522fc5ec6e54b6b63f89"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "extsprintf"; range = "1.0.2"; } + ]; + } + { + baseName = "websocket-driver"; + version = "0.2.1"; + fullName = "websocket-driver->=0.2.0"; + hash = "8aab2b32695fecd2bca57d95bc51f0eb8a9a5bb298187a8fe3a84cd2cd8e3dc7"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "which"; + version = "1.0.5"; + fullName = "which-1"; + hash = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "wordwrap"; + version = "0.0.2"; + fullName = "wordwrap-~0.0.2"; + hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "wu"; + version = "0.1.8"; + fullName = "wu-*"; + hash = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "xml2js"; + version = "0.2.4"; + fullName = "xml2js-0.2.4"; + hash = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sax"; range = ">=0.4.2"; } + ]; + } + { + baseName = "xml2js"; + version = "0.2.7"; + fullName = "xml2js-0.2.x"; + hash = "ab3ae8402a8af36d93e1aa6e83102e365b82f03e605d1b8b8361dacc95e52397"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sax"; range = "0.5.2"; } + ]; + } + { + baseName = "xmlbuilder"; + version = "0.4.2"; + fullName = "xmlbuilder-*"; + hash = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } +] diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json new file mode 100644 index 00000000000..17f4cee6943 --- /dev/null +++ b/pkgs/top-level/node-packages.json @@ -0,0 +1,34 @@ +[ + { "name": "async" } +, { "name": "assert" } +, { "name": "mocha" } +, { "name": "jayschema" } +, { "name": "underscore" } +, { "name": "extend" } +, { "name": "express" } +, { "name": "s3http" } +, { "name": "aws-sdk" } +, { "name": "nijs" } +, { "name": "amdefine" } +, { "name": "smartdc" } +, { "name": "optparse" } +, { "name": "jsontool" } +, { "name": "swig" } +, { "name": "coffee-script" } +, { "name": "escape-html" } +, { "name": "buffertools" } +, { "name": "wu" } +, { "name": "source-map" } +, { "name": "knox" } +, { "name": "node-expat" } +, { "name": "optimist" } +, { "name": "temp" } +, { "name": "faye-websocket" } +, { "name": "node-uuid" } +, { "name": "rbytes" } +, { "name": "sockjs" } +, { "name": "backbone" } +, { "name": "browserchannel" } +, { "name": "node-gyp" } +, { "name": "semver" } +] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 48ce273c46b..ad26f96cbae 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,1923 +1,44 @@ { pkgs, stdenv, nodejs, fetchurl, neededNatives }: -let self = { - buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs neededNatives; - inherit (pkgs) runCommand; - }; - - patchLatest = srcAttrs: - let src = fetchurl srcAttrs; in - pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - tar xf ${src} - mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json - tar cf $out * - ''; - - "abbrev" = self."abbrev-1"; - - "abbrev-1" = self.buildNodePackage rec { - name = "abbrev-1.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; - sha256 = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; - }; - deps = [ - - ]; - }; - - "active-x-obfuscator" = self."active-x-obfuscator-0.0.1"; - - "active-x-obfuscator-0.0.1" = self.buildNodePackage rec { - name = "active-x-obfuscator-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz"; - sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6"; - }; - deps = [ - self."zeparser-0.0.5" - ]; - }; - - amdefine = "amdefine-0.0.4"; - - "amdefine->=0.0.4" = self."amdefine-0.0.4"; - - "amdefine-0.0.4" = self.buildNodePackage rec { - name = "amdefine-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/${name}.tgz"; - sha256 = "10sdb85mb6fvkglqwg7icdh58sng9pm8655npmsbv18gsbcnmbg4"; - }; - deps = [ - - ]; - }; - - "ansi" = self."ansi-~0.1.2"; - - "ansi-~0.1.2" = self.buildNodePackage rec { - name = "ansi-0.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; - sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; - }; - deps = [ - - ]; - }; - - "asn1" = self."asn1-0.1.11"; - - "asn1-0.1.11" = self.buildNodePackage rec { - name = "asn1-0.1.11"; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/${name}.tgz"; - sha256 = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43"; - }; - deps = [ - - ]; - }; - - "assert" = self."assert-0.4.9"; - - "assert-0.4.9" = self.buildNodePackage rec { - name = "assert-0.4.9"; - src = fetchurl { - url = "http://registry.npmjs.org/assert/-/${name}.tgz"; - sha256 = "1sxyba88p08956havkxc5m9x5v5ybcswgasgfcix31kjbww14slp"; - }; - deps = [ - self."util" - ]; - }; - - "async" = self."async-0.2.8"; - - "async-0.1.22" = self.buildNodePackage rec { - name = "async-0.1.22"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/${name}.tgz"; - sha256 = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18"; - }; - deps = [ - - ]; - }; - - "async-0.2.8" = self.buildNodePackage rec { - name = "async-0.2.8"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/${name}.tgz"; - sha256 = "0ii3pqb70wb6nws35p1ahc40dhmj7yp85f35j8xiip473gpwbms5"; - }; - deps = [ - - ]; - }; - - "aws-sdk" = self."aws-sdk-*"; - - "aws-sdk-git" = self.buildNodePackage rec { - name = "aws-sdk-0.9.8-pre7b687a0c262ac129fd6eaffeb02de09ee7e6a87c"; - src = self.patchLatest { - url = "https://github.com/aws/aws-sdk-js/archive/7b687a0c262ac129fd6eaffeb02de09ee7e6a87c.tar.gz"; - sha256 = "1pn43wxi3xz4kjyxf8j7zil5frhd1zpqja8szamgll2pxxnpnr3i"; - name = "${name}.tgz"; - }; - deps = [ - self."xml2js-0.2.4" - self."xmlbuilder" - ]; - }; - - "aws-sdk-*" = self.buildNodePackage rec { - name = "aws-sdk-0.9.7-pre.8"; - src = self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/${name}.tgz"; - sha256 = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422"; - }; - deps = [ - self."xml2js-0.2.4" - self."xmlbuilder" - ]; - }; - - "backbone" = self."backbone-0.9.2"; - - "backbone-0.9.2" = self.buildNodePackage rec { - name = "backbone-0.9.2"; - src = fetchurl { - url = "http://registry.npmjs.org/backbone/-/${name}.tgz"; - sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32"; - }; - deps = [ - self."underscore->=1.3.1" - ]; - }; - - "bindings" = self."bindings-1"; - - "bindings-1" = self.buildNodePackage rec { - name = "bindings-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/${name}.tgz"; - sha256 = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed"; - }; - deps = [ - - ]; - }; - - "block-stream" = self."block-stream-*"; - - "block-stream-*" = self.buildNodePackage rec { - name = "block-stream-0.0.6"; - src = fetchurl { - url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; - sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; - }; - deps = [ - self."inherits-~1.0.0" - ]; - }; - - "browserchannel" = self."browserchannel-0.4.1"; - - "browserchannel-0.4.1" = self.buildNodePackage rec { - name = "browserchannel-0.4.1"; - src = fetchurl { - url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz"; - sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f"; - }; - deps = [ - self."coffee-script-~1" - self."hat" - self."connect-~1.7" - self."timerstub" - self."request-~2" - ]; - }; - - "bson" = self."bson-0.1.5"; - - "bson-0.1.5" = self.buildNodePackage rec { - name = "bson-0.1.5"; - src = fetchurl { - url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "58af4a1697b015190b40c2a7e5743f9d4494887ef98dfe2f58f24c70f2d31150"; - }; - deps = [ - - ]; - }; - - "buffer-crc32" = self."buffer-crc32-0.2.1"; - - "buffer-crc32-0.2.1" = self.buildNodePackage rec { - name = "buffer-crc32-0.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/${name}.tgz"; - sha256 = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; - }; - deps = [ - - ]; - }; - - "buffertools" = self."buffertools-~1"; - - "buffertools-~1" = self.buildNodePackage rec { - name = "buffertools-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/buffertools/-/${name}.tgz"; - sha256 = "a0520dbf39eedbd8c685ac4989bf822ac57cc161924abf82ba567234620380a5"; - }; - deps = [ - - ]; - }; - - "bunyan" = self."bunyan-0.8.0"; - - "bunyan-0.8.0" = self.buildNodePackage rec { - name = "bunyan-0.8.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan/-/${name}.tgz"; - sha256 = "059b8948dd34d371d39aa87227d26d62180c365afeb6625c07187c8f0ad29f27"; - }; - deps = [ - - ]; - }; - - "byline" = self."byline-2.0.2"; - - "byline-2.0.2" = self.buildNodePackage rec { - name = "byline-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/byline/-/${name}.tgz"; - sha256 = "a916ffde5ee385f7d682c13028907a96fe33cdeed6d72cea903d09fb154dae50"; - }; - deps = [ - - ]; - }; - - "bytes" = self."bytes-0.2.0"; - - "bytes-0.2.0" = self.buildNodePackage rec { - name = "bytes-0.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; - sha256 = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; - }; - deps = [ - - ]; - }; - - "bytes-0.1.0" = self.buildNodePackage rec { - name = "bytes-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; - sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701"; - }; - deps = [ - - ]; - }; - - "cipher-block-size" = self."cipher-block-size-0.0.0"; - - "cipher-block-size-0.0.0" = self.buildNodePackage rec { - name = "cipher-block-size-0.0.0"; - src = fetchurl { - url = https://bitbucket.org/shlevy/node-cipher-block-size/get/0.0.0.tar.gz; - sha256 = "0j4i19ckb9ab9aqd4w3j0vrvcw7c6icq279x4fx8xs1h9massxng"; - name = "${name}.tgz"; - }; - deps = [ - self."bindings-1" - ]; - buildInputs = [ - pkgs.openssl - ]; - }; - - "coffee-script" = self."coffee-script-1.4.0"; - "coffee-script-~1" = self."coffee-script-1.4.0"; - - "coffee-script-~1.1.2" = self.buildNodePackage rec { - name = "coffee-script-1.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87"; - }; - deps = [ - - ]; - }; - - "coffee-script-1.3.3" = self.buildNodePackage rec { - name = "coffee-script-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; - }; - deps = [ - - ]; - }; - - "coffee-script-1.4.0" = self.buildNodePackage rec { - name = "coffee-script-1.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "146e8985d89210b63dae83378fd851ccf54d38d7d11cadcdca01520d50882613"; - }; - deps = [ - - ]; - }; - - "commander" = self."commander-~0.6.1"; - - "commander-0.5.1" = self.buildNodePackage rec { - name = "commander-0.5.1"; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/${name}.tgz"; - sha256 = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924"; - }; - deps = [ - - ]; - }; - - "commander-~0.6.1" = self.buildNodePackage rec { - name = "commander-0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/${name}.tgz"; - sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; - }; - deps = [ - - ]; - }; - - "connect" = self."connect-2.7.7"; - - "connect-2.7.7" = self.buildNodePackage rec { - name = "connect-2.7.7"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "e4cf5b03c051d9b4b0e27a76ec76da0b8ca38d0e4ce1d8ba8c4c3b3caac7b032"; - }; - deps = [ - self."qs-0.6.1" - self."formidable-1.0.13" - self."cookie-signature-1.0.1" - self."buffer-crc32-0.2.1" - self."cookie-0.0.5" - self."send-0.1.0" - self."bytes-0.2.0" - self."fresh-0.1.0" - self."pause-0.0.1" - self."debug" - ]; - }; - - "connect-~1.7" = self.buildNodePackage rec { - name = "connect-1.7.3"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12"; - }; - deps = [ - self."qs->= 0.3.1" - self."mime->= 0.0.1" - ]; - }; - - "connect-2.4.4" = self.buildNodePackage rec { - name = "connect-2.4.4"; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/${name}.tgz"; - sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9"; - }; - deps = [ - self."qs-0.4.2" - self."formidable-1.0.11" - self."crc-0.2.0" - self."cookie-0.0.4" - self."bytes-0.1.0" - self."send-0.0.4" - self."fresh-0.1.0" - self."pause-0.0.1" - self."debug" - ]; - }; - - "cookie" = self."cookie-0.0.5"; - - "cookie-0.0.5" = self.buildNodePackage rec { - name = "cookie-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; - sha256 = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; - }; - deps = [ - - ]; - }; - - "cookie-0.0.4" = self.buildNodePackage rec { - name = "cookie-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; - sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b"; - }; - deps = [ - - ]; - }; - - "cookie-signature" = self."cookie-signature-1.0.1"; - - "cookie-signature-1.0.1" = self.buildNodePackage rec { - name = "cookie-signature-1.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/${name}.tgz"; - sha256 = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; - }; - deps = [ - - ]; - }; - - "crc" = self."crc-0.2.0"; - - "crc-0.2.0" = self.buildNodePackage rec { - name = "crc-0.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/crc/-/${name}.tgz"; - sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d"; - }; - deps = [ - - ]; - }; - - "cssmin" = self."cssmin-0.3.1"; - - "cssmin-0.3.1" = self.buildNodePackage rec { - name = "cssmin-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/cssmin/-/${name}.tgz"; - sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102"; - }; - deps = [ - - ]; - }; - - "ctype" = self."ctype->=0.0.2"; - - "ctype->=0.0.2" = self.buildNodePackage rec { - name = "ctype-0.5.2"; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/${name}.tgz"; - sha256 = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60"; - }; - deps = [ - - ]; - }; - - "ctype-0.5.0" = self.buildNodePackage rec { - name = "ctype-0.5.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/${name}.tgz"; - sha256 = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378"; - }; - deps = [ - - ]; - }; - - "datetime" = self."datetime-0.0.3"; - - "datetime-0.0.3" = self.buildNodePackage rec { - name = "datetime-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/datetime/-/${name}.tgz"; - sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0"; - }; - deps = [ - self."vows->=0.5.4" - ]; - }; - - "debug" = self."debug-*"; - - "debug-*" = self.buildNodePackage rec { - name = "debug-0.7.2"; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/${name}.tgz"; - sha256 = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; - }; - deps = [ - - ]; - }; - - - "diff" = self."diff-~1.0.3"; - - "diff-~1.0.2" = self.buildNodePackage rec { - name = "diff-1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/${name}.tgz"; - sha256 = "0i9hpssk0sx3a7610qr58cm9bx1fr95dvjk4wsklgi5zyb1xiqax"; - }; - deps = [ - - ]; - }; - - "diff-~1.0.3" = self.buildNodePackage rec { - name = "diff-1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/${name}.tgz"; - sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472"; - }; - deps = [ - - ]; - }; - - "dtrace-provider" = self."dtrace-provider-0.0.6"; - - "dtrace-provider-0.0.6" = self.buildNodePackage rec { - name = "dtrace-provider-0.0.6"; - src = fetchurl { - url = "http://registry.npmjs.org/dtrace-provider/-/${name}.tgz"; - sha256 = "ce48363aefa9e8afb3c8e8e5ce8d321a5d5a7eecbb28eaa997c48c5e9d502508"; - }; - deps = [ - - ]; - }; - - "escape-html" = self."escape-html-0.0.1"; - - "escape-html-0.0.1" = self.buildNodePackage rec { - name = "escape-html-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/escape-html/-/${name}.tgz"; - sha256 = "03c24a492f80659c25f788809ae64277408a4c12594cff62f89db4b3259c6b58"; - }; - deps = [ - - ]; - }; - - "events.node" = self."events.node-0.4.9"; - - "events.node-0.4.9" = self.buildNodePackage rec { - name = "events.node-0.4.9"; - src = fetchurl { - url = "http://registry.npmjs.org/events.node/-/${name}.tgz"; - sha256 = "1dphp42qir4f3j68lx3403870rc3iacfsm0ppzi1cgx3lzxgknmf"; - }; - }; - - "express" = self."express-*"; - - "express-*" = self.buildNodePackage rec { - name = "express-3.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/${name}.tgz"; - sha256 = "4ca52cccef971707a368f98c09baced9e06f4013b81c0cbcbf2c57c48982c428"; - }; - deps = [ - self."connect-2.7.7" - self."commander-~0.6.1" - self."range-parser-0.0.4" - self."mkdirp-0.3.4" - self."cookie-0.0.5" - self."buffer-crc32-0.2.1" - self."fresh-0.1.0" - self."methods-0.0.1" - self."send-0.1.0" - self."cookie-signature-1.0.1" - self."debug" - self."qs-0.6.1" - ]; - }; - - "extend" = self."extend-*"; - - "extend-*" = self.buildNodePackage rec { - name = "extend-1.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/${name}.tgz"; - sha256 = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; - }; - deps = [ - - ]; - }; - - "eyes" = self."eyes->=0.1.6"; - - "eyes->=0.1.6" = self.buildNodePackage rec { - name = "eyes-0.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/${name}.tgz"; - sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; - }; - deps = [ - - ]; - }; - - "faye-websocket" = self."faye-websocket-0.4.0"; - - "faye-websocket-0.4.0" = self.buildNodePackage rec { - name = "faye-websocket-0.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/${name}.tgz"; - sha256 = "853b8d2f4611013da89faf45b6c9f6e440ad6c46616e405b8cf59b4302e78e2f"; - }; - deps = [ - - ]; - }; - - "formidable" = self."formidable-1.0.13"; - - "formidable-1.0.13" = self.buildNodePackage rec { - name = "formidable-1.0.13"; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; - sha256 = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; - }; - deps = [ - - ]; - }; - - "formidable-1.0.11" = self.buildNodePackage rec { - name = "formidable-1.0.11"; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; - sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; - }; - deps = [ - - ]; - }; - - "fresh" = self."fresh-0.1.0"; - - "fresh-0.1.0" = self.buildNodePackage rec { - name = "fresh-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/fresh/-/${name}.tgz"; - sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; - }; - deps = [ - - ]; - }; - - "fstream" = self."fstream-0.1.18"; - "fstream-~0.1.8" = self."fstream-0.1.18"; - "fstream-~0.1.13" = self."fstream-0.1.18"; - - "fstream-0.1.18" = self.buildNodePackage rec { - name = "fstream-0.1.18"; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; - }; - deps = [ - self."rimraf-2" - self."mkdirp-0.3.4" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" - ]; - }; - - "glob" = self."glob-3"; - - "glob-3" = self.buildNodePackage rec { - name = "glob-3.1.12"; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/${name}.tgz"; - sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; - }; - deps = [ - self."minimatch-0.2" - self."graceful-fs-~1.1.2" - self."inherits-1" - ]; - }; - - "graceful-fs" = self."graceful-fs-1.1.10"; - "graceful-fs-1" = self."graceful-fs-1.1.10"; - "graceful-fs-~1.1" = self."graceful-fs-1.1.10"; - "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10"; - - "graceful-fs-1.1.10" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "growl" = self."growl-1.7.0"; - - "growl-1.7.0" = self.buildNodePackage rec { - name = "growl-1.7.0"; - src = fetchurl { - url = "http://registry.npmjs.org/growl/-/${name}.tgz"; - sha256 = "1kzzygdxr9h6jl74iqg8n1z6kvhpi8wjmic7vdnsdm9gmvnyk9jj"; - }; - }; - - "hat" = self."hat-0.0.3"; - - "hat-0.0.3" = self.buildNodePackage rec { - name = "hat-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/hat/-/${name}.tgz"; - sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; - }; - deps = [ - - ]; - }; - - "hiredis" = self."hiredis-*"; - - "hiredis-*" = self.buildNodePackage rec { - name = "hiredis-0.1.14"; - src = fetchurl { - url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; - sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; - }; - deps = [ - - ]; - }; - - "htdigest" = self."htdigest-1.0.7"; - - "htdigest-1.0.7" = self.buildNodePackage rec { - name = "htdigest-1.0.7"; - src = fetchurl { - url = "http://registry.npmjs.org/htdigest/-/${name}.tgz"; - sha256 = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58"; - }; - deps = [ - self."commander-0.5.1" - ]; - }; - - "htpasswd" = self."htpasswd-1.1.0"; - - "htpasswd-1.1.0" = self.buildNodePackage rec { - name = "htpasswd-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/htpasswd/-/${name}.tgz"; - sha256 = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9"; - }; - deps = [ - self."commander-0.5.1" - ]; - }; - - "http-auth" = self."http-auth-*"; - - "http-auth-*" = self.buildNodePackage rec { - name = "http-auth-1.2.7"; - src = fetchurl { - url = "http://registry.npmjs.org/http-auth/-/${name}.tgz"; - sha256 = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2"; - }; - deps = [ - self."node-uuid-1.2.0" - self."htpasswd-1.1.0" - self."htdigest-1.0.7" - ]; - }; - - "http-signature" = self."http-signature-0.9.9"; - - "http-signature-0.9.9" = self.buildNodePackage rec { - name = "http-signature-0.9.9"; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/${name}.tgz"; - sha256 = "c1e193f1195028f2cc8a8f402c7755fc215552a81f6bebbdf6f21de9390a438e"; - }; - deps = [ - self."asn1-0.1.11" - self."ctype-0.5.0" - ]; - }; - - "inherits" = self."inherits-1.0.0"; - "inherits-1" = self."inherits-1.0.0"; - "inherits-1.x" = self."inherits-1.0.0"; - "inherits-~1.0.0" = self."inherits-1.0.0"; - - "inherits-1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ - - ]; - }; - - "jade" = self."jade-0.26.3"; - - "jade-0.26.3" = self.buildNodePackage rec { - name = "jade-0.26.3"; - src = fetchurl { - url = "http://registry.npmjs.org/jade/-/${name}.tgz"; - sha256 = "02sdl7dkpnbag40gl9gii1igyd9cpw8717dvyy3njaqrxf3l4cga"; - }; - deps = [ - self."commander-~0.6.1" - self."mkdirp-0.3.0" - ]; - }; - - "jayschema" = self."jayschema-*"; - - "jayschema-*" = self.buildNodePackage rec { - name = "jayschema-0.1.5"; - src = fetchurl { - url = "http://registry.npmjs.org/jayschema/-/${name}.tgz"; - sha256 = "03f8ymrfc03qhs48nm9zibgi8axbjkqa4bfl44iqhkdjy217vqb6"; - }; - }; - - "jsontool" = self."jsontool-*"; - - "jsontool-*" = self.buildNodePackage rec { - name = "jsontool-5.1.1"; - src = fetchurl { - url = "http://registry.npmjs.org/jsontool/-/${name}.tgz"; - sha256 = "f7c12a0de635905f8134dfc8385f237135494d8c99fc0a5f112ee9735c2b6d05"; - }; - deps = [ - - ]; - }; - - "knox" = self."knox-*"; - - "knox-*" = self.buildNodePackage rec { - name = "knox-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/knox/-/${name}.tgz"; - sha256 = "d62623482cc2f8b2fe08ff0c0cf2ed7f35a320e806ebdfa6ac36df5486018517"; - }; - deps = [ - self."mime" - ]; - }; - - "less" = self."less-1.3.0"; - - "less-1.3.0" = self.buildNodePackage rec { - name = "less-1.3.0"; - src = fetchurl { - url = "http://registry.npmjs.org/less/-/${name}.tgz"; - sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b"; - }; - deps = [ - - ]; - }; - - "lru-cache" = self."lru-cache-~2.0.0"; - - "lru-cache-1.1.0" = self.buildNodePackage rec { - name = "lru-cache-1.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "735898f87ba800d6f2f3517ab92b631f03976c9d3fbaedb6ce357cfe3813ee8b"; - }; - deps = [ - - ]; - }; - - "lru-cache-~2.0.0" = self.buildNodePackage rec { - name = "lru-cache-2.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; - }; - deps = [ - - ]; - }; - - "methods" = self."methods-0.0.1"; - - "methods-0.0.1" = self.buildNodePackage rec { - name = "methods-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/methods/-/${name}.tgz"; - sha256 = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; - }; - deps = [ - - ]; - }; - - "mime" = self."mime-*"; - - "mime->= 0.0.1" = self."mime-*"; - - "mime-1.2.5" = self.buildNodePackage rec { - name = "mime-1.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72"; - }; - deps = [ - - ]; - }; - - "mime-1.2.6" = self.buildNodePackage rec { - name = "mime-1.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; - }; - deps = [ - - ]; - }; - - "mime-*" = self.buildNodePackage rec { - name = "mime-1.2.7"; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; - }; - deps = [ - - ]; - }; - - "minimatch" = self."minimatch-0.2"; - - "minimatch-0.2" = self.buildNodePackage rec { - name = "minimatch-0.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; - sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; - }; - deps = [ - self."lru-cache-~2.0.0" - ]; - }; - - "mkdirp" = self."mkdirp-0.3.4"; - - "mkdirp-0.3.0" = self.buildNodePackage rec { - name = "mkdirp-0.3.0"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "0zf2yxajyv94nydky2g8229pn544yz2z4ml087l6m5wwm3ind0vh"; - }; - deps = [ - - ]; - }; - - "mkdirp-0.3.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "1ybxjmcj45s90izizl2v7i19vbzayjanpqv7nz7w68kmbf2i4ymn"; - }; - deps = [ - - ]; - }; - - "mkdirp-0.3.4" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; - }; - deps = [ - - ]; - }; - - "mocha" = self."mocha-1.9.0"; - - "mocha-1.9.0" = self.buildNodePackage rec { - name = "mocha-1.9.0"; - src = fetchurl { - url = "http://registry.npmjs.org/mocha/-/${name}.tgz"; - sha256 = "1l175lzff4h4skf98xq259jr0dv3gb3pygbpdbkb2n9jd1pd6xih"; - }; - deps = [ - self."commander-~0.6.1" - self."growl-1.7.0" - self."diff-~1.0.2" - self."debug" - self."mkdirp-0.3.3" - self."ms-0.3.0" - self."jade-0.26.3" - ]; - }; - - "mongodb" = self."mongodb-1.1.11"; - - "mongodb-1.1.11" = self.buildNodePackage rec { - name = "mongodb-1.1.11"; - src = fetchurl { - url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; - sha256 = "fedd14b097a58ae5c2c83e5cb0af85a191ad00c2ce8d6db46520ee6cc1650277"; - }; - deps = [ - self."bson-0.1.5" - ]; - }; - - "mrclean" = self."mrclean-0.1.0"; - - "mrclean-0.1.0" = self.buildNodePackage rec { - name = "mrclean-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/mrclean/-/${name}.tgz"; - sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705"; - }; - deps = [ - - ]; - }; - - "ms" = self."ms-0.3.0"; - - "ms-0.3.0" = self.buildNodePackage rec { - name = "ms-0.3.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/${name}.tgz"; - sha256 = "1wh7pqm55vf7l2b10rzn4zj1j4f0wba873qilyzbpnm6hq0snbpp"; - }; - }; - - "nijs" = self."nijs-0.0.5"; - - "nijs-0.0.5" = self.buildNodePackage rec { - name = "nijs-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/nijs/-/${name}.tgz"; - sha256 = "026lxgm75mqy5n1yjsk1n8xbgq5n9lw43lqa5nmy2mq74hzzksf5"; - }; - deps = [ - self."optparse" - ]; - }; - - "node-expat" = self."node-expat-*"; - - "node-expat-*" = self.buildNodePackage rec { - name = "node-expat-1.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/node-expat/-/${name}.tgz"; - sha256 = "15c0566889ef8a54b2b626956b7dfc160469eb6c0d44a582a0b1077fadf034d2"; - }; - deps = [ - - ]; - buildInputs = [ pkgs.expat ]; - }; - - "node-gyp" = self."node-gyp-*"; - - "node-gyp-*" = self.buildNodePackage rec { - name = "node-gyp-0.6.8"; - src = fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; - sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; - }; - deps = [ - self."glob-3" - self."graceful-fs-1" - self."fstream-~0.1.13" - self."minimatch-0.2" - self."mkdirp-0.3.4" - self."nopt-2" - self."npmlog-0" - self."osenv-0" - self."request-2.9" - self."rimraf-2" - self."semver-1" - self."tar-~0.1.12" - self."which-1" - ]; - }; - - "node-uuid" = self."node-uuid-1.3.3"; - - "node-uuid-1.2.0" = self.buildNodePackage rec { - name = "node-uuid-1.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz"; - sha256 = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2"; - }; - deps = [ - - ]; - }; - - "node-uuid-1.3.3" = self.buildNodePackage rec { - name = "node-uuid-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz"; - sha256 = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; - }; - deps = [ - - ]; - }; - - "nopt" = self."nopt-2"; - - "nopt-1.0.10" = self.buildNodePackage rec { - name = "nopt-1.0.10"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "426562943bfbbfc059eac83575ade5b78c6c01e5c1000a90a7defecfe2334927"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "nopt-2" = self.buildNodePackage rec { - name = "nopt-2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "npm2nix" = self."npm2nix-0.1.3"; - - "npm2nix-0.1.3" = self.buildNodePackage rec { - name = "npm2nix-0.1.3"; - src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.3.tar.gz; - sha256 = "1728fzmixcyg4g8mqcgn5yf7d4nin9zyqv8bs8b6660swhfdn4il"; - name = "${name}.tgz"; - }; - deps = [ - self."semver-1" - ]; - }; - - "npmlog" = self."npmlog-0"; - - "npmlog-0" = self.buildNodePackage rec { - name = "npmlog-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; - sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; - }; - deps = [ - self."ansi-~0.1.2" - ]; - }; - - "optimist" = self."optimist-*"; - - "optimist-*" = self."optimist-0.3.5"; - "optimist-~0.3.5" = self."optimist-0.3.5"; - - "optimist-0.3.5" = self.buildNodePackage rec { - name = "optimist-0.3.5"; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/${name}.tgz"; - sha256 = "17d06n3y9difknq9j340qksj2zllal6sg0pj4clj9ja5jxf721x4"; - }; - deps = [ - self."wordwrap-~0.0.2" - ]; - }; - - "options" = self."options-*"; - - "options-*" = self.buildNodePackage rec { - name = "options-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/${name}.tgz"; - sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d"; - }; - deps = [ - - ]; - }; - - "optparse" = self."optparse-1.0.3"; - - "optparse-1.0.3" = self.buildNodePackage rec { - name = "optparse-1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/optparse/-/${name}.tgz"; - sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883"; - }; - deps = [ - - ]; - }; - - "osenv" = self."osenv-0"; - - "osenv-0" = self.buildNodePackage rec { - name = "osenv-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; - sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - }; - deps = [ - - ]; - }; - - "pause" = self."pause-0.0.1"; - - "pause-0.0.1" = self.buildNodePackage rec { - name = "pause-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/pause/-/${name}.tgz"; - sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; - }; - deps = [ - - ]; - }; - - "policyfile" = self."policyfile-0.0.4"; - - "policyfile-0.0.4" = self.buildNodePackage rec { - name = "policyfile-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/policyfile/-/${name}.tgz"; - sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f"; - }; - deps = [ - - ]; - }; - - "qs" = self."qs-0.6.1"; - "qs->= 0.3.1" = self."qs-0.6.1"; - - "qs-0.4.2" = self.buildNodePackage rec { - name = "qs-0.4.2"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86"; - }; - deps = [ - - ]; - }; - - "qs-0.5.0" = self.buildNodePackage rec { - name = "qs-0.5.0"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993"; - }; - deps = [ - - ]; - }; - - "qs-0.6.1" = self.buildNodePackage rec { - name = "qs-0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/${name}.tgz"; - sha256 = "afb476cec9b40a7801fe21f4056bfffb2270e126d7136f955c810fa7181f972a"; - }; - deps = [ - - ]; - }; - - "range-parser" = self."range-parser-0.0.4"; - - "range-parser-0.0.4" = self.buildNodePackage rec { - name = "range-parser-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/range-parser/-/${name}.tgz"; - sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; - }; - deps = [ - - ]; - }; - - "rbytes" = self."rbytes-0.0.2"; - - "rbytes-0.0.2" = self.buildNodePackage rec { - name = "rbytes-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rbytes/-/${name}.tgz"; - sha256 = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; - }; - deps = [ - - ]; - buildInputs = [ - pkgs.openssl - ]; - }; - - "redis" = self."redis-0.7.2"; - - "redis-0.6.7" = self.buildNodePackage rec { - name = "redis-0.6.7"; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/${name}.tgz"; - sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb"; - }; - deps = [ - - ]; - }; - - "redis-0.7.2" = self.buildNodePackage rec { - name = "redis-0.7.2"; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/${name}.tgz"; - sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; - }; - deps = [ - self."hiredis" - ]; - }; - - "request" = self."request-~2"; - - "request-2.9" = self.buildNodePackage rec { - name = "request-2.9.203"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; - }; - deps = [ - - ]; - }; - - "request-~2" = self.buildNodePackage rec { - name = "request-2.11.0"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6"; - }; - deps = [ - - ]; - }; - - "requirejs" = self."requirejs-0.26.0"; - - "requirejs-==0.26.0" = self."requirejs-0.26.0"; - - "requirejs-0.26.0" = self.buildNodePackage rec { - name = "requirejs-0.26.0"; - src = fetchurl { - url = "http://registry.npmjs.org/requirejs/-/${name}.tgz"; - sha256 = "5ec7264031784fd1b5844aba813ace9045918a0b004a52fafa6b52e9e9760407"; - }; - deps = [ - - ]; - }; - - "restify" = self."restify-1.4.3"; - - "restify-1.4.3" = self.buildNodePackage rec { - name = "restify-1.4.3"; - src = fetchurl { - url = "http://registry.npmjs.org/restify/-/${name}.tgz"; - sha256 = "7c95b1e58d6effab3b947409892a20260b6d1142aefec9c3eb1e46165363d64e"; - }; - deps = [ - self."async-0.1.22" - self."bunyan-0.8.0" - self."byline-2.0.2" - self."formidable-1.0.11" - self."dtrace-provider-0.0.6" - self."http-signature-0.9.9" - self."lru-cache-1.1.0" - self."mime-1.2.5" - self."node-uuid-1.3.3" - self."qs-0.5.0" - self."retry-0.6.0" - self."semver-1.0.14" - ]; - }; - - "retry" = self."retry-0.6.0"; - - "retry-0.6.0" = self.buildNodePackage rec { - name = "retry-0.6.0"; - src = fetchurl { - url = "http://registry.npmjs.org/retry/-/${name}.tgz"; - sha256 = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; - }; - deps = [ - - ]; - }; - - "rimraf" = self."rimraf-2"; - - "rimraf-2" = self.buildNodePackage rec { - name = "rimraf-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; - sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; - }; - deps = [ - self."graceful-fs-~1.1" - ]; - }; - - "s3http" = self."s3http-*"; - - "s3http-*" = self.buildNodePackage rec { - name = "s3http-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/s3http/-/${name}.tgz"; - sha256 = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba"; - }; - deps = [ - self."aws-sdk-git" - self."commander-0.5.1" - self."http-auth-*" - ]; - }; - - "sax" = self."sax->=0.4.2"; - - "sax->=0.4.2" = self.buildNodePackage rec { - name = "sax-0.5.2"; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/${name}.tgz"; - sha256 = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953"; - }; - deps = [ - - ]; - }; - - "semver" = self."semver-1"; - - "semver-1" = self."semver-1.0.14"; - - "semver-1.0.14" = self.buildNodePackage rec { - name = "semver-1.0.14"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/${name}.tgz"; - sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; - }; - deps = [ - - ]; - }; - - "send" = self."send-0.1.0"; - - "send-0.1.0" = self.buildNodePackage rec { - name = "send-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/${name}.tgz"; - sha256 = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; - }; - deps = [ - self."debug" - self."mime-1.2.6" - self."fresh-0.1.0" - self."range-parser-0.0.4" - ]; - }; - - "send-0.0.4" = self.buildNodePackage rec { - name = "send-0.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/send/-/${name}.tgz"; - sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c"; - }; - deps = [ - self."debug" - self."mime-1.2.6" - self."fresh-0.1.0" - self."range-parser-0.0.4" - ]; - }; - - "showdown" = self."showdown-0.0.1"; - - "showdown-0.0.1" = self.buildNodePackage rec { - name = "showdown-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/showdown/-/${name}.tgz"; - sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d"; - }; - deps = [ - - ]; - }; - - "smartdc" = self."smartdc-*"; - - "smartdc-*" = self.buildNodePackage rec { - name = "smartdc-6.5.6"; - src = fetchurl { - url = "http://registry.npmjs.org/smartdc/-/${name}.tgz"; - sha256 = "a5d7ba965a863a411b52f0321a9fa1be350cb6af807175beb16529e4282dff4d"; - }; - deps = [ - self."http-signature-0.9.9" - self."lru-cache-1.1.0" - self."nopt-1.0.10" - self."restify-1.4.3" - self."bunyan-0.8.0" - self."ssh-agent-0.1.0" - ]; - }; - - "ssh-agent" = self."ssh-agent-0.1.0"; - - "ssh-agent-0.1.0" = self.buildNodePackage rec { - name = "ssh-agent-0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ssh-agent/-/${name}.tgz"; - sha256 = "62860d09a84d0bf1250d8c90aae3d0a922a7812591a9f4243330178774eb87b5"; - }; - deps = [ - self."ctype->=0.0.2" - ]; - }; - - "socket.io" = self."socket.io-0.9.6"; - - "socket.io-0.9.6" = self.buildNodePackage rec { - name = "socket.io-0.9.6"; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io/-/${name}.tgz"; - sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c"; - }; - deps = [ - self."socket.io-client-0.9.6" - self."policyfile-0.0.4" - self."redis-0.6.7" - ]; - }; - - "socket.io-client" = self."socket.io-client-0.9.6"; - - "socket.io-client-0.9.6" = self.buildNodePackage rec { - name = "socket.io-client-0.9.6"; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz"; - sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399"; - }; - deps = [ - self."uglify-js-1.2.5" - self."ws-0.4.x" - self."xmlhttprequest-1.2.2" - self."active-x-obfuscator-0.0.1" - ]; - }; - - "sockjs" = self."sockjs-0.3.1"; - - "sockjs-0.3.1" = self.buildNodePackage rec { - name = "sockjs-0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/sockjs/-/${name}.tgz"; - sha256 = "056476f23dbe2e2182e5edea755108a8b6dbaea4b675b228172e876c8649efdf"; - }; - deps = [ - self."node-uuid-1.3.3" - self."faye-websocket-0.4.0" - self."rbytes-0.0.2" - ]; - }; - - "source-map" = self."source-map-0.1.7"; - - "source-map-~0.1.7" = self."source-map-0.1.7"; - - "source-map-0.1.7" = self.buildNodePackage rec { - name = "source-map-0.1.7"; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/${name}.tgz"; - sha256 = "041skhq60kwpx319iy0m33zcgc7q2ddlfl3vvmwl5ssl9p46g8x2"; - }; - deps = [ - self."amdefine->=0.0.4" - ]; - }; - - "source-map-0.1.2" = self.buildNodePackage rec { - name = "source-map-0.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/${name}.tgz"; - sha256 = "4465bb3a293c0e86092affb7cbdd6d9356cad69231c56f6e73bba7750497035f"; - }; - deps = [ - self."requirejs-==0.26.0" - ]; - }; - - "swig" = self."swig-0.13.2"; - - "swig-0.13.2" = self.buildNodePackage rec { - name = "swig-0.13.2"; - src = fetchurl { - url = "http://registry.npmjs.org/swig/-/${name}.tgz"; - sha256 = "1fxc1cg0g5bn0ksm4gddx75ff5yzzbhqn4yqh6xqa5ag73nvxiyg"; - }; - deps = [ - self."underscore" - ]; - }; - - "tar" = self."tar-~0.1.12"; - - "tar-~0.1.12" = self.buildNodePackage rec { - name = "tar-0.1.13"; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/${name}.tgz"; - sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; - }; - deps = [ - self."inherits-1.x" - self."block-stream" - self."fstream-~0.1.8" - ]; - }; - - "temp" = self."temp-*"; - - "temp-*" = self.buildNodePackage rec { - name = "temp-0.4.0"; - src = fetchurl { - url = "http://registry.npmjs.org/temp/-/${name}.tgz"; - sha256 = "ca8274250d36d94e670b8773bf062a28bc43eb342ae47ff629fbb627d48d710b"; - }; - deps = [ - - ]; - }; - - "timerstub" = self."timerstub-*"; - - "timerstub-*" = self.buildNodePackage rec { - name = "timerstub-0.1.3"; - src = fetchurl { - url = "http://registry.npmjs.org/timerstub/-/${name}.tgz"; - sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153"; - }; - deps = [ - self."coffee-script-~1.1.2" - ]; - }; - - "tinycolor" = self."tinycolor-0.x"; - - "tinycolor-0.x" = self.buildNodePackage rec { - name = "tinycolor-0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz"; - sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0"; - }; - deps = [ - - ]; - }; - - "uglify-js" = self."uglify-js-2.2.5"; - - "uglify-js-2.2.5" = self.buildNodePackage rec { - name = "uglify-js-2.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "18ic581gjyvfl4gvlcdmzw4vrcbvn698i2rznnba70f8lk6ndlgr"; - }; - deps = [ - self."source-map-~0.1.7" - self."optimist-~0.3.5" - ]; - }; - - "uglify-js-1.2.5" = self.buildNodePackage rec { - name = "uglify-js-1.2.5"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74"; - }; - deps = [ - - ]; - }; - - "uglify-js-1.2.6" = self.buildNodePackage rec { - name = "uglify-js-1.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; - sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d"; - }; - deps = [ - - ]; - }; - - "underscore" = self."underscore-*"; - "underscore->=1.3.1" = self."underscore-*"; - - "underscore-*" = self.buildNodePackage rec { - name = "underscore-1.4.4"; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; - sha256 = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; - }; - deps = [ - - ]; - }; - - "util" = self."util-0.4.9"; - - "util-0.4.9" = self.buildNodePackage rec { - name = "util-0.4.9"; - src = fetchurl { - url = "http://registry.npmjs.org/util/-/${name}.tgz"; - sha256 = "1rchmv7d29j5wc5m2jqk170xgn50y71hpwhy5ib515klkrnc5v1h"; - }; - deps = [ - self."events.node" - ]; - }; - - "vows" = self."vows->=0.5.4"; - - "vows->=0.5.4" = self.buildNodePackage rec { - name = "vows-0.6.4"; - src = fetchurl { - url = "http://registry.npmjs.org/vows/-/${name}.tgz"; - sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597"; - }; - deps = [ - self."eyes->=0.1.6" - self."diff-~1.0.3" - ]; - }; - - "which" = self."which-1"; - - "which-1" = self.buildNodePackage rec { - name = "which-1.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/which/-/${name}.tgz"; - sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; - }; - deps = [ - - ]; - }; - - "wordwrap" = self."wordwrap-~0.0.2"; - - "wordwrap-~0.0.2" = self.buildNodePackage rec { - name = "wordwrap-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/${name}.tgz"; - sha256 = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; - }; - deps = [ - - ]; - }; - - "ws" = self."ws-0.4.x"; - "ws-0.4.x" = self."ws-0.4.21"; - - "ws-0.4.21" = self.buildNodePackage rec { - name = "ws-0.4.21"; - src = self.patchLatest { - url = "http://registry.npmjs.org/ws/-/${name}.tgz"; - sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e"; - }; - deps = [ - self."commander-~0.6.1" - self."tinycolor-0.x" - self."options" - ]; - }; - - "wu" = self."wu-0.1.8"; - - "wu-0.1.8" = self.buildNodePackage rec { - name = "wu-0.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/wu/-/${name}.tgz"; - sha256 = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; - }; - deps = [ - - ]; - }; - - "xml2js" = self."xml2js-0.2.4"; - - "xml2js-0.2.4" = self.buildNodePackage rec { - name = "xml2js-0.2.4"; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/${name}.tgz"; - sha256 = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28"; - }; - deps = [ - self."sax->=0.4.2" - ]; - }; - - "xmlbuilder" = self."xmlbuilder-*"; - - "xmlbuilder-*" = self.buildNodePackage rec { - name = "xmlbuilder-0.4.2"; - src = fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/${name}.tgz"; - sha256 = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe"; - }; - deps = [ - - ]; - }; - - "xmlhttprequest" = self."xmlhttprequest-1.2.2"; - - "xmlhttprequest-1.2.2" = self.buildNodePackage rec { - name = "xmlhttprequest-1.2.2"; - src = fetchurl { - url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz"; - sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d"; - }; - deps = [ - - ]; - }; - - "zeparser" = self."zeparser-0.0.5"; - - "zeparser-0.0.5" = self.buildNodePackage rec { - name = "zeparser-0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/zeparser/-/${name}.tgz"; - sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b"; - }; - deps = [ - - ]; - }; -}; - +let + generated = builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: + (pkgs.lib.optional pkg.topLevel { name = pkg.baseName; value = builtins.getAttr pkg.fullName self; }) ++ [ + { + name = pkg.fullName; + value = self.buildNodePackage rec { + name = "${pkg.baseName}-${pkg.version}"; + src = (if pkg.patchLatest then self.patchLatest else fetchurl) { + url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; + sha256 = pkg.hash; + }; + deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self) pkg.dependencies; + buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + }; + } + ] ++ pairs + ) [] (import ./node-packages-generated.nix)); + + nativeDeps = { + "node-expat-*" = [ pkgs.expat ]; + "rbytes-0.0.2" = [ pkgs.openssl ]; + }; + + self = { + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs neededNatives; + inherit (pkgs) runCommand; + }; + + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' + mkdir unpack + cd unpack + tar xf ${src} + mv */ package 2>/dev/null || true + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out * + ''; + + /* Put manual packages below here (ideally eventually managed by npm2nix */ + } // generated; in self From 4e5966e7aa242c19b59308a6f15fe8a5f9cc3bd2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 May 2013 22:57:49 -0400 Subject: [PATCH 072/193] Add npm2nix nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 11 +++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 26d79d3f1f0..b283aca4407 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1268,6 +1268,17 @@ { name = "abbrev"; range = "1"; } ]; } + { + baseName = "npm2nix"; + version = "1.0.0"; + fullName = "npm2nix-*"; + hash = "c3fa4fd02e6184d60e780e31578a8a8ee190eea28b77d5b006f6ea920324ea54"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "semver"; range = "1"; } + ]; + } { baseName = "npmlog"; version = "0.0.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 17f4cee6943..17883abdb61 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -31,4 +31,5 @@ , { "name": "browserchannel" } , { "name": "node-gyp" } , { "name": "semver" } +, { "name": "npm2nix" } ] From 2e3f53ed271ce4dd4e5c3ceb64cecdc4e2c69a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 May 2013 10:23:22 +0200 Subject: [PATCH 073/193] mumble: making hydra build it --- pkgs/applications/networking/mumble/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index de78e897575..9befe98399d 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -41,5 +41,7 @@ stdenv.mkDerivation rec { homepage = http://mumble.sourceforge.net/; description = "Low-latency, high quality voice chat software"; license = "BSD"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; }; } From 43d4e53cd2718256e69aca2c27018ac2019dfbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 28 May 2013 11:06:33 +0200 Subject: [PATCH 074/193] haskell: add pop3-client and smtp-mail (by cabal2nix) --- .../libraries/haskell/pop3-client/default.nix | 14 ++++++++++++++ .../libraries/haskell/smtp-mail/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/haskell/pop3-client/default.nix create mode 100644 pkgs/development/libraries/haskell/smtp-mail/default.nix diff --git a/pkgs/development/libraries/haskell/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix new file mode 100644 index 00000000000..6656814f64f --- /dev/null +++ b/pkgs/development/libraries/haskell/pop3-client/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, network }: + +cabal.mkDerivation (self: { + pname = "pop3-client"; + version = "0.1.4"; + sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv"; + buildDepends = [ mtl network ]; + meta = { + homepage = "https://github.com/tmrudick/haskell-pop3-client/"; + description = "POP3 Client Library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix new file mode 100644 index 00000000000..e07ed9e236b --- /dev/null +++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix @@ -0,0 +1,19 @@ +{ cabal, base16Bytestring, base64Bytestring, cryptohash, filepath +, mimeMail, network, text +}: + +cabal.mkDerivation (self: { + pname = "smtp-mail"; + version = "0.1.4.3"; + sha256 = "0kpm42n7s3rvkn9i3s8wvkdrq2d85qy422y6p2r4s7nivh6sx1dk"; + buildDepends = [ + base16Bytestring base64Bytestring cryptohash filepath mimeMail + network text + ]; + meta = { + homepage = "http://github.com/jhickner/smtp-mail"; + description = "Simple email sending via SMTP"; + 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 30b08114e36..9f99a49dd6d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1558,6 +1558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + pop3client = callPackage ../development/libraries/haskell/pop3-client {}; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { inherit (pkgs) postgresql; }; @@ -1727,6 +1729,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + smtpMail = callPackage ../development/libraries/haskell/smtp-mail {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; From 412decd2a4a310b3d0f1eb9f81f3391e9fb053cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 May 2013 12:09:02 +0200 Subject: [PATCH 075/193] Crypt::RandPasswd: Update to 0.03 http://hydra.nixos.org/build/5098835 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 31b452ae200..e927d55025b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1252,11 +1252,11 @@ rec { }; }; - CryptRandPasswd = buildPerlPackage rec { - name = "Crypt-RandPasswd-0.02"; + CryptRandPasswd = buildPerlPackage { + name = "Crypt-RandPasswd-0.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDPORTER/${name}.tar.gz"; - sha256 = "0r5w5i81s02x756alad9psxmpqmcxahzjpqxsb3kacsqj8s5br9b"; + url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.03.tar.gz; + sha256 = "0sz2b4gj2mcwj0nqvxw3gs5m49jzfbi0vla51hj957dvfk00plhf"; }; }; From 6c03d641fad40727bb93d4cb157cce346fff73c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 28 May 2013 14:47:23 +0200 Subject: [PATCH 076/193] openvpn: Update to 2.3.1 --- pkgs/tools/networking/openvpn/default.nix | 38 +++++++++++++---------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 1310fb7d047..0db7c4b688f 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,35 +1,41 @@ -{stdenv, fetchurl, iproute, lzo, openssl}: +{ stdenv, fetchurl, iproute, lzo, openssl, pam }: stdenv.mkDerivation rec { - name = "openvpn-2.2.2"; + name = "openvpn-2.3.1"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "005cpvdvh8pvsn3bc96lrznlkcccbz5jqa62hipb58rf1qk8pjjl"; + sha256 = "0g7vf3f6z0h4kdqlqr8jd0gapi0ains6xcvlvfy8cicxnf2psbdx"; }; - buildInputs = [ iproute lzo openssl ]; + buildInputs = [ iproute lzo openssl pam ]; configureFlags = '' --enable-password-save --enable-iproute2 - --with-iproute-path=${iproute}/sbin/ip + --enable-systemd + IPROUTE=${iproute}/sbin/ip + ''; + + preConfigure = '' + substituteInPlace ./src/openvpn/console.c \ + --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password ''; postInstall = '' mkdir -p $out/share/doc/openvpn/examples - cp -r sample-config-files/ $out/share/doc/openvpn/examples - cp -r sample-keys/ $out/share/doc/openvpn/examples - cp -r easy-rsa/ $out/share/doc/openvpn/examples - rm -r $out/share/doc/openvpn/examples/easy-rsa/Windows - cp -r sample-scripts/ $out/share/doc/openvpn/examples + cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples + cp -r sample/sample-keys/ $out/share/doc/openvpn/examples + cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples ''; - meta = { - description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."; - homepage="http://openvpn.net/"; - license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + enableParallelBuilding = true; + + meta = { + description = "A robust and highly flexible tunneling application"; + homepage = http://openvpn.net/; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; } From 4fe2e7c1520288f453dfe1bb0608a5662e3f2d67 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 13:02:13 -0400 Subject: [PATCH 077/193] Add ansi-remover npm package Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 18 ++++++++++++++---- pkgs/top-level/node-packages.json | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b283aca4407..c39cfbf3d08 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -29,6 +29,16 @@ dependencies = [ ]; } + { + baseName = "ansi-remover"; + version = "0.0.2"; + fullName = "ansi-remover-*"; + hash = "cda72261ea8d6b830892764d69eff8d926be852fc91ad3b8b5b258d606400bc7"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "ansi"; version = "0.1.2"; @@ -72,9 +82,9 @@ } { baseName = "async"; - version = "0.2.8"; + version = "0.2.9"; fullName = "async-*"; - hash = "45d7c5ef1b87dc183b9265b882ae3fb2c20608832adc3234b766717016be2346"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; patchLatest = false; topLevel = true; dependencies = [ @@ -82,9 +92,9 @@ } { baseName = "async"; - version = "0.2.8"; + version = "0.2.9"; fullName = "async-~0.2.7"; - hash = "45d7c5ef1b87dc183b9265b882ae3fb2c20608832adc3234b766717016be2346"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; patchLatest = false; topLevel = false; dependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 17883abdb61..e8fc808595f 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -32,4 +32,5 @@ , { "name": "node-gyp" } , { "name": "semver" } , { "name": "npm2nix" } +, { "name": "ansi-remover" } ] From d5b33eec688f795df4827cdc78b8936a2a3a3b07 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 13:19:44 -0400 Subject: [PATCH 078/193] npm2nix now supports simple strings in the JSON file if no range is specified Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 4 +- pkgs/top-level/node-packages.json | 68 +++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index c39cfbf3d08..e3c65b69f04 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1280,9 +1280,9 @@ } { baseName = "npm2nix"; - version = "1.0.0"; + version = "1.1.0"; fullName = "npm2nix-*"; - hash = "c3fa4fd02e6184d60e780e31578a8a8ee190eea28b77d5b006f6ea920324ea54"; + hash = "b592b5d94ea64b04ea21dd45902e3148f62f8234a75969604d37b35eb45abb21"; patchLatest = false; topLevel = true; dependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index e8fc808595f..516754fdef5 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -1,36 +1,36 @@ [ - { "name": "async" } -, { "name": "assert" } -, { "name": "mocha" } -, { "name": "jayschema" } -, { "name": "underscore" } -, { "name": "extend" } -, { "name": "express" } -, { "name": "s3http" } -, { "name": "aws-sdk" } -, { "name": "nijs" } -, { "name": "amdefine" } -, { "name": "smartdc" } -, { "name": "optparse" } -, { "name": "jsontool" } -, { "name": "swig" } -, { "name": "coffee-script" } -, { "name": "escape-html" } -, { "name": "buffertools" } -, { "name": "wu" } -, { "name": "source-map" } -, { "name": "knox" } -, { "name": "node-expat" } -, { "name": "optimist" } -, { "name": "temp" } -, { "name": "faye-websocket" } -, { "name": "node-uuid" } -, { "name": "rbytes" } -, { "name": "sockjs" } -, { "name": "backbone" } -, { "name": "browserchannel" } -, { "name": "node-gyp" } -, { "name": "semver" } -, { "name": "npm2nix" } -, { "name": "ansi-remover" } + "async" +, "assert" +, "mocha" +, "jayschema" +, "underscore" +, "extend" +, "express" +, "s3http" +, "aws-sdk" +, "nijs" +, "amdefine" +, "smartdc" +, "optparse" +, "jsontool" +, "swig" +, "coffee-script" +, "escape-html" +, "buffertools" +, "wu" +, "source-map" +, "knox" +, "node-expat" +, "optimist" +, "temp" +, "faye-websocket" +, "node-uuid" +, "rbytes" +, "sockjs" +, "backbone" +, "browserchannel" +, "node-gyp" +, "semver" +, "npm2nix" +, "ansi-remover" ] From 55eccc68bb27625f1f6a5221fde8b147f75941d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 28 May 2013 22:37:59 +0200 Subject: [PATCH 079/193] Adding oslrd. --- pkgs/tools/networking/oslrd/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/oslrd/default.nix diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix new file mode 100644 index 00000000000..18fdae2a44f --- /dev/null +++ b/pkgs/tools/networking/oslrd/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, bison, flex }: + +stdenv.mkDerivation rec { + name = "olsrd-0.6.5.4"; + + src = fetchurl { + url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; + sha256 = "757327b9a22b066bd0cab2a8e1cdd1c462f474bb99864a175388aa5f0c70504c"; + }; + + buildInputs = [ bison flex ]; + + preConfigure = '' + makeFlags="prefix=$out ETCDIR=$out/etc" + ''; + + meta = { + description = "An adhoc wireless mesh routing daemon"; + license = "BSD"; + homepage = "http://olsr.org/"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37631ac6708..6e91d928128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1361,6 +1361,8 @@ let optipng = callPackage ../tools/graphics/optipng { }; + oslrd = callPackage ../tools/networking/oslrd { }; + ossec = callPackage ../tools/security/ossec {}; otpw = callPackage ../os-specific/linux/otpw { }; From bf0d1f58dceefb533d4ee5d98bd3442131a29ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 28 May 2013 22:58:25 +0200 Subject: [PATCH 080/193] Adding batman-adv. --- pkgs/os-specific/linux/batman-adv/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/batman-adv/default.nix diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix new file mode 100644 index 00000000000..693f0067701 --- /dev/null +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, kernelDev }: + +stdenv.mkDerivation rec { + name = "batman-adv-2013.2.0"; + + src = fetchurl { + url = "http://downloads.open-mesh.org/batman/releases/${name}/${name}.tar.gz"; + sha1 = "7d2aff2ad118cbc5452de43f7e9da8374521ec0e"; + }; + + preBuild = '' + makeFlags="KERNELPATH=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build" + sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \ + -e /depmod/d Makefile + ''; + + meta = { + homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e91d928128..9fafa1f72f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6093,6 +6093,8 @@ let acpi_call = callPackage ../os-specific/linux/acpi-call {}; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; + bbswitch = callPackage ../os-specific/linux/bbswitch {}; ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; From e1cb325f82d59f7fdf6404878f439cc1bcfaf231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 28 May 2013 23:02:22 +0200 Subject: [PATCH 081/193] Adding batctl, control for batman --- pkgs/os-specific/linux/batman-adv/batctl.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/batman-adv/batctl.nix diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix new file mode 100644 index 00000000000..2ff9d214bbb --- /dev/null +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +let + ver = "2013.2.0"; +in +stdenv.mkDerivation rec { + name = "batctl-${ver}"; + + src = fetchurl { + url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + sha1 = "0ba6520c813c9dd2e59e6205e8ea2e60a0c85f52"; + }; + + preBuild = '' + makeFlags=PREFIX=$out + ''; + + meta = { + homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fafa1f72f2..4a3082392d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5815,6 +5815,8 @@ let b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; + bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bluez4 = callPackage ../os-specific/linux/bluez { From 637fa11b2058695fef60d6c957660db3303be60a Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Wed, 29 May 2013 00:01:55 +0200 Subject: [PATCH 082/193] add pdf2htmlex and upgrade poppler --- .../libraries/pdf2htmlex/default.nix | 27 +++++++++++ .../libraries/pdf2htmlex/pdf2xml.patch | 48 +++++++++++++++++++ .../development/libraries/poppler/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 + 4 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/pdf2htmlex/default.nix create mode 100644 pkgs/development/libraries/pdf2htmlex/pdf2xml.patch diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix new file mode 100644 index 00000000000..597385aa9fa --- /dev/null +++ b/pkgs/development/libraries/pdf2htmlex/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}: + +stdenv.mkDerivation rec { + version = "0.8.1"; + name = "pdf2htmlex-${version}"; + + src = fetchurl { + url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip"; + sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a"; + }; + + buildInputs = [ + cmake + unzip + poppler + fontforge + pkgconfig + python + ]; + + meta = with stdenv.lib; { + description = "Convert PDF to HTML without losing text or format. "; + license = licenses.gpl3; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch new file mode 100644 index 00000000000..596a3aea674 --- /dev/null +++ b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch @@ -0,0 +1,48 @@ +diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux +*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 +--- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 +*************** +*** 30,36 **** + + + # Executable name +! PDFTOXMLEXE=pdftoxml.exe + + # Main target + all: pdftoxmlEXE +--- 30,36 ---- + + + # Executable name +! PDFTOXMLEXE=pdftoxml + + # Main target + all: pdftoxmlEXE +diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc +*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 +--- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 +*************** +*** 11,21 **** + // + //=========================================================================== + + #include +- #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" +--- 11,21 ---- + // + //=========================================================================== + ++ #include + #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2512979bfa3..1d796789210 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "poppler-0.18.4"; + name = "poppler-0.22.4"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; - sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; + sha256 = "0fz1vk0rbxvnv7ssj8l910k1rx0gjhzl5wr7hkdf4r9jwqs8yhsg"; }; propagatedBuildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a3082392d9..bb646a7af85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4867,6 +4867,8 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pdf2htmlex = callPackage ../development/libraries/pdf2htmlex {} ; + phonon = callPackage ../development/libraries/phonon { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; From 6cbadc4e23cbc6818c561a20533f8712332e5713 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Wed, 29 May 2013 00:05:31 +0200 Subject: [PATCH 083/193] waitress: 0.8.1 -> 0.8.5 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03bb433ae9d..e563614e752 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4700,11 +4700,11 @@ pythonPackages = python.modules // rec { }; waitress = buildPythonPackage rec { - name = "waitress-0.8.1"; + name = "waitress-0.8.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz"; - md5 = "aadfc692b780fc42eb05ac819102d336"; + md5 = "7a3094d812c0dffb948d1334ef5fd56f"; }; meta = { From fe009bcbc49ca4c8d20252047888e4b7b3d3fa6e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 16:37:19 -0400 Subject: [PATCH 084/193] cyrus-sasl: Fix build on darwin Signed-off-by: Shea Levy --- pkgs/development/libraries/cyrus-sasl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 87165fa8e7f..e90ec422661 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { ) ''; + installFlags = if stdenv.isDarwin then [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ] else null; + meta = { homepage = "http://cyrusimap.web.cmu.edu/"; description = "library for adding authentication support to connection-based protocols"; From c982e84df49494aaf9d8306929ebba60a125aef8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 17:27:28 -0400 Subject: [PATCH 085/193] gyp: Fix on darwin Signed-off-by: Shea Levy --- .../libraries/http_parser/default.nix | 4 +- .../python-modules/gyp/no-darwin-cflags.patch | 40 +++++++++++ .../python-modules/gyp/no-xcode.patch | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +- 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/gyp/no-darwin-cflags.patch create mode 100644 pkgs/development/python-modules/gyp/no-xcode.patch diff --git a/pkgs/development/libraries/http_parser/default.nix b/pkgs/development/libraries/http_parser/default.nix index 8106dcff8da..1290d5b223a 100644 --- a/pkgs/development/libraries/http_parser/default.nix +++ b/pkgs/development/libraries/http_parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gyp, utillinux ? null }: +{ stdenv, fetchurl, gyp, utillinux }: let version = "2.1"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { buildFlags = [ "BUILDTYPE=Release" ]; - buildInputs = [ gyp utillinux ]; + buildInputs = [ gyp ] ++ stdenv.lib.optional stdenv.isLinux utillinux; doCheck = true; diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch new file mode 100644 index 00000000000..4f95e78a171 --- /dev/null +++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch @@ -0,0 +1,40 @@ +Index: gyp/pylib/gyp/xcode_emulation.py +=================================================================== +--- gyp/pylib/gyp/xcode_emulation.py (revision 1635) ++++ gyp/pylib/gyp/xcode_emulation.py (working copy) +@@ -280,9 +280,6 @@ + if self._Test('GCC_CHAR_IS_UNSIGNED_CHAR', 'YES', default='NO'): + cflags.append('-funsigned-char') + +- if self._Test('GCC_CW_ASM_SYNTAX', 'YES', default='YES'): +- cflags.append('-fasm-blocks') +- + if 'GCC_DYNAMIC_NO_PIC' in self._Settings(): + if self._Settings()['GCC_DYNAMIC_NO_PIC'] == 'YES': + cflags.append('-mdynamic-no-pic') +@@ -292,9 +289,6 @@ + # mdynamic-no-pic by default for executable and possibly static lib + # according to mento + +- if self._Test('GCC_ENABLE_PASCAL_STRINGS', 'YES', default='YES'): +- cflags.append('-mpascal-strings') +- + self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s') + + if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'): +@@ -334,7 +328,6 @@ + # TODO: Supporting fat binaries will be annoying. + self._WarnUnimplemented('ARCHS') + archs = ['i386'] +- cflags.append('-arch ' + archs[0]) + + if archs[0] in ('i386', 'x86_64'): + if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'): +@@ -570,7 +563,6 @@ + # TODO: Supporting fat binaries will be annoying. + self._WarnUnimplemented('ARCHS') + archs = ['i386'] +- ldflags.append('-arch ' + archs[0]) + + # Xcode adds the product directory by default. + ldflags.append('-L' + product_dir) diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch new file mode 100644 index 00000000000..951be7b005a --- /dev/null +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -0,0 +1,66 @@ +Index: pylib/gyp/xcode_emulation.py +diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py +index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4fb61d6cb6 100644 +--- a/pylib/gyp/xcode_emulation.py ++++ b/pylib/gyp/xcode_emulation.py +@@ -236,8 +236,14 @@ class XcodeSettings(object): + if sdk_root.startswith('/'): + return sdk_root + if sdk_root not in XcodeSettings._sdk_path_cache: +- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( +- sdk_root, 'Path') ++ try: ++ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( ++ sdk_root, 'Path') ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -340,10 +346,11 @@ class XcodeSettings(object): + + cflags += self._Settings().get('WARNING_CFLAGS', []) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if sdk_root: ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + self.configname = None + return cflags +@@ -573,10 +580,11 @@ class XcodeSettings(object): + for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): + ldflags.append('-Wl,-rpath,' + rpath) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) ++ if self._SdkPath(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) + + self.configname = None + return ldflags +@@ -701,7 +709,10 @@ class XcodeSettings(object): + l = '-l' + m.group(1) + else: + l = library +- return l.replace('$(SDKROOT)', self._SdkPath()) ++ if self._SdkPath(): ++ return l.replace('$(SDKROOT)', self._SdkPath()) ++ else: ++ return l + + def AdjustLibraries(self, libraries): + """Transforms entries like 'Cocoa.framework' in libraries into entries like diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e563614e752..20bbc37e4d6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1887,15 +1887,17 @@ pythonPackages = python.modules // rec { gyp = buildPythonPackage rec { - rev = "1435"; + rev = "1635"; name = "gyp-r${rev}"; src = fetchsvn { url = "http://gyp.googlecode.com/svn/trunk"; inherit rev; - sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0"; + sha256 = "1hn5gxgj2z399f71kz11m61ifds7mx4zkymnd1c87k1wyp7bs5k5"; }; + patches = if pkgs.stdenv.isDarwin then [ ../development/python-modules/gyp/no-xcode.patch ../development/python-modules/gyp/no-darwin-cflags.patch ] else null; + # error: invalid command 'test' doCheck = false; From 2794d74506d1a4122e30bd4d8cd52d07280d155c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 17:37:47 -0400 Subject: [PATCH 086/193] Fix http_parser build on darwin Signed-off-by: Shea Levy --- .../development/libraries/http_parser/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/http_parser/default.nix b/pkgs/development/libraries/http_parser/default.nix index 1290d5b223a..09371e4efb8 100644 --- a/pkgs/development/libraries/http_parser/default.nix +++ b/pkgs/development/libraries/http_parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gyp, utillinux }: +{ stdenv, fetchurl, gyp, utillinux, python }: let version = "2.1"; @@ -16,9 +16,9 @@ in stdenv.mkDerivation { buildFlags = [ "BUILDTYPE=Release" ]; - buildInputs = [ gyp ] ++ stdenv.lib.optional stdenv.isLinux utillinux; + buildInputs = [ gyp ] ++ (stdenv.lib.optional stdenv.isLinux utillinux) ++ stdenv.lib.optional stdenv.isDarwin python; - doCheck = true; + doCheck = !stdenv.isDarwin; checkPhase = '' out/Release/test-nonstrict @@ -26,13 +26,18 @@ in stdenv.mkDerivation { ''; installPhase = '' - mkdir -p $out - mv out/Release/lib.target $out/lib + mkdir -p $out/lib + mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib mkdir -p $out/include mv http_parser.h $out/include ''; + postFixup = if stdenv.isDarwin then '' + install_name_tool -id $out/lib/libhttp_parser.dylib $out/lib/libhttp_parser.dylib + install_name_tool -id $out/lib/libhttp_parser_strict.dylib $out/lib/libhttp_parser_strict.dylib + '' else null; + meta = { description = "An HTTP message parser written in C"; From 47cbc4cead4ab5f62d20c17d247827c9f38bee8b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 18:27:53 -0400 Subject: [PATCH 087/193] Missed some darwin cflags in gyp Signed-off-by: Shea Levy --- .../python-modules/gyp/no-darwin-cflags.patch | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch index 4f95e78a171..d81ea0d1c12 100644 --- a/pkgs/development/python-modules/gyp/no-darwin-cflags.patch +++ b/pkgs/development/python-modules/gyp/no-darwin-cflags.patch @@ -22,7 +22,20 @@ Index: gyp/pylib/gyp/xcode_emulation.py self._Appendf(cflags, 'GCC_OPTIMIZATION_LEVEL', '-O%s', default='s') if self._Test('GCC_GENERATE_DEBUGGING_SYMBOLS', 'YES', default='YES'): -@@ -334,7 +328,6 @@ +@@ -311,12 +305,6 @@ + if self._Test('GCC_SYMBOLS_PRIVATE_EXTERN', 'YES', default='NO'): + cflags.append('-fvisibility=hidden') + +- if self._Test('GCC_TREAT_WARNINGS_AS_ERRORS', 'YES', default='NO'): +- cflags.append('-Werror') +- +- if self._Test('GCC_WARN_ABOUT_MISSING_NEWLINE', 'YES', default='NO'): +- cflags.append('-Wnewline-eof') +- + self._AppendPlatformVersionMinFlags(cflags) + + # TODO: +@@ -334,7 +322,6 @@ # TODO: Supporting fat binaries will be annoying. self._WarnUnimplemented('ARCHS') archs = ['i386'] @@ -30,7 +43,7 @@ Index: gyp/pylib/gyp/xcode_emulation.py if archs[0] in ('i386', 'x86_64'): if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'): -@@ -570,7 +563,6 @@ +@@ -570,7 +557,6 @@ # TODO: Supporting fat binaries will be annoying. self._WarnUnimplemented('ARCHS') archs = ['i386'] From 9e012056593274f80a15c09c76b6d7a2d78746d2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 18:28:25 -0400 Subject: [PATCH 088/193] Set library path properly for v8 on darwin --- pkgs/development/libraries/v8/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index b325c2a107d..25deb9eb351 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -48,4 +48,9 @@ stdenv.mkDerivation { "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"} mv -v include $out/ ''; + + postFixup = if stdenv.isDarwin then '' + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else null; } From 5ddae355961d890055d164acd5c883338716ccc1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 28 May 2013 18:38:16 -0400 Subject: [PATCH 089/193] Get node.js building on darwin Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/default.nix | 18 ++++- pkgs/development/web/nodejs/no-xcode.patch | 78 ++++++++++++++++++++++ 2 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/web/nodejs/no-xcode.patch diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f3025c97f16..064284da1f5 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares }: +{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http_parser, c-ares, pkgconfig, runCommand }: let + dtrace = runCommand "dtrace-native" {} '' + mkdir -p $out/bin + ln -sv /usr/sbin/dtrace $out/bin + ''; + version = "0.10.8"; # !!! Should we also do shared libuv? @@ -16,7 +21,7 @@ let "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" ]; - inherit (stdenv.lib) concatMap optional maintainers licenses platforms; + inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; in stdenv.mkDerivation { name = "nodejs-${version}"; @@ -31,8 +36,15 @@ in stdenv.mkDerivation { sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure ''; + patches = if stdenv.isDarwin then [ ./no-xcode.patch ] else null; + + postPatch = if stdenv.isDarwin then '' + (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) + '' else null; + buildInputs = [ python ] - ++ optional stdenv.isLinux utillinux; + ++ (optional stdenv.isLinux utillinux) + ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch new file mode 100644 index 00000000000..47a37bfaf3c --- /dev/null +++ b/pkgs/development/web/nodejs/no-xcode.patch @@ -0,0 +1,78 @@ +diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py +index 806f92b..5256856 100644 +--- a/tools/gyp/pylib/gyp/xcode_emulation.py ++++ b/tools/gyp/pylib/gyp/xcode_emulation.py +@@ -224,8 +224,7 @@ class XcodeSettings(object): + + def _GetSdkVersionInfoItem(self, sdk, infoitem): + job = subprocess.Popen(['xcodebuild', '-version', '-sdk', sdk, infoitem], +- stdout=subprocess.PIPE, +- stderr=subprocess.STDOUT) ++ stdout=subprocess.PIPE) + out = job.communicate()[0] + if job.returncode != 0: + sys.stderr.write(out + '\n') +@@ -234,9 +233,17 @@ class XcodeSettings(object): + + def _SdkPath(self): + sdk_root = self.GetPerTargetSetting('SDKROOT', default='macosx') ++ if sdk_root.startswith('/'): ++ return sdk_root + if sdk_root not in XcodeSettings._sdk_path_cache: +- XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( +- sdk_root, 'Path') ++ try: ++ XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem( ++ sdk_root, 'Path') ++ except: ++ # if this fails it's because xcodebuild failed, which means ++ # the user is probably on a CLT-only system, where there ++ # is no valid SDK root ++ XcodeSettings._sdk_path_cache[sdk_root] = None + return XcodeSettings._sdk_path_cache[sdk_root] + + def _AppendPlatformVersionMinFlags(self, lst): +@@ -339,10 +346,11 @@ class XcodeSettings(object): + + cflags += self._Settings().get('WARNING_CFLAGS', []) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root)) + + self.configname = None + return cflags +@@ -572,10 +580,11 @@ class XcodeSettings(object): + for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []): + ldflags.append('-Wl,-rpath,' + rpath) + +- config = self.spec['configurations'][self.configname] +- framework_dirs = config.get('mac_framework_dirs', []) +- for directory in framework_dirs: +- ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) ++ if 'SDKROOT' in self._Settings(): ++ config = self.spec['configurations'][self.configname] ++ framework_dirs = config.get('mac_framework_dirs', []) ++ for directory in framework_dirs: ++ ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath())) + + self.configname = None + return ldflags +@@ -700,7 +709,10 @@ class XcodeSettings(object): + l = '-l' + m.group(1) + else: + l = library +- return l.replace('$(SDKROOT)', self._SdkPath()) ++ if self._SdkPath(): ++ return l.replace('$(SDKROOT)', self._SdkPath()) ++ else: ++ return l + + def AdjustLibraries(self, libraries): + """Transforms entries like 'Cocoa.framework' in libraries into entries like From dde4a92c5c8fe9a322aafce04860f277d288377d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 13:50:53 +0200 Subject: [PATCH 090/193] Generate unique derivation names so that we can easily install them from a Nix channel --- pkgs/development/mobile/titaniumenv/examples/default.nix | 2 ++ .../titaniumenv/examples/emulate-kitchensink/default.nix | 2 +- .../mobile/titaniumenv/examples/kitchensink/default.nix | 2 +- .../titaniumenv/examples/simulate-kitchensink/default.nix | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 71ed7f618b5..9a5736b37ac 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -27,12 +27,14 @@ rec { }; simulate_kitchensink_iphone = import ./simulate-kitchensink { + inherit (pkgs_darwin_x86_64) stdenv; inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv; kitchensink = kitchensink_iphone; device = "iPhone"; }; simulate_kitchensink_ipad = import ./simulate-kitchensink { + inherit (pkgs_darwin_x86_64) stdenv; inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv; kitchensink = kitchensink_iphone; device = "iPad"; diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix index 5e518df57cf..5187b0e0238 100644 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix @@ -1,7 +1,7 @@ {androidenv, kitchensink}: androidenv.emulateApp { - name = "kitchensink"; + name = "emulate-${kitchensink.name}"; app = kitchensink; platformVersion = "16"; useGoogleAPIs = true; diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index f557760dca0..49ce9a2c9b5 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,7 +1,7 @@ {titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ]}: titaniumenv.buildApp { - name = "KitchenSink"; + name = "KitchenSink-${target}"; appId = "com.appcelerator.kitchensink"; src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 70ec534f6ae..380e67c800d 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,7 +1,7 @@ -{xcodeenv, kitchensink, device}: +{stdenv, xcodeenv, kitchensink, device}: xcodeenv.simulateApp { - name = "kitchensink"; + name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; app = kitchensink; inherit device; baseDir = "build/iphone/build/Debug-iphonesimulator"; From cf512cf5c2d0fb5e3be5eb6bed28fd4ffc37c802 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 14:18:35 +0200 Subject: [PATCH 091/193] Use wildcard for the appname --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index e3eff458d27..b998e3c2d1a 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd '${app}/${baseDir}/${name}.app' + cd '${app}/${baseDir}/*.app' "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator From a7895de1fc61ae333665d8ae598ec964f3aac88e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 14:50:24 +0200 Subject: [PATCH 092/193] Use double quotes to expand wildcards --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index b998e3c2d1a..96560160bf5 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd '${app}/${baseDir}/*.app' + cd "${app}/${baseDir}/*.app" "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator From a2b8fb377623d0d94bbb1ac1307e2d9fc210ffc9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 15:01:55 +0200 Subject: [PATCH 093/193] It's impossible to guess the name so we add an extra optional parameter to override it --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 96560160bf5..96f70ea3832 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,6 +1,9 @@ {stdenv, xcodewrapper}: -{name, app, device ? "iPhone", baseDir ? ""}: +{name, appName ? null, app, device ? "iPhone", baseDir ? ""}: +let + _appName = if appName == null then name else appName; +in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' @@ -8,8 +11,8 @@ stdenv.mkDerivation { cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd "${app}/${baseDir}/*.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' + cd "${app}/${baseDir}/${_appName}.app" + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator ''; From c30eed4b4402517647047c9ec4ea3cfe1241cfcf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 15:16:21 +0200 Subject: [PATCH 094/193] Allow one to override the app's name through the appName parameter --- pkgs/development/mobile/titaniumenv/build-app.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0d35e6c3c2a..24bb1d2d93a 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,5 +1,5 @@ {stdenv, androidsdk, titaniumsdk, xcodewrapper}: -{ appId, name, src, target, androidPlatformVersions ? [ "8" ] +{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false }: @@ -14,6 +14,8 @@ let }; deleteKeychain = "security delete-keychain $keychainName"; + + _appName = if appName == null then name else appName; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -28,9 +30,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${_appName}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -53,7 +55,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -81,7 +83,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${_appName}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -96,7 +98,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${_appName}" universal '' else throw "Target: ${target} is not supported!"} From 2b1eff8e17ad7feff012d889b1d239eda963b1c7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 May 2013 15:17:37 +0200 Subject: [PATCH 095/193] Override the KitchenSink's appName --- .../mobile/titaniumenv/examples/kitchensink/default.nix | 1 + .../mobile/titaniumenv/examples/simulate-kitchensink/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 49ce9a2c9b5..b195bfcae7a 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -2,6 +2,7 @@ titaniumenv.buildApp { name = "KitchenSink-${target}"; + appName = "KitchenSink"; appId = "com.appcelerator.kitchensink"; src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index 380e67c800d..a5ab8d59a74 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -2,6 +2,7 @@ xcodeenv.simulateApp { name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; + appName = "KitchenSink"; app = kitchensink; inherit device; baseDir = "build/iphone/build/Debug-iphonesimulator"; From 8e724713c6f28abbd1aec5b3a8f460ab74261a84 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 29 May 2013 11:22:18 -0400 Subject: [PATCH 096/193] Make the function to import npm2nix-generated packages accessible outside of node-packages.nix Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ad26f96cbae..e38cd3e6936 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,13 +1,15 @@ { pkgs, stdenv, nodejs, fetchurl, neededNatives }: let - generated = builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: + inherit (self) buildNodePackage patchLatest; + + importGeneratedPackages = generated: nativeDeps: self: builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: (pkgs.lib.optional pkg.topLevel { name = pkg.baseName; value = builtins.getAttr pkg.fullName self; }) ++ [ { name = pkg.fullName; - value = self.buildNodePackage rec { + value = buildNodePackage rec { name = "${pkg.baseName}-${pkg.version}"; - src = (if pkg.patchLatest then self.patchLatest else fetchurl) { + src = (if pkg.patchLatest then patchLatest else fetchurl) { url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; sha256 = pkg.hash; }; @@ -16,14 +18,16 @@ let }; } ] ++ pairs - ) [] (import ./node-packages-generated.nix)); - - nativeDeps = { - "node-expat-*" = [ pkgs.expat ]; - "rbytes-0.0.2" = [ pkgs.openssl ]; - }; + ) [] generated); self = { + inherit importGeneratedPackages; + + nativeDeps = { + "node-expat-*" = [ pkgs.expat ]; + "rbytes-0.0.2" = [ pkgs.openssl ]; + }; + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { inherit stdenv nodejs neededNatives; inherit (pkgs) runCommand; @@ -40,5 +44,5 @@ let ''; /* Put manual packages below here (ideally eventually managed by npm2nix */ - } // generated; + } // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self; in self From 2f024a2ea9fb5e9185c52ee0fa02e9da925852af Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 29 May 2013 11:25:34 -0400 Subject: [PATCH 097/193] Update nodePackages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index e3c65b69f04..a185eaee1d0 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -102,9 +102,9 @@ } { baseName = "aws-sdk"; - version = "1.1.0"; + version = "1.2.0"; fullName = "aws-sdk-*"; - hash = "124577c90a78db03356b9e13e704f55b774ac165ba67d539a3d2170ae02fb32d"; + hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c"; patchLatest = true; topLevel = true; dependencies = [ @@ -1280,9 +1280,9 @@ } { baseName = "npm2nix"; - version = "1.1.0"; + version = "1.2.0"; fullName = "npm2nix-*"; - hash = "b592b5d94ea64b04ea21dd45902e3148f62f8234a75969604d37b35eb45abb21"; + hash = "b79bd319e4030704bb41078dbbec0db9eebb984966c6bd3cad55ba4c76ec622c"; patchLatest = false; topLevel = true; dependencies = [ From d749196f6829c56e5c573bcc4d6f8f82dbdee698 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 29 May 2013 11:53:36 -0400 Subject: [PATCH 098/193] buildNodePackage: Utilize the node setup hook Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index e90e9446846..5c75513496b 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${nodejs}/bin/npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} + npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} runHook postBuild ''; @@ -47,4 +47,10 @@ stdenv.mkDerivation ({ preFixup = '' find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' ''; -} // args) +} // args // { + # Run the node setup hook when this package is a build input + propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; + + # Make buildNodePackage useful with --run-env + nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps; +} ) From 08f8371a500e6186e0d05d28843a27f4f1263a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 19:12:06 +0200 Subject: [PATCH 099/193] Adding ahcpd. --- pkgs/tools/networking/ahcpd/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/ahcpd/default.nix diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix new file mode 100644 index 00000000000..635d94a3e86 --- /dev/null +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ahcpd-0.53"; + + src = fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4"; + }; + + preBuild = '' + makeFlags="PREFIX=$out ETCDIR=$out/etc" + sed -i -e s,etc,$out/etc, Makefile + ''; + + meta = { + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; + description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d28c20235b..9d5c96a3bf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -385,6 +385,8 @@ let aespipe = callPackage ../tools/security/aespipe { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; analog = callPackage ../tools/admin/analog {}; From 21cb347f20684d66e3b1293d68556cd2371696d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 19:15:49 +0200 Subject: [PATCH 100/193] Adding babeld. --- pkgs/tools/networking/babeld/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/babeld/default.nix diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix new file mode 100644 index 00000000000..6f773cd1f7d --- /dev/null +++ b/pkgs/tools/networking/babeld/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "babeld-1.4.1"; + + src = fetchurl { + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; + sha256 = "0ykyvg9kkbv5pnkivcv9ncdcsb8bp3gfxv8swpq9jc7bh9aa2ckp"; + }; + + preBuild = '' + makeFlags="PREFIX=$out ETCDIR=$out/etc" + ''; + + meta = { + homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; + description = "Loop-avoiding distance-vector routing protocol"; + license = "MIT"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d5c96a3bf4..fd9b92e7315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -479,6 +479,8 @@ let azureus = callPackage ../tools/networking/p2p/azureus { }; + babeld = callPackage ../tools/networking/babeld { }; + banner = callPackage ../games/banner {}; barcode = callPackage ../tools/graphics/barcode {}; From f54c4c99e3c9c45b6203e823d42cea19822cc2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 19:23:40 +0200 Subject: [PATCH 101/193] tcpdmup/libpcap udpate --- pkgs/development/libraries/libpcap/default.nix | 4 ++-- pkgs/tools/networking/tcpdump/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 73a7cd2e4bb..87e2a641654 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.2.1"; + name = "libpcap-1.4.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1gfy00zv6blplw3405q46khmjhdnp6ylblvygjjjk5skgvpscdd1"; + sha256 = "01klphfqxvkyjvic0hmc10qmiicqz6pv6kvb9s00kaz8f57jlskw"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index b4b96a549e1..f987d6fa6ba 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.2.1"; + name = "tcpdump-4.4.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1zwv9zp169dwqwwwi6lfd3fhiayiq81ijqmwi0pfdvw63skfjmsl"; + sha256 = "1g9h2p31xwpdg88v7wv9hc8calq8sjs25800vzd9i45q5knln9qj"; }; buildInputs = [ libpcap ]; From 4d682cc11201926cb60b7061d3f138e7ff1df277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 19:29:11 +0200 Subject: [PATCH 102/193] digikam: enable parallel building --- pkgs/applications/graphics/digikam/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index e64889ff52f..7b92d5e1690 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; + enableParallelBuilding = true; + meta = { description = "Photo Management Program"; license = "GPL"; From 8442c7d12230e5802258cbd7c683c2616e9e5dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 19:29:18 +0200 Subject: [PATCH 103/193] libgphoto2: adding a 2.4 version, for kde 4.7 and 4.8. --- pkgs/development/libraries/libgphoto2/2.4.nix | 30 +++++++++++++++++++ .../libraries/libgphoto2/default.nix | 18 +++++------ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/libgphoto2/2.4.nix diff --git a/pkgs/development/libraries/libgphoto2/2.4.nix b/pkgs/development/libraries/libgphoto2/2.4.nix new file mode 100644 index 00000000000..3edc8d0ac6c --- /dev/null +++ b/pkgs/development/libraries/libgphoto2/2.4.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: + +stdenv.mkDerivation rec { + name = "libgphoto2-2.4.14"; + + src = fetchurl { + url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + }; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ libtool libjpeg ]; + + # These are mentioned in the Requires line of libgphoto's pkg-config file. + propagatedBuildInputs = [ libusb libexif ]; + + meta = { + homepage = http://www.gphoto.org/proj/libgphoto2/; + description = "A library for accessing digital cameras"; + longDescription = '' + This is the library backend for gphoto2. It contains the code for PTP, + MTP, and other vendor specific protocols for controlling and transferring data + from digital cameras. + ''; + # XXX: the homepage claims LGPL, but several src files are lgpl21Plus + license = stdenv.lib.licenses.lgpl21Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 4a45804789b..3edc8d0ac6c 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: +{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.5.2"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg libxml2 ]; + buildInputs = [ libtool libjpeg ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb1 libexif ]; - - NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again + propagatedBuildInputs = [ libusb libexif ]; meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -22,10 +20,10 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd9b92e7315..c0595c205de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4361,6 +4361,8 @@ let libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; + libgphoto2_4 = callPackage ../development/libraries/libgphoto2/2.4.nix { }; + libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; }; @@ -8679,12 +8681,14 @@ let boost = boost149; eigen = eigen2; libotr = libotr_3_2; + libgphoto2 = libgphoto2_4; }) ../desktops/kde-4.7; kde48 = kdePackagesFor (pkgs.kde48 // { boost = boost149; eigen = eigen2; libotr = libotr_3_2; + libgphoto2 = libgphoto2_4; }) ../desktops/kde-4.8; kde410 = kdePackagesFor (pkgs.kde410 // { From 971337a119d708d78a152f4d918694e7b5a2b7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 21:42:32 +0200 Subject: [PATCH 104/193] firefox update to 21.0 --- .../networking/browsers/firefox/{20.0.nix => 21.0.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/applications/networking/browsers/firefox/{20.0.nix => 21.0.nix} (97%) diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/21.0.nix similarity index 97% rename from pkgs/applications/networking/browsers/firefox/20.0.nix rename to pkgs/applications/networking/browsers/firefox/21.0.nix index 1480a300820..1a23c9d9cf9 100644 --- a/pkgs/applications/networking/browsers/firefox/20.0.nix +++ b/pkgs/applications/networking/browsers/firefox/21.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "20.0"; + firefoxVersion = "21.0"; - xulVersion = "20.0"; # this attribute is used by other packages + xulVersion = "21.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; + sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0595c205de..2edc268319c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7202,12 +7202,12 @@ let firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); - firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { + firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); + firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; From 8a1409432e0991f931ceb13e890817ee810b783e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 29 May 2013 21:42:12 +0200 Subject: [PATCH 105/193] sourcery-codebench: fix installation of manpages Sourcery CodeBench manpages are installed under share/doc//man/. Add symlinks so that the manpages become available to "man". NOTE: I use symlinks instead of moving the manpages, because I think it is best to do as little as possible to prebuilt packages. --- pkgs/development/compilers/mentor/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index e053599e5dd..b12a197451a 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -37,6 +37,11 @@ let *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";; esac done + + # Manpages + mkdir -p "$out/share/man" + ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1" + ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7" ''; meta = with stdenv.lib; { From a17b45686b3f1ad656771848ab5bf3bc3c758e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 29 May 2013 23:20:57 +0200 Subject: [PATCH 106/193] Fixing firefox reference --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edc268319c..a69969fff0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7181,7 +7181,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox20Pkgs; + firefoxPkgs = pkgs.firefox21Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 14cd1be49840ad69ff1ad2e8fe1f46a493d3bc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 09:51:07 +0200 Subject: [PATCH 107/193] freecad: update to stable from February, 0.13.1830 --- pkgs/applications/graphics/freecad/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index c681bc415e3..340c9d0a69e 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,15 +1,14 @@ -{ fetchgit, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, +{ fetchurl, stdenv, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts, boost, zlib, python, swig, gfortran, soqt, libf2c, pyqt4, makeWrapper }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "git-20121213"; + version = "0.13.1830"; - src = fetchgit { - url = git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad; - rev = "d3949cedc7e3c924d426660515e06eaf55d1a67f"; - sha256 = "0a07ih0z5d8m69zasmvi7z4lgq0pa67k2g7r1l6nz2d0b30py61w"; + src = fetchurl { + url = "mirror://sourceforge/free-cad/${name}.tar.gz"; + sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a69969fff0b..70a8f9c0e8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7216,8 +7216,7 @@ let # !!! Fix the dependency on two different builds of nss. }; - freecad = callPackage ../applications/graphics/freecad { - }; + freecad = callPackage ../applications/graphics/freecad { }; freemind = callPackage ../applications/misc/freemind { jdk = jdk; From 2599ec692b4c9806244691773df0f3baf5074e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 09:55:08 +0200 Subject: [PATCH 108/193] gnunet-svn: slight update For not any special reason --- pkgs/applications/networking/p2p/gnunet/svn.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 9335778d3d2..4bff8239adf 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -4,14 +4,15 @@ , makeWrapper, autoconf, automake }: let - rev = "27314"; + rev = "27317"; in stdenv.mkDerivation rec { name = "gnunet-svn-${rev}"; src = fetchsvn { url = https://gnunet.org/svn/gnunet; - sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq"; + rev = "27317"; + sha256 = "1l7jypm57wjhzlwdj8xzhfppjdpy6wbph4nqgwxxb9q056wwf9zy"; }; buildInputs = [ From 1ddfbae86a1e9cd3a50e58a10f88455508c0bb07 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 May 2013 12:11:13 +0200 Subject: [PATCH 109/193] stunnel: Add explicit openssl reference (latest stunnel version did not build for me otherwise) --- pkgs/tools/networking/stunnel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cfc4b2497b7..cb93e8a504b 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation { }; buildInputs = [openssl]; + + configureFlags = [ + "--with-ssl=${openssl}" + ]; meta = { description = "Stunnel - Universal SSL wrapper"; From a7dbbd2e25f1980ea006912c755f858be31f82c2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 May 2013 12:11:57 +0200 Subject: [PATCH 110/193] New package: sbt 0.12.3, a Scala build tool --- .../tools/build-managers/sbt/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/build-managers/sbt/default.nix diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix new file mode 100644 index 00000000000..90045b97352 --- /dev/null +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, writeScript, bash, jre }: + +let + + sbt = writeScript "sbt.sh" '' + #!${bash}/bin/bash + ${jre}/bin/java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \ + -XX:MaxPermSize=384M -jar @out@/lib/sbt-launch.jar "$@" + ''; + +in stdenv.mkDerivation rec { + name = "sbt-${version}"; + + version = "0.12.3"; + + src = fetchurl { + url = "http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${version}/sbt.tgz"; + sha256 = "154ydaxd6ink5sy4flzpyh47nnhgkxwpzmml8q16am7655fpib08"; + }; + + installPhase = '' + mkdir -p $out/lib $out/bin + mv bin/sbt-launch.jar $out/lib/ + cp ${sbt} $out/bin/sbt + substituteInPlace $out/bin/sbt --replace @out@ $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70a8f9c0e8c..829d8a983bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3416,6 +3416,8 @@ let jre = jdk; }; + sbt = callPackage ../development/tools/build-managers/sbt { }; + scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; From 03b50b3335dfe44e83979d15d4ebf592ea9fead9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:51:13 +0200 Subject: [PATCH 111/193] haskell-monad-par: add version 0.3.4.2 --- .../libraries/haskell/monad-par/0.3.4.2.nix | 28 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix new file mode 100644 index 00000000000..ab875b34c36 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.2.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.2"; + sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs"; + 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 9f99a49dd6d..90918c53638 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1378,7 +1378,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; monadPar_0_3_4_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {}; - monadPar = self.monadPar_0_3_4_1; + monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {}; + monadPar = self.monadPar_0_3_4_2; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From e7975c0d33167027eed934a469406a3cf7cec70e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:51:38 +0200 Subject: [PATCH 112/193] git-annex: update to version 4.20130521 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index f8809d27cc4..737ee00aa00 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,14 +10,14 @@ }: let - version = "4.20130501"; + version = "4.20130521"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "https://github.com/joeyh/git-annex/tarball/${version}"; - sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl"; + sha256 = "0wa3sgw0xbqykl5r6ba0gannwj61y0h024glm0xjj97fy06b77i0"; name = "git-annex-${version}.tar.gz"; }; From 6fadcc2d6952229b780b098b86c651bc48b4c921 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 10:52:40 +0200 Subject: [PATCH 113/193] git-annex: disable building of the web application to fix the build in the presence of yesod 1.2 --- .../version-management/git-and-tools/git-annex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 737ee00aa00..7e8b57293b7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { makeFlagsArray=( PREFIX=$out CABAL=./Setup ) patchShebangs . ghc -O2 --make Setup - ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3 + ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -f-webapp -fassistant -fdbus -finotify -fwebdav -fs3 ''; doCheck = true; From de182afeae3ee8024290d6f76b3e80246c1d8883 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 114/193] haskell-asn1-types: update to version 0.2.0 --- pkgs/development/libraries/haskell/asn1-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 3dacaa6353f..a50ee82a38d 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.1.3"; - sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg"; + version = "0.2.0"; + sha256 = "0350g5p3zbvm29nnjd554i6fyc47vmzpb42w6q46v3i9fiy23kvd"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; From 0b433e463b9dd70dd3c5449585c96f0fb5bc5977 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 115/193] haskell-certificate: update to version 1.3.8 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 1de453b27ef..db314a12296 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.7"; - sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya"; + version = "1.3.8"; + sha256 = "1id3jfaisl04n1mjj9lbq3gyz8hyn3r9p9chzmfbra0pcj3vf1m0"; isLibrary = true; isExecutable = true; buildDepends = [ From ac1f88bef2c8b636b060a1a447fd36139ffec2d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:46 +0200 Subject: [PATCH 116/193] haskell-conduit: update to version 1.0.6 --- 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 983c41f57c9..6a12708ea33 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.5"; - sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65"; + version = "1.0.6"; + sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn"; buildDepends = [ liftedBase mmorph monadControl resourcet text transformers transformersBase void From 836b002fd8a912ab4ed99a662e34496c8a5f3a30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 117/193] haskell-criterion: update to version 0.8.0.0 --- .../libraries/haskell/criterion/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 004f74cd7e7..84eacff71a1 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,14 +1,15 @@ -{ cabal, aeson, deepseq, filepath, hastache, mtl, mwcRandom, parsec -, statistics, time, transformers, vector, vectorAlgorithms +{ cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl +, mwcRandom, parsec, statistics, time, transformers, vector +, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.2.1"; - sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5"; + version = "0.8.0.0"; + sha256 = "05v4glwvidsd4gm2jcvmlcpfaxg2x0fb69w051rbwg9scanrm7bf"; buildDepends = [ - aeson deepseq filepath hastache mtl mwcRandom parsec statistics - time transformers vector vectorAlgorithms + aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec + statistics time transformers vector vectorAlgorithms ]; meta = { homepage = "https://github.com/bos/criterion"; From 172b463f5a46e1620d62f87f82fa54b9d3a66811 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 118/193] haskell-crypto-pubkey-types: update to version 0.4.0 --- .../libraries/haskell/crypto-pubkey-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 38024a24c54..e4234d1d4cd 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.3.2"; - sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h"; + version = "0.4.0"; + sha256 = "0bapzvd0xgv38mbj1xhzcswchnx81sq0wwyax3qqzcpgvcyz28sl"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; From 1309b1d8b41989e5cc8b1e6b2c18c687de502357 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 119/193] haskell-crypto-pubkey: update to version 0.1.4 --- pkgs/development/libraries/haskell/crypto-pubkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index 48af6182c64..47e8dc179ae 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.1.3"; - sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g"; + version = "0.1.4"; + sha256 = "13ah3ip6gdv7b1zz5qwi7515a3k8pp3l0jr1kq4q2a0vqy24gkn1"; buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; From f51d2220cae4072e7202600565e3d5185d176171 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 120/193] haskell-digestive-functors-heist: update to version 0.7.0.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 0bff7f191b1..e2dc195b196 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,12 +3,11 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.6.2.1"; - sha256 = "1hs1qiaakxgv1lyd74cahqphrpqch1wayx0c9zpgjja3bnwjcj8n"; + version = "0.7.0.0"; + sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; - jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; From 8c3232f9258dafbf36a5a7c594723940922f3f2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 121/193] haskell-digestive-functors: update to version 0.6.1.0 --- .../haskell/digestive-functors/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 0b956680a84..98a2a7d3476 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,11 +1,16 @@ -{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: +{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.0.1"; - sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; + version = "0.6.1.0"; + sha256 = "0p38q8xz01vjn1mf718xi5ny3i7z9zd00lnnybmd6zy03laq4a2d"; buildDepends = [ mtl text ]; - testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; + testDepends = [ + HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; From 13a7b3f9696e5923dbd636e1f569dafbf6f650c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 122/193] haskell-ghc-mod: update to version 2.0.3 --- 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 4eaf0dcb782..fe0602bf888 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 = "2.0.2"; - sha256 = "1j2av7lcsnpizy6lyykk47rmm07rkfjyg9glfi7ma5cg082v15ni"; + version = "2.0.3"; + sha256 = "0f0n4cqpspad3ygw89rp8wj1gxb7mv5zrd8938zm1rn2mimihggr"; isLibrary = true; isExecutable = true; buildDepends = [ From bd9c8128ada2f2619b12c38d7e2b27654ca5571c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 123/193] haskell-gloss: update to version 1.7.8.3 --- pkgs/development/libraries/haskell/gloss/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index ededea21fcc..31128c382b6 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.2"; - sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; + version = "1.7.8.3"; + sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr"; buildDepends = [ bmp GLUT OpenGL ]; - jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From d7be6a93b8fe1a2856e3faf827fe13be22f646ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 124/193] haskell-hs-bibutils: update to version 5.0 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index 592862d49ef..adf136cd898 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.17.1"; - sha256 = "0qn3kibwwiaandmk672n9lki431934qahj81r4yj2acmyv6fcycf"; + version = "5.0"; + sha256 = "18gchn62g2cqzyj1nr8wd5i6smhq739g00cblkllj1jkni33ch2l"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; From 0ed2c83e5af29dd8f228b53c5f5e15063616e8ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:47 +0200 Subject: [PATCH 125/193] haskell-http-conduit: update to version 1.9.4 --- 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 3062c71dcf1..cea5708c269 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.3"; - sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk"; + version = "1.9.4"; + sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From b6b5bc27991a321532e622c0a9dbf9d0b5d2d060 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 126/193] haskell-liblastfm: update to version 0.2.0.0 --- .../libraries/haskell/liblastfm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index a07480551df..4e98aa82bc2 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,14 +1,15 @@ -{ cabal, aeson, attoparsec, cereal, cryptoApi, httpConduit -, httpTypes, HUnit, network, pureMD5, testFramework -, testFrameworkHunit, text +{ cabal, aeson, attoparsec, cereal, contravariant, cryptoApi +, httpConduit, httpTypes, HUnit, network, pureMD5, testFramework +, testFrameworkHunit, text, void }: cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.1.1.2"; - sha256 = "1zckgjc0r2s1s6s9s309dr2ri8bzj1fi8gcbhm3hifczq1v149w9"; + version = "0.2.0.0"; + sha256 = "1x147mry8pq8qzrhrsbxm4b7sb80c9900kq2igwvcskwszd5h56n"; buildDepends = [ - aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text + aeson cereal contravariant cryptoApi httpConduit httpTypes network + pureMD5 text void ]; testDepends = [ aeson attoparsec HUnit testFramework testFrameworkHunit text From bc8e70f8791b0b9b5521b810b75897bd5d2fd250 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 127/193] haskell-multiarg: update to version 0.16.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index f3b00a7efb2..d636ea7b542 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.14.0.0"; - sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb"; + version = "0.16.0.0"; + sha256 = "086mnhbp1d3n0xdn4cdlyrkkgrykg4bwhi7sbfdmn688qhpl3g9m"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; From a5d42ef934a69d81b47942f0834f7c0a9f16bc93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 128/193] haskell-network-protocol-xmpp: update to version 0.4.5 --- .../libraries/haskell/network-protocol-xmpp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index 304017d3d24..910d2cc6774 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "network-protocol-xmpp"; - version = "0.4.4"; - sha256 = "0l2s412aazli80jszdl1am01z14a0q2z8fsxxjawk4cy70d6f4ry"; + version = "0.4.5"; + sha256 = "1phnd9nygpc8gmyriwaqjnvygxi5zg4nx2i1m3vwwxql221420gg"; buildDepends = [ gnuidn gnutls gsasl libxmlSax monadsTf network text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; From fc02ddca524fa47df650ee12ab23c5903c37d89d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 129/193] haskell-parseargs: update to version 0.1.3.5 --- pkgs/development/libraries/haskell/parseargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index 4287015115c..2a481246e88 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "parseargs"; - version = "0.1.3.4"; - sha256 = "1n55ay42qiwm72fa63xbz5m5fi0ld5dr3vypmyz5mc0zzhqwxz2j"; + version = "0.1.3.5"; + sha256 = "1ig1n2nnicmy71qwcl5hkdk4mvwq0mz6zr5h9kw329lgvr9cyzyc"; isLibrary = true; isExecutable = true; meta = { From e539c38a21902c6245763eabe1af137abc4e9590 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 130/193] haskell-persistent-postgresql: update to version 1.2.0 --- .../haskell/persistent-postgresql/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 251db960506..c7d6b532db6 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,16 +1,15 @@ -{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq -, postgresqlSimple, text, time, transformers +{ cabal, aeson, blazeBuilder, conduit, monadControl, persistent +, postgresqlLibpq, postgresqlSimple, text, time, transformers }: cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.3.1"; - sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk"; + version = "1.2.0"; + sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6"; buildDepends = [ - aeson conduit monadControl persistent postgresqlLibpq + aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; From 2bd5a628dcc74f131d6c5cca35a4aafab15865ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 131/193] haskell-persistent-sqlite: update to version 1.2.0 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 947f75342d4..bb7a6731a26 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.5"; - sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl"; + version = "1.2.0"; + sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h"; buildDepends = [ aeson conduit monadControl monadLogger persistent text transformers ]; From dc7f1b2df19a2fc33da77b212af26e0d7f215783 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 132/193] haskell-persistent-template: update to version 1.2.0.1 --- .../haskell/persistent-template/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 396f51f69cb..f3ab1800dae 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,12 +1,14 @@ -{ cabal, aeson, hspec, monadControl, persistent, QuickCheck, text -, transformers +{ cabal, aeson, hspec, monadControl, monadLogger, persistent +, QuickCheck, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.3.1"; - sha256 = "0171x8mv3ff9ppllkp3mgpwa8p1zg3y6fykq70z9h0hx1ny0407p"; - buildDepends = [ aeson monadControl persistent text transformers ]; + version = "1.2.0.1"; + sha256 = "1l8ws4mijl0cwcl14ms8hibfgcn3y6b1679xc0cdyz1ifiymkdns"; + buildDepends = [ + aeson monadControl monadLogger persistent text transformers + ]; testDepends = [ aeson hspec persistent QuickCheck text ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From c3aa81cd0eb6499a6a7db23f5a88cb61b8ad2c13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 133/193] haskell-persistent: update to version 1.2.0.1 --- .../libraries/haskell/persistent/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 036deebae20..79fd1f6f781 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,15 +7,19 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.5.1"; - sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz"; + version = "1.2.0.1"; + sha256 = "1bs74g1fkwq4wvz18lp0ial6z58vpslgv0rqdn91ka6gw8k4fvlb"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit resourcet silently text time transformers transformersBase unorderedContainers vector ]; - testDepends = [ hspec text ]; + testDepends = [ + aeson attoparsec base64Bytestring blazeHtml conduit hspec + monadControl monadLogger pathPieces resourcet text time + transformers unorderedContainers vector + ]; extraLibraries = [ sqlite ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 0853a818252ed792a35c47b56d57e739cf4649e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:48 +0200 Subject: [PATCH 134/193] haskell-postgresql-simple: update to version 0.3.3.0 --- .../libraries/haskell/postgresql-simple/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 81a5f67c45b..0a40cdf7a96 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,13 +5,15 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.4.1"; - sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3"; + version = "0.3.3.0"; + sha256 = "0srkalfg41gdnzwwa2bmwwrcdqnw13f7b94wv4d5a6sg6yf1ry1l"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector ]; - testDepends = [ base16Bytestring cryptohash HUnit text time ]; + testDepends = [ + base16Bytestring cryptohash HUnit text time vector + ]; doCheck = false; meta = { description = "Mid-Level PostgreSQL client library"; From 4ca19f846bca7712fa9bdc1e6df4989f288d6acd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 135/193] haskell-statistics: update to version 0.10.4.1 --- .../libraries/haskell/statistics/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 4576a447fde..54876a879fc 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,16 +1,16 @@ -{ cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar -, mwcRandom, primitive, QuickCheck, testFramework +{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions +, monadPar, mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector -, vectorAlgorithms +, vectorAlgorithms, vectorBinaryInstances }: cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.3.1"; - sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s"; + version = "0.10.4.1"; + sha256 = "0kd3zn8ckz3h9dnighmfviacw5cy6czsj90ryn8c0h6yb2s3gqi1"; buildDepends = [ - deepseq erf mathFunctions monadPar mwcRandom primitive vector - vectorAlgorithms + binary deepseq erf mathFunctions monadPar mwcRandom primitive + vector vectorAlgorithms vectorBinaryInstances ]; testDepends = [ erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck From 80093a4d8d673ffcbc6903b5bf4b2645f3faa41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 136/193] haskell-stm-conduit: update to version 2.0.0 --- pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 778d333c956..5a5470251b1 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "1.1.0"; - sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7"; + version = "2.0.0"; + sha256 = "015gz4fqijgcs6dls5l8ry47q4a33a6ik0hsj5mw48iw44af39jr"; buildDepends = [ conduit resourcet stm stmChans transformers ]; testDepends = [ conduit HUnit QuickCheck stm stmChans testFramework From 43c6a39ca3b23b5fa65affe36998bdda2c9e750c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 137/193] haskell-tls-extra: update to version 0.6.3 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index c9ab989ed76..b3c1c884dc9 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.1"; - sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; + version = "0.6.3"; + sha256 = "1ng8h3v5px63fpb4y3sd47djzpksyzzavilsdnp1kd453abpmx9l"; isLibrary = true; isExecutable = true; buildDepends = [ From bdd7ce87c2d0e82f5baaf581c4999fe4ccc92724 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 138/193] haskell-wai-extra: update to version 1.3.4.2 --- 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 4be1beecafd..3192def654e 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.4"; - sha256 = "1ay82q58pizc48rh4d8z7ybf2jjvzxqylj6mx34nvrxxlmxf5gfx"; + version = "1.3.4.2"; + sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes From f12cadb586acdc70e3d581df4cb28fbe73daf683 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 139/193] haskell-wai-logger: update to version 0.3.1 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 16f02f87746..f6035269112 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.3.0"; - sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq"; + version = "0.3.1"; + sha256 = "0x1d67fcfpjrgyjr7hipifqrzk13x8z8xmlj7h999r8mswijhgii"; buildDepends = [ blazeBuilder byteorder caseInsensitive dateCache fastLogger httpTypes network wai From 5aa1b5294f273dea33d60ec12e19957307df8071 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 140/193] haskell-wai: update to version 1.4.0.1 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index deb1090dd4a..9b3b1083bc0 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.0"; - sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq"; + version = "1.4.0.1"; + sha256 = "1d08mp7dpf8iw50yjysr5p7fc9jgdcwql943p9c11x35n2ks6z2n"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 7c46aed8d96fcf9906bc9cefacc199f8b641f6f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 141/193] haskell-warp: update to version 1.3.8.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0f3956dfe6e..3cf1f8e6ba6 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 = "1.3.8.1"; - sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x"; + version = "1.3.8.2"; + sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 496c7cfa6243b0d0f75efcae4f0354ed9e594315 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 142/193] haskell-xdot: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/xdot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 27aaad02b35..130402ec75b 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.3"; - sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy"; + version = "0.2.3.1"; + sha256 = "1gricrnssxgzaq1z7nnyppmz284nix0m89477x22mal125pkcf7n"; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; - jailbreak = true; meta = { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = self.stdenv.lib.licenses.bsd3; From 9739c773913b0b11b7bb498631f92759342f1468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 143/193] haskell-yesod-auth: update to version 1.2.0.1 --- .../libraries/haskell/yesod-auth/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index c93a507e28b..22f1c583011 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,21 +1,21 @@ -{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed -, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network -, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA -, shakespeareCss, shakespeareJs, text, transformers -, unorderedContainers, wai, yesodCore, yesodForm, yesodJson -, yesodPersistent +{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, dataDefault +, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes +, liftedBase, mimeMail, network, persistent, persistentTemplate +, pureMD5, pwstoreFast, random, resourcet, SHA, shakespeareCss +, shakespeareJs, text, transformers, unorderedContainers, wai +, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.7"; - sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn"; + version = "1.2.0.1"; + sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd"; buildDepends = [ - aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet - httpConduit httpTypes liftedBase mimeMail network persistent - persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss - shakespeareJs text transformers unorderedContainers wai yesodCore - yesodForm yesodJson yesodPersistent + aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate + fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network + persistent persistentTemplate pureMD5 pwstoreFast random resourcet + SHA shakespeareCss shakespeareJs text transformers + unorderedContainers wai yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From c4260c58bda40f0d9900005586969420ad7a8ced Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 144/193] haskell-yesod-core: update to version 1.2.1 --- .../libraries/haskell/yesod-core/default.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index fff50366233..7518e6ff82a 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,29 +1,30 @@ -{ cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup -, caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase -, monadControl, monadLogger, parsec, pathPieces, QuickCheck, random -, resourcet, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, text, time, transformers, transformersBase, vector -, wai, waiExtra, waiTest, yesodRoutes +{ cabal, aeson, attoparsecConduit, blazeBuilder, blazeHtml +, blazeMarkup, caseInsensitive, cereal, clientsession, conduit +, cookie, dataDefault, failure, fastLogger, hamlet, hspec +, 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 }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.8.3"; - sha256 = "116vglpqh2561g0gzhm4ijwx829c50ai1hh715vwi5j5i01y2rkr"; + version = "1.2.1"; + sha256 = "1p9xaw0d9dx68q7i99kjcqy1lhmd164drbcw3489560wa71mwamk"; buildDepends = [ - aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal - clientsession conduit cookie failure fastLogger hamlet httpTypes - liftedBase monadControl monadLogger parsec pathPieces random - resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs - text time transformers transformersBase vector wai waiExtra - yesodRoutes + 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 ]; testDepends = [ - blazeBuilder conduit hamlet hspec httpTypes HUnit QuickCheck random - shakespeareCss shakespeareJs text transformers wai waiTest + blazeBuilder conduit hamlet hspec httpTypes HUnit liftedBase + QuickCheck random resourcet shakespeareCss shakespeareJs text + transformers wai waiTest ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From 6dbbd1822b86158f7b0fdbd1a79082e9bb0405d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:49 +0200 Subject: [PATCH 145/193] haskell-yesod-default: update to version 1.2.0 --- .../libraries/haskell/yesod-default/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index b0e720ff487..58ea0b10a22 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,20 +1,13 @@ -{ cabal, dataDefault, hamlet, networkConduit, safe, shakespeareCss -, shakespeareJs, text, transformers, unorderedContainers, wai -, waiExtra, warp, yaml, yesodCore -}: +{ cabal, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.3.2"; - sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg"; - buildDepends = [ - dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs - text transformers unorderedContainers wai waiExtra warp yaml - yesodCore - ]; + version = "1.2.0"; + sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk"; + buildDepends = [ yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; - description = "Default config and main functions for your yesod application"; + description = "Default config and main functions for your yesod application (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 2ba8e44f48f815294b4135a77751c49f73e03cd9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 146/193] haskell-yesod-form: update to version 1.3.0 --- .../libraries/haskell/yesod-form/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index adf11916b90..d693cd1d0a4 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,18 +1,18 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , cryptoApi, dataDefault, emailValidate, hamlet, hspec, network -, persistent, shakespeareCss, shakespeareJs, text, time +, persistent, resourcet, shakespeareCss, shakespeareJs, text, time , transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1.3"; - sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq"; + version = "1.3.0"; + sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi - dataDefault emailValidate hamlet network persistent shakespeareCss - shakespeareJs text time transformers wai xssSanitize yesodCore - yesodPersistent + dataDefault emailValidate hamlet network persistent resourcet + shakespeareCss shakespeareJs text time transformers wai xssSanitize + yesodCore yesodPersistent ]; testDepends = [ hspec text time ]; meta = { From 830630d011f42ad889fc54fcdf7b59b47a271f65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 147/193] haskell-yesod-json: update to version 1.2.0 --- .../libraries/haskell/yesod-json/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index b395645557b..780444bd861 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,20 +1,13 @@ -{ cabal, aeson, attoparsecConduit, blazeBuilder, conduit, hspec -, safe, shakespeareJs, text, transformers, vector, wai, waiExtra -, waiTest, yesodCore, yesodRoutes -}: +{ cabal, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.1.2.2"; - sha256 = "1bl4rs3biv2man0n8ijldil32lyswjqk5ykz0nv06qsaaafjpc3g"; - buildDepends = [ - aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs - text transformers vector wai waiExtra yesodCore yesodRoutes - ]; - testDepends = [ hspec text waiTest yesodCore ]; + version = "1.2.0"; + sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw"; + buildDepends = [ yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; - description = "Generate content for Yesod using the aeson package"; + description = "Generate content for Yesod using the aeson package. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 4aa35f4d29ecd3f1a39eb237b4a3c5225178e37e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 148/193] haskell-yesod-persistent: update to version 1.2.0 --- .../haskell/yesod-persistent/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index e69bc2a5127..1f0b330ff2c 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,11 +1,19 @@ -{ cabal, persistent, persistentTemplate, transformers, yesodCore }: +{ cabal, blazeBuilder, conduit, hspec, liftedBase, persistent +, persistentSqlite, persistentTemplate, poolConduit, resourcet +, text, transformers, waiTest, yesodCore +}: cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.1.0.1"; - sha256 = "0kgd1b7kaif644hjbvkc53yxr7qk310zdndypd9h0j31paw52k1p"; + version = "1.2.0"; + sha256 = "1gzzs62mnx2q15sm3hvlk18qjgk3bi828klgl2ckc0462f7z8d0k"; buildDepends = [ - persistent persistentTemplate transformers yesodCore + blazeBuilder conduit liftedBase persistent persistentTemplate + poolConduit resourcet transformers yesodCore + ]; + testDepends = [ + blazeBuilder conduit hspec persistent persistentSqlite text waiTest + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 0f2e38e54a74ca0cb2776fbbf6a2487753e4d859 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 149/193] haskell-yesod-routes: update to version 1.2.0 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 0ebfeb92bf1..44d728ffcfd 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.1.2"; - sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; + version = "1.2.0"; + sha256 = "1d7z0v6jrl08w7qz3apwdjss3vq151y28l7231cpqiia46damib2"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { From b39fb32d6e09be462bdb406aaa8b419cfc764b50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 150/193] haskell-yesod-static: update to version 1.2.0 --- .../haskell/yesod-static/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index ff514a9a599..d341434345b 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,21 +1,24 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, hspec, httpTypes, systemFilepath, text -, transformers, unixCompat, wai, waiAppStatic, yesodCore +, cryptohash, dataDefault, fileEmbed, hspec, httpTypes +, shakespeareCss, systemFileio, systemFilepath, text, transformers +, unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2.3"; - sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh"; + version = "1.2.0"; + sha256 = "18fkphk8qzshm5r0ivdvllmbmvl5q6m84zsf1g0fmridqz2xywjz"; buildDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - httpTypes systemFilepath text transformers unixCompat wai - waiAppStatic yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash + dataDefault fileEmbed httpTypes shakespeareCss systemFileio + systemFilepath text transformers unixCompat wai waiAppStatic + yesodCore ]; testDepends = [ - base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - hspec httpTypes systemFilepath text transformers unixCompat wai - waiAppStatic yesodCore + base64Bytestring cereal conduit cryptoConduit cryptohash + dataDefault fileEmbed hspec httpTypes shakespeareCss systemFileio + systemFilepath text transformers unixCompat wai waiAppStatic + yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From f60f7b0ac821e3cec36b78b4b7cfe41cb10b15fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 151/193] haskell-yesod-test: update to version 1.2.0 --- .../libraries/haskell/yesod-test/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 8b32b48af87..f32e90dab17 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,20 +1,23 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, poolConduit, text, time -, transformers, wai, waiTest, xmlConduit, xmlTypes +, transformers, wai, waiTest, xmlConduit, xmlTypes, yesodCore +, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.5"; - sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j"; + version = "1.2.0"; + sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network persistent poolConduit text time transformers wai waiTest - xmlConduit xmlTypes + xmlConduit xmlTypes yesodCore + ]; + testDepends = [ + hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm ]; - testDepends = [ hspec htmlConduit HUnit xmlConduit ]; meta = { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; From 982c74a555653b4ee46ac28894ec48463de318c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:01:50 +0200 Subject: [PATCH 152/193] haskell-yesod: update to version 1.2.0.1 --- .../libraries/haskell/yesod/default.nix | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index b118ce951b0..53dc5cab87c 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,31 +1,18 @@ -{ cabal, aeson, attoparsec, base64Bytestring, blazeBuilder -, blazeHtml, blazeMarkup, Cabal, conduit, fileEmbed, filepath -, fsnotify, ghcPaths, hamlet, httpConduit, httpReverseProxy -, httpTypes, liftedBase, monadControl, network, networkConduit -, optparseApplicative, parsec, projectTemplate, resourcet -, shakespeare, shakespeareCss, shakespeareJs, shakespeareText -, split, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unorderedContainers, wai, waiExtra -, warp, yaml, yesodAuth, yesodCore, yesodDefault, yesodForm -, yesodJson, yesodPersistent, zlib +{ cabal, aeson, blazeHtml, blazeMarkup, dataDefault, hamlet +, monadControl, networkConduit, safe, shakespeareCss, shakespeareJs +, text, transformers, unorderedContainers, wai, waiExtra, warp +, yaml, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.9.3"; - sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41"; - isLibrary = true; - isExecutable = true; + version = "1.2.0.1"; + sha256 = "1whkw0lmkyja2j6vbfcf5rjmmhmc85r4arjwjrvdmz6jkjyqham3"; buildDepends = [ - aeson attoparsec base64Bytestring blazeBuilder blazeHtml - blazeMarkup Cabal conduit fileEmbed filepath fsnotify ghcPaths - hamlet httpConduit httpReverseProxy httpTypes liftedBase - monadControl network networkConduit optparseApplicative parsec - projectTemplate resourcet shakespeare shakespeareCss shakespeareJs - shakespeareText split systemFileio systemFilepath tar text time - transformers unixCompat unorderedContainers wai waiExtra warp yaml - yesodAuth yesodCore yesodDefault yesodForm yesodJson - yesodPersistent zlib + aeson blazeHtml blazeMarkup dataDefault hamlet monadControl + networkConduit safe shakespeareCss shakespeareJs text transformers + unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore + yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From f902fe1f68140a4d2dd61800b183164185aabcf0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:02:18 +0200 Subject: [PATCH 153/193] haskell-monad-par: drop obsolete version 0.3.4.1 --- .../libraries/haskell/monad-par/0.3.4.1.nix | 28 ------------------- pkgs/top-level/haskell-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.1.nix deleted file mode 100644 index 3fc819542eb..00000000000 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.1.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.1"; - sha256 = "0v0gnxzv49zvmgm2cb20dlb8m7mn4chpwrc61g4zp69nabjpwwm8"; - 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 90918c53638..82154f85ef9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1377,7 +1377,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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_1 = callPackage ../development/libraries/haskell/monad-par/0.3.4.1.nix {}; monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {}; monadPar = self.monadPar_0_3_4_2; From 6039e98991ba3cdbfa89b27b6e337fdbff0e1c6b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:09:13 +0200 Subject: [PATCH 154/193] pkgs/top-level/release.nix: build GHC 7.6.3 instead of 7.6.2 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f7c2ac399a4..11102f89155 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -383,7 +383,7 @@ let ghc = ghcSupported; }; - haskellPackages_ghc762 = { + haskellPackages_ghc763 = { ghc = ghcSupported; }; From 8dbe2decf9b9773a5d8cad8a806cc05d54c60fb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:11:39 +0200 Subject: [PATCH 155/193] Switch default Haskell implementation to Haskell Platform 2013.2.0.0. This makes GHC 7.6.3 is our default compiler. --- pkgs/top-level/all-packages.nix | 20 ++++++++++---------- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 829d8a983bf..ad38930d467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2501,9 +2501,9 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.4.2. - haskellPackages = haskellPackages_ghc742; - # Current Haskell Platform: 2012.4.0.0 + # Current default version: 7.6.3. + haskellPackages = haskellPackages_ghc763; + # Current Haskell Platform: 2013.2.0.0 haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = haskell.packages_ghc6104; @@ -2516,17 +2516,17 @@ let haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; + haskellPackages_ghc741 = haskell.packages_ghc741; + haskellPackages_ghc742 = haskell.packages_ghc742; + haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc762 = haskell.packages_ghc762; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); - haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = haskell.packages_ghc762; - haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763; + haskellPackages_ghc763_no_profiling = recurseIntoAttrs (haskell.packages_ghc763.noProfiling); + haskellPackages_ghc763_profiling = recurseIntoAttrs (haskell.packages_ghc763.profiling); + haskellPackages_ghc763 = recurseIntoAttrs (haskell.packages_ghc763.highPrio); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 82154f85ef9..988ec9a53a6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,7 +135,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # GHC version, change the "preferences function" for that GHC version # in haskell-defaults.nix. - # NOTE: 2012.4.0.0 is the current default. + # NOTE: 2013.2.0.0 is the current default. haskellPlatformArgs_future = self : { inherit (self) cabal ghc; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 67647e11cca..9a3bae89f9c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -11,8 +11,8 @@ let ghc704 = "ghc704"; ghc742 = "ghc742"; ghc763 = "ghc763"; - default = [ ghc742 ]; - latest = [ ghc763 ]; + default = [ ghc763 ]; + latest = [ ]; all = [ ghc6104 ghc6123 ghc704 ghc742 ghc763 ]; allBut = platform: pkgs.lib.filter (x: platform != x) all; From fb45ff999406d40c35cca6e492f0d24a319f67e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:12:59 +0200 Subject: [PATCH 156/193] haskell-binary: prefer the version from Hackage over that shipped with GHC The binary package shipped with GHC is ancient, and some software (like statistics and criterion) doesn't compile with it. --- pkgs/top-level/haskell-defaults.nix | 5 ----- pkgs/top-level/haskell-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 10b0347127e..371ee72bd1f 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -18,35 +18,30 @@ ghcHEADPrefs = self : self.haskellPlatformArgs_future self // { haskellPlatform = null; - binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc763Prefs = self : self.haskellPlatformArgs_2013_2_0_0 self // { haskellPlatform = self.haskellPlatform_2013_2_0_0; - binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; - binary = null; # now a core package cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; - binary = null; # now a core package cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; ghc722Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; - binary = null; # a core package deepseq = self.deepseq_1_3_0_1; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 988ec9a53a6..252bef7d6d8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -589,8 +589,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bimap = callPackage ../development/libraries/haskell/bimap {}; - binary_hackage = callPackage ../development/libraries/haskell/binary {}; - binary = self.binary_hackage; # core package since ghc-7.2.1 + binary = callPackage ../development/libraries/haskell/binary {}; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; From 143c64732ceb5b19225721a6db925607df95c9a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:13:11 +0200 Subject: [PATCH 157/193] all-packages.nix: tabs --> blanks --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad38930d467..ac9fed3d382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6905,9 +6905,9 @@ let # A variant of the Darcs derivation that containts only the executable and # thus has no dependencies on other Haskell packages. cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { - isLibrary = false; - configureFlags = "-f-library"; }); }.final; - }; + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; }; darktable = callPackage ../applications/graphics/darktable { From 0d6f43f2c84668ce9f8ea40d9ad093e242938e10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:17:40 +0200 Subject: [PATCH 158/193] haskell-digestive-functors: jailbreak to fix the build --- .../development/libraries/haskell/digestive-functors/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 98a2a7d3476..1d3f31e5568 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { HUnit mtl QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; From 79fe788106ee0ddac175e87210c4221f4ccb96d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:19:40 +0200 Subject: [PATCH 159/193] haskell-symbol: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/symbol/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index d82a1968878..e92c2ec03ad 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.4"; sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn"; buildDepends = [ deepseq syb ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A 'Symbol' type for fast symbol comparison"; From 709718a30773c9b5aac8916d103bd2372e7420ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 11:20:11 +0200 Subject: [PATCH 160/193] haskell-happstack-util: drop obsolete package --- .../haskell/happstack/happstack-util.nix | 23 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/happstack/happstack-util.nix diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix deleted file mode 100644 index 8dfac311a9a..00000000000 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, extensibleExceptions, filepath, hslogger, mtl, network -, parsec, random, time, unixCompat -}: - -cabal.mkDerivation (self: { - pname = "happstack-util"; - version = "6.0.3"; - sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - extensibleExceptions filepath hslogger mtl network parsec random - time unixCompat - ]; - jailbreak = true; - meta = { - homepage = "http://happstack.com"; - description = "Web framework"; - 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 252bef7d6d8..01c185cff12 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1071,8 +1071,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hamlet = callPackage ../development/libraries/haskell/hamlet {}; - happstackUtil = callPackage ../development/libraries/haskell/happstack/happstack-util.nix {}; - happstackServer = callPackage ../development/libraries/haskell/happstack/happstack-server.nix {}; happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9a3bae89f9c..1bf2127a86d 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -183,7 +183,6 @@ mapHaskellTestOn { hamlet = default; happstackHamlet = default; happstackServer = default; - happstackUtil = default; happy = all; hashable = default; hashedStorage = default; From d7c578285aa3b3418649008d971e68015c9d6e41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:09:00 +0200 Subject: [PATCH 161/193] haskell-wx-direct: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index a1caaef1bc9..08512c20625 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ parsec strict time ]; + patchPhase = '' + sed -i -e 's|containers >=.*|containers|' wxdirect.cabal + ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; From d9c5a29897b3c24f89a9ff8a1709cb699065f8d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:09:44 +0200 Subject: [PATCH 162/193] haskell-gloss: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/gloss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 31128c382b6..003207e77ae 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.7.8.3"; sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr"; buildDepends = [ bmp GLUT OpenGL ]; + jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; From ff1dbd50b80941edb267358df8890fc03ebc663b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:15:02 +0200 Subject: [PATCH 163/193] haskell-HFuse: fix capitalization of directory name --- pkgs/development/libraries/haskell/{hfuse => HFuse}/default.nix | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/haskell/{hfuse => HFuse}/default.nix (100%) diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/hfuse/default.nix rename to pkgs/development/libraries/haskell/HFuse/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 01c185cff12..b3f866895b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1143,7 +1143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); heist = callPackage ../development/libraries/haskell/heist {}; - HFuse = callPackage ../development/libraries/haskell/hfuse {}; + HFuse = callPackage ../development/libraries/haskell/HFuse {}; highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {}; From 36aaa263d3b83911f378bf9250e3fe041eb0dac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:16:26 +0200 Subject: [PATCH 164/193] cabal2ghci: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/tools/haskell/cabal2ghci/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index 881328d875b..cd7bf9dc9d1 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { Cabal cmdargs stylishHaskell systemFileio systemFilepath text unorderedContainers yaml ]; + jailbreak = true; meta = { description = "A tool to generate .ghci file from .cabal"; license = self.stdenv.lib.licenses.bsd3; From c009bddb19210493138811fed75a256007bfe1fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:16:59 +0200 Subject: [PATCH 165/193] haskell-language-c-quote: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/language-c-quote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 4c281642277..35d15c0291a 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { HUnit srcloc symbol testFramework testFrameworkHunit ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; From 93eb171838ca7eca25f3d6b99227da0d4b10b766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:10 +0200 Subject: [PATCH 166/193] Hipmunk: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index fee71449142..c07060cf197 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "5.2.0.10"; sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95"; buildDepends = [ StateVar transformers ]; + patchPhase = '' + sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal + ''; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; From 41f9d7d83cce13c181aca03dd3e08b3116f3a801 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:20 +0200 Subject: [PATCH 167/193] benchpress: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/benchpress/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index c80f04f966d..9218e50b767 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.2.6"; sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg"; buildDepends = [ mtl time ]; + jailbreak = true; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; From 3eab69da503e7679f6f699039673352a16c718d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:17:29 +0200 Subject: [PATCH 168/193] haskell-distributed-process: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- .../libraries/haskell/distributed-process/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index d23a5ef0228..95f7993da22 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { testFrameworkHunit ]; noHaddock = true; + jailbreak = true; doCheck = false; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; From 4f6d1ad646cdfe1710e29de38a6fa378d9144382 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:29:29 +0200 Subject: [PATCH 169/193] haskell-packages.nix: fix spelling of type-level-numbers attribute --- pkgs/top-level/haskell-packages.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b3f866895b6..b78e423d869 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1927,7 +1927,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); typeEquality = callPackage ../development/libraries/haskell/type-equality {}; - typeLlevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; unbound = callPackage ../development/libraries/haskell/unbound {}; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 1bf2127a86d..790e1c5ff2c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -386,7 +386,7 @@ mapHaskellTestOn { transformersBase = default; transformersCompat = default; tuple = default; - typeLlevelNaturalNumber = default; + typeLevelNaturalNumber = default; uniplate = default; uniqueid = default; unixCompat = default; From 7b48b3acf6bc294d7c8878cf79fed515820afc98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 May 2013 12:35:18 +0200 Subject: [PATCH 170/193] haskell-wx-core: jailbreak to fix build with Haskell Platform 2013.2.0.0 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 98032d91c8e..5dde5e8fc3f 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -8,6 +8,9 @@ cabal.mkDerivation (self: { sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; + patchPhase = '' + sed -i -e 's|containers >=.*|containers|' wxcore.cabal + ''; meta = { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; From 03d4faa703feb8ed887d654be0a72ae4cf25104d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 30 May 2013 13:30:30 +0200 Subject: [PATCH 171/193] bittorrentSync: fix hash --- pkgs/applications/networking/bittorrentsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 842dd8a8826..ae339abb799 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -16,7 +16,7 @@ let version = "1.0.134"; sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7" - else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt" + else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From 1f4c75f9e8af11b5568df0304f008dd6054733c4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 15:02:36 +0200 Subject: [PATCH 172/193] Update euca2ools to 2.1.3 --- pkgs/tools/virtualization/euca2ools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ce84706c356..ae488b0f359 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -1,17 +1,19 @@ { stdenv, fetchgit, which, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "euca2ools-2.0.0-pre-20111230"; + name = "euca2ools-2.1.3"; namePrefix = ""; src = fetchgit { url = https://github.com/eucalyptus/euca2ools.git; - rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e"; - sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09"; + rev = "8ae2ecc"; + sha256 = "caef5a3e2c9b515fd815034b5b7304acc878a0b9777ae4208dc033b0bf39da2b"; }; pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ]; + doCheck = false; + meta = { homepage = http://open.eucalyptus.com/downloads; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; From 7c3c250a2cfe7527ad5d0bbe6f5a22ed898ef191 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 15:05:39 +0200 Subject: [PATCH 173/193] Add snort-2.9.4.6 --- .../networking/ids/daq/default.nix | 19 +++++++++++++++++++ .../networking/ids/snort/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/ids/daq/default.nix create mode 100644 pkgs/applications/networking/ids/snort/default.nix diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix new file mode 100644 index 00000000000..92175bb23e9 --- /dev/null +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, flex, bison, libpcap}: + +stdenv.mkDerivation rec { + name = "daq-2.0.0"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = http://www.snort.org/downloads/2311; + sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv"; + }; + + buildInputs = [ flex bison libpcap ]; + + meta = { + description = "Data AcQuisition library (DAQ), for packet I/O"; + homepage = http://www.snort.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix new file mode 100644 index 00000000000..b674f3a83fb --- /dev/null +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: + +stdenv.mkDerivation rec { + name = "snort-2.9.4.6"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = http://www.snort.org/downloads/2320; + sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang"; + }; + + buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; + + meta = { + description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; + homepage = http://www.snort.org; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac9fed3d382..5a7b082863e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -652,6 +652,8 @@ let dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { }; + daq = callPackage ../applications/networking/ids/daq { }; + dar = callPackage ../tools/archivers/dar { }; davfs2 = callPackage ../tools/filesystems/davfs2 { }; @@ -1634,6 +1636,8 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + snort = callPackage ../applications/networking/ids/snort { }; + snx = callPackage_i686 ../tools/networking/snx { inherit (pkgsi686Linux) pam gcc33; inherit (pkgsi686Linux.xlibs) libX11; From 316e78098ce0a940c3af775e2fe10da57e483539 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 30 May 2013 09:05:55 -0400 Subject: [PATCH 174/193] Add mkdirp as a top-level nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 14 ++++++++++++-- pkgs/top-level/node-packages.json | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index a185eaee1d0..62773f16f56 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1064,6 +1064,16 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-*"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "mkdirp"; version = "0.3.5"; @@ -1322,9 +1332,9 @@ } { baseName = "optimist"; - version = "0.5.0"; + version = "0.5.1"; fullName = "optimist-*"; - hash = "b0c4b65a456618f179946e0b0641643b9d70ea5d884afa5bbf94419f740b1ccf"; + hash = "89307bc0c5f010a0ad3f53aaf5ed3a63bd0763c2239e5e26fafb60a2eb0df195"; patchLatest = false; topLevel = true; dependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 516754fdef5..aee35a797b2 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -33,4 +33,5 @@ , "semver" , "npm2nix" , "ansi-remover" +, "mkdirp" ] From 6c4c1c4fb6b5465670f175c5c0b1989b33396223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 12:09:44 +0200 Subject: [PATCH 175/193] Updating opencascade to 6.6.0 --- .../libraries/opencascade/default.nix | 26 ++++++------------- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 7cc47a30eb7..1ce38ab7b3c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,23 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, -ftgl, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.6.0"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; + sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; }; - buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros + sourceRoot=`pwd`/ros/adm/cmake + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; - preConfigure = '' - sh ./build_configure - ''; - - # -fpermissive helps building opencascade, although gcc detects a flaw in the code - # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; - postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../doc $out/share/doc/${name} + cp -R ../../../doc $out/share/doc/${name} ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a7b082863e..523cf4381b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4816,10 +4816,7 @@ let openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { - automake = automake111x; - ftgl = ftgl212; - }; + opencascade = callPackage ../development/libraries/opencascade { }; opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; From 71229f8eb904361ddf819e35d96e1cfb128e22fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 15:11:20 +0200 Subject: [PATCH 176/193] digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10) --- pkgs/applications/graphics/digikam/2.nix | 32 +++++++++++++++++++ .../applications/graphics/digikam/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/graphics/digikam/2.nix diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix new file mode 100644 index 00000000000..be991772d39 --- /dev/null +++ b/pkgs/applications/graphics/digikam/2.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, +lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, +liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, +shared_desktop_ontologies, marble, mysql }: + +stdenv.mkDerivation rec { + name = "digikam-2.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/digikam/${name}.tar.bz2"; + sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk"; + }; + + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; + + buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff + jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw + opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ]; + + # Make digikam find some FindXXXX.cmake + KDEDIRS="${marble}:${qjson}"; + + enableParallelBuilding = true; + + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + inherit (kdelibs.meta) platforms; + }; +} diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 7b92d5e1690..27d8ae546da 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-2.6.0"; + name = "digikam-3.2.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; + sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 523cf4381b8..77dc18a4c7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8725,7 +8725,10 @@ let calligra = callPackage ../applications/office/calligra { }; - digikam = callPackage ../applications/graphics/digikam { }; + digikam = if builtins.compareVersions "4.9" kde4.release == 1 then + callPackage ../applications/graphics/digikam/2.nix { } + else + callPackage ../applications/graphics/digikam { }; k3b = callPackage ../applications/misc/k3b { }; From df81da4ac20cba07e791c5c4de7ed116781447ff Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 30 May 2013 16:01:18 +0200 Subject: [PATCH 177/193] add nodePackages.jshint --- pkgs/top-level/node-packages-generated.nix | 81 ++++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 82 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 62773f16f56..b70c5194b8b 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -232,6 +232,17 @@ dependencies = [ ]; } + { + baseName = "cli"; + version = "0.4.4-2"; + fullName = "cli-0.4.x"; + hash = "27a0db02501285da601c47495d0cd837ddeb4577bfd507c5503d2ee8cd0caffb"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "glob"; range = ">= 3.1.4"; } + ]; + } { baseName = "clone"; version = "0.1.5"; @@ -333,6 +344,16 @@ { name = "debug"; range = "*"; } ]; } + { + baseName = "console-browserify"; + version = "0.1.6"; + fullName = "console-browserify-0.1.x"; + hash = "e774c881920562b0893e50844332f79fc5a08752d28791d942c35fcc3ef2d75d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cookie"; version = "0.0.5"; @@ -676,6 +697,19 @@ { name = "inherits"; range = "1"; } ]; } + { + baseName = "glob"; + version = "3.2.1"; + fullName = "glob->= 3.1.4"; + hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~1.2.0"; } + { name = "inherits"; range = "1"; } + ]; + } { baseName = "graceful-fs"; version = "1.2.1"; @@ -873,6 +907,21 @@ dependencies = [ ]; } + { + baseName = "jshint"; + version = "2.1.2"; + fullName = "jshint-*"; + hash = "dcf2c9df4de942240c99c5ed2e1c44b55966a1c0d85fb6fcbdde583ea6ace5a4"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "shelljs"; range = "0.1.x"; } + { name = "underscore"; range = "1.4.x"; } + { name = "cli"; range = "0.4.x"; } + { name = "minimatch"; range = "0.x.x"; } + { name = "console-browserify"; range = "0.1.x"; } + ]; + } { baseName = "json-schema"; version = "0.2.2"; @@ -1052,6 +1101,18 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-0.x.x"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } { baseName = "minimatch"; version = "0.2.12"; @@ -1600,6 +1661,16 @@ { name = "range-parser"; range = "0.0.4"; } ]; } + { + baseName = "shelljs"; + version = "0.1.4"; + fullName = "shelljs-0.1.x"; + hash = "21a6f3dc5eaeb1c10efbe62e31aeb6762241f707fb1fdcda4766c8bccde3eaf0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "sigmund"; version = "1.0.0"; @@ -1763,6 +1834,16 @@ dependencies = [ ]; } + { + baseName = "underscore"; + version = "1.4.4"; + fullName = "underscore-1.4.x"; + hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "underscore"; version = "1.4.4"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index aee35a797b2..8116f769654 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -34,4 +34,5 @@ , "npm2nix" , "ansi-remover" , "mkdirp" +, "jshint" ] From 298f8fc459129368b860e652cce24a12fc4f0dd6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 30 May 2013 18:13:50 +0200 Subject: [PATCH 178/193] Added bro 2.1 --- .../networking/ids/bro/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/networking/ids/bro/default.nix diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix new file mode 100644 index 00000000000..6e70e106d26 --- /dev/null +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl, geoip, gperftools }: + +stdenv.mkDerivation rec { + name = "bro-2.1"; + + src = fetchurl { + url = "http://www.bro.org/downloads/release/${name}.tar.gz"; + sha256 = "1q2mm7rbgjcn01na2wm5fdfdm9pggzgljxj0n127s93fip3vg0qd"; + }; + + buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip gperftools ]; + + USER="something"; + + enableParallelBuilding = true; + + meta = { + description = "Bro is a powerful network analysis framework that is much different from the typical IDS you may know."; + homepage = http://www.bro.org/; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dc18a4c7a..76f3fe907d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -495,6 +495,8 @@ let bootchart = callPackage ../tools/system/bootchart { }; + bro = callPackage ../applications/networking/ids/bro { }; + bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; From 94d83c895352d1a94a61e7ceb0edf5efac567145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 18:46:30 +0200 Subject: [PATCH 179/193] digikam 3.2: fixing url --- pkgs/applications/graphics/digikam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 27d8ae546da..713adaffd06 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "digikam-3.2.0"; src = fetchurl { - url = "mirror://sourceforge/digikam/${name}.tar.bz2"; + url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx"; }; From 270f861dde3ca89c89228a7fbd78f185e1eb0fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 19:25:01 +0200 Subject: [PATCH 180/193] Setting opencascade 6.5 to freecad for it to build. --- .../development/libraries/opencascade/6.5.nix | 41 +++++++++++++++++++ .../libraries/opencascade/default.nix | 26 ++++++++---- pkgs/top-level/all-packages.nix | 6 ++- 3 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/opencascade/6.5.nix diff --git a/pkgs/development/libraries/opencascade/6.5.nix b/pkgs/development/libraries/opencascade/6.5.nix new file mode 100644 index 00000000000..7cc47a30eb7 --- /dev/null +++ b/pkgs/development/libraries/opencascade/6.5.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, +ftgl, freetype}: + +stdenv.mkDerivation rec { + name = "opencascade-6.5.4"; + src = fetchurl { + url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; + sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + }; + + buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + + preUnpack = '' + sourceRoot=`pwd`/ros + ''; + + preConfigure = '' + sh ./build_configure + ''; + + # -fpermissive helps building opencascade, although gcc detects a flaw in the code + # and reports an error otherwise. Further versions may fix that. + NIX_CFLAGS_COMPILE = "-fpermissive"; + + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + + postInstall = '' + mv $out/inc $out/include + mkdir -p $out/share/doc/${name} + cp -R ../doc $out/share/doc/${name} + ''; + + enableParallelBuilding = true; + + meta = { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = http://www.opencascade.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 1ce38ab7b3c..7cc47a30eb7 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,23 +1,33 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, +ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.6.0"; + name = "opencascade-6.5.4"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; - sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; + url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; + sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; }; - buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; + buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros/adm/cmake - cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" + sourceRoot=`pwd`/ros ''; + preConfigure = '' + sh ./build_configure + ''; + + # -fpermissive helps building opencascade, although gcc detects a flaw in the code + # and reports an error otherwise. Further versions may fix that. + NIX_CFLAGS_COMPILE = "-fpermissive"; + + configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; + postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../../../doc $out/share/doc/${name} + cp -R ../doc $out/share/doc/${name} ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76f3fe907d0..5f0edb6eb46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,6 +4820,8 @@ let opencascade = callPackage ../development/libraries/opencascade { }; + opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { }; + opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; opencsg = callPackage ../development/libraries/opencsg { }; @@ -7221,7 +7223,9 @@ let # !!! Fix the dependency on two different builds of nss. }; - freecad = callPackage ../applications/graphics/freecad { }; + freecad = callPackage ../applications/graphics/freecad { + opencascade = opencascade_6_5; + }; freemind = callPackage ../applications/misc/freemind { jdk = jdk; From b810381cceb45fd6cca14dd5895c6aad0c747a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 19:26:15 +0200 Subject: [PATCH 181/193] Ouch. I rolled back the default opencascade by error. --- .../libraries/opencascade/default.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 7cc47a30eb7..1ce38ab7b3c 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,23 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, automake, autoconf, libtool, qt4, -ftgl, freetype}: +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, qt4, freetype}: stdenv.mkDerivation rec { - name = "opencascade-6.5.4"; + name = "opencascade-6.6.0"; src = fetchurl { - url = http://files.opencascade.com/OCCT/OCC_6.5.4_release/OpenCASCADE654.tar.gz; - sha256 = "1di08mc0wly4cdi3rh9kj52bk0bfpyk6dy03c9yfnv04i7z03kmy"; + url = http://files.opencascade.com/OCCT/OCC_6.6.0_release/OpenCASCADE660.tgz; + sha256 = "0q2xn915w9skv9sj74lxnyv9g3b0yi1j04majyzxk6sv4nra97z3"; }; - buildInputs = [ mesa tcl tk file libXmu automake autoconf libtool qt4 ftgl freetype ]; + buildInputs = [ cmake mesa tcl tk file libXmu qt4 freetype ]; preUnpack = '' - sourceRoot=`pwd`/ros + sourceRoot=`pwd`/ros/adm/cmake + cmakeFlags="$cmakeFlags -DINSTALL_DIR=$out -D3RDPARTY_TCL_DIR=${tcl} -D3RDPARTY_FREETYPE_DIR=${freetype}" ''; - preConfigure = '' - sh ./build_configure - ''; - - # -fpermissive helps building opencascade, although gcc detects a flaw in the code - # and reports an error otherwise. Further versions may fix that. - NIX_CFLAGS_COMPILE = "-fpermissive"; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-qt=${qt4}" "--with-ftgl=${ftgl}" "--with-freetype=${freetype}" ]; - postInstall = '' mv $out/inc $out/include mkdir -p $out/share/doc/${name} - cp -R ../doc $out/share/doc/${name} + cp -R ../../../doc $out/share/doc/${name} ''; enableParallelBuilding = true; From 19dd9dc877150f74be172409132855c190b6d778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 30 May 2013 20:13:41 +0200 Subject: [PATCH 182/193] Firefox 20 reference in release.nix. Fixing. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 11102f89155..32494f64ad2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox20Pkgs.firefox = linux; + firefox21Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 17119e38e3e78678801c5ac4881d4c35e7cd0b8d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 01:07:36 +0000 Subject: [PATCH 183/193] licenses: Add AGPLv3 and fix links to BSD licenses --- pkgs/lib/licenses.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index fee430a4067..385993a320e 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,6 +4,18 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ + agpl3 = { + shortName = "AGPLv3"; + fullName = "GNU Affero General Public License version 3 only"; + url = https://www.gnu.org/licenses/agpl.html; + }; + + agpl3Plus = { + shortName = "AGPLv3+"; + fullName = "GNU Affero General Public License version 3 or later"; + url = https://www.gnu.org/licenses/agpl.html; + }; + asl20 = { shortName = "ASL2.0"; fullName = "Apache Software License 2.0"; @@ -19,13 +31,13 @@ bsd2 = { shortName = "BSD-2"; fullName = "BSD license (2 clause)"; - url = http://www.freebsd.org/copyright/freebsd-license.html; + url = http://opensource.org/licenses/BSD-2-Clause; }; bsd3 = { shortName = "BSD-3"; fullName = "BSD license (3 clause)"; - url = http://www.opensource.org/licenses/bsd-license.php; + url = http://opensource.org/licenses/BSD-3-Clause; }; bsdOriginal = { From 96b01e999f1641d79ba0cc034dca985e5fad43dd Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 31 May 2013 01:09:44 +0000 Subject: [PATCH 184/193] setuptools: Fix download link (the old one was returning 404) --- pkgs/development/python-modules/setuptools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 468ea50c924..92c39afc249 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - name = "python-setuptools-" + version; + shortName = "setuptools-${version}"; + name = "python-${shortName}"; version = "0.6c11"; src = fetchurl { - url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz"; + url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; }; From 9b9bd3d0553c04e81a8f68c36e82a79cbe43f01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 09:25:02 +0200 Subject: [PATCH 185/193] libf2c: fixing hash. The changes: diff -r lold/arithchk.c l/arithchk.c 218a219,221 > if (sizeof(long long) > sizeof(long) > && sizeof(long long) == sizeof(void*)) > fprintf(f, "#define LONG_LONG_POINTERS\n"); diff -r lold/README l/README 41c41 < message to netlib@netlib.bell-labs.com --- > message to netlib@netlib.org --- pkgs/development/libraries/libf2c/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index edcf177add7..9e6832fc2a3 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://www.netlib.org/f2c/libf2c.zip; - sha256 = "14py0zdwzj5gqjzi0z2hlcy3czpzx1fav55akdj143qgav8h6dav"; + sha256 = "1mcp1lh7gay7hm186dr0wvwd2bc05xydhnc1qy3dqs4n3r102g7i"; }; unpackPhase = '' From ce88984ecc6613d22b5ebe95238f7b62e4022c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 09:58:49 +0200 Subject: [PATCH 186/193] New URLs for coin3d --- pkgs/development/libraries/coin3d/default.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f676c9abaa0..b477a88ed53 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.1.3"; src = fetchurl { - url = "http://ftp.coin3d.org/coin/src/all/Coin-${version}.tar.gz"; + url = "https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz"; sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q"; }; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 80fbb53953a..7d655ae122a 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; src = fetchurl { - url = "http://ftp.coin3d.org/coin/src/all/SoQt-${version}.tar.gz"; + url = "https://bitbucket.org/Coin3D/coin/downloads/SoQt-${version}.tar.gz"; sha256 = "14dbh8ynzjcgwgxjc6530c5plji7vn62kbdf447w0dp53564p8zn"; }; From 85d2bf78e1e74e392b066f98f0199d7b887a0c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 10:08:38 +0200 Subject: [PATCH 187/193] I forgot to bring back opencascade 6.5 overrides. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f0edb6eb46..46441fc2ea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,7 +4820,10 @@ let opencascade = callPackage ../development/libraries/opencascade { }; - opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { }; + opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { + automake = automake111x; + ftgl = ftgl212; + }; opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; From 758f20f0b8b7ed25268e308bb5be6cb29668a05f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 12:38:26 -0400 Subject: [PATCH 188/193] node-packages.nix: Move non top-level attrs to a sub-attr `full' Since `full' isn't recursed into for derivations, nix-env -qaP * won't show attributes with problematic characters. Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 35 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index e38cd3e6936..8eb14a5c521 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -3,22 +3,27 @@ let inherit (self) buildNodePackage patchLatest; - importGeneratedPackages = generated: nativeDeps: self: builtins.listToAttrs (pkgs.lib.fold (pkg: pairs: - (pkgs.lib.optional pkg.topLevel { name = pkg.baseName; value = builtins.getAttr pkg.fullName self; }) ++ [ - { - name = pkg.fullName; - value = buildNodePackage rec { - name = "${pkg.baseName}-${pkg.version}"; - src = (if pkg.patchLatest then patchLatest else fetchurl) { - url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; - sha256 = pkg.hash; - }; - deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self) pkg.dependencies; - buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + importGeneratedPackages = generated: nativeDeps: self: + let + all = pkgs.lib.fold (pkg: { top-level, full }: { + top-level = top-level ++ pkgs.lib.optional pkg.topLevel { + name = pkg.baseName; + value = builtins.getAttr pkg.fullName self.full; }; - } - ] ++ pairs - ) [] generated); + full = [ { + name = pkg.fullName; + value = buildNodePackage rec { + name = "${pkg.baseName}-${pkg.version}"; + src = (if pkg.patchLatest then patchLatest else fetchurl) { + url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; + sha256 = pkg.hash; + }; + deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self.full) pkg.dependencies; + buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; + }; + } ] ++ full; + } ) { top-level = []; full = []; } generated; + in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; }; self = { inherit importGeneratedPackages; From 210246266d15ccf5858798416fc2673d2cdff5f9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 12:50:28 -0400 Subject: [PATCH 189/193] Make overrides of nodePackages work Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/node-packages.nix | 46 +++++++++++++++----------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46441fc2ea9..8493daf2de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1101,6 +1101,7 @@ let nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl; neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; + self = pkgs.nodePackages; }); ldns = callPackage ../development/libraries/ldns { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 8eb14a5c521..03f85af3c0d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, nodejs, fetchurl, neededNatives }: +{ pkgs, stdenv, nodejs, fetchurl, neededNatives, self }: let inherit (self) buildNodePackage patchLatest; @@ -24,30 +24,28 @@ let } ] ++ full; } ) { top-level = []; full = []; } generated; in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; }; +in { + inherit importGeneratedPackages; - self = { - inherit importGeneratedPackages; + nativeDeps = { + "node-expat-*" = [ pkgs.expat ]; + "rbytes-0.0.2" = [ pkgs.openssl ]; + }; - nativeDeps = { - "node-expat-*" = [ pkgs.expat ]; - "rbytes-0.0.2" = [ pkgs.openssl ]; - }; + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs neededNatives; + inherit (pkgs) runCommand; + }; - buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs neededNatives; - inherit (pkgs) runCommand; - }; + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' + mkdir unpack + cd unpack + tar xf ${src} + mv */ package 2>/dev/null || true + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out * + ''; - patchLatest = srcAttrs: - let src = fetchurl srcAttrs; in pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - tar xf ${src} - mv */ package 2>/dev/null || true - sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json - tar cf $out * - ''; - - /* Put manual packages below here (ideally eventually managed by npm2nix */ - } // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self; -in self + /* Put manual packages below here (ideally eventually managed by npm2nix */ +} // importGeneratedPackages (import ./node-packages-generated.nix) self.nativeDeps self From 9efcf4f6fe1094e7894117a0cbdf5055d8b824db Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 31 May 2013 13:27:55 -0400 Subject: [PATCH 190/193] Make nodePackages individually overridable Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 03f85af3c0d..a23b776d112 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -12,7 +12,7 @@ let }; full = [ { name = pkg.fullName; - value = buildNodePackage rec { + value = pkgs.lib.makeOverridable buildNodePackage rec { name = "${pkg.baseName}-${pkg.version}"; src = (if pkg.patchLatest then patchLatest else fetchurl) { url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; From 059af7e759a2e6af724e8f04763a294f3d446322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:44:49 +0200 Subject: [PATCH 191/193] Revert "Firefox 20 reference in release.nix. Fixing." This reverts commit 19dd9dc877150f74be172409132855c190b6d778. --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 32494f64ad2..11102f89155 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox21Pkgs.firefox = linux; + firefox20Pkgs.firefox = linux; gnome = { gnome_panel = linux; From b7e5f363c756d396a2be02bd5b6f4031b1badd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:00 +0200 Subject: [PATCH 192/193] Revert "Fixing firefox reference" This reverts commit a17b45686b3f1ad656771848ab5bf3bc3c758e2a. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8493daf2de0..0e3eca2ca95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7192,7 +7192,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox21Pkgs; + firefoxPkgs = pkgs.firefox20Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; From 2e6c1ebf4258dbb012474efb3b73f83ae5922058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 31 May 2013 20:45:10 +0200 Subject: [PATCH 193/193] Revert "firefox update to 21.0" This reverts commit 971337a119d708d78a152f4d918694e7b5a2b7e8. --- .../networking/browsers/firefox/{21.0.nix => 20.0.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/applications/networking/browsers/firefox/{21.0.nix => 20.0.nix} (97%) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix similarity index 97% rename from pkgs/applications/networking/browsers/firefox/21.0.nix rename to pkgs/applications/networking/browsers/firefox/20.0.nix index 1a23c9d9cf9..1480a300820 100644 --- a/pkgs/applications/networking/browsers/firefox/21.0.nix +++ b/pkgs/applications/networking/browsers/firefox/20.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "21.0"; + firefoxVersion = "20.0"; - xulVersion = "21.0"; # this attribute is used by other packages + xulVersion = "20.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r"; + sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; }; commonConfigureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e3eca2ca95..f87abe9082c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7213,12 +7213,12 @@ let firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); - firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { + firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); + firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { };