From 87ad942793d07174b621c0ddd68e90bf20b1319a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 07:54:31 +1000 Subject: [PATCH 001/332] fix pangomm build: use cairo 1.12.2 --- 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 a656cdf1c41..df82b2f6178 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4230,7 +4230,9 @@ let cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; + pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { + cairo = cairo_1_12_2; + }; pangox_compat = callPackage ../development/libraries/pangox-compat { }; From 0668d54827f5b10541e018425f906937f035c8b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:39:51 +0200 Subject: [PATCH 002/332] python-packages.nix: unsubscribe myself from some Hydra mails --- pkgs/top-level/python-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0162bae4fa2..bd2d5cca922 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2039,7 +2039,6 @@ pythonPackages = modules // rec { meta = { description = "automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.simons ]; }; }; @@ -2590,7 +2589,7 @@ pythonPackages = modules // rec { meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; - maintainers = with maintainers; [ lovek323 simons ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; }); @@ -3415,8 +3414,6 @@ pythonPackages = modules // rec { does it require C extensions to be compiled. It should work on any platform that supports the standard Python pty module. ''; - - maintainers = [ stdenv.lib.maintainers.simons ]; }; }; From 44731b5251cc5771cf4582ee3a2223c9379f0c4c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 12:03:03 +0200 Subject: [PATCH 003/332] Bump disnix,disnixos and dysnomia to latest development versions --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index e63de65410c..62a644e195a 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d"; + name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef"; src = fetchurl { - url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz; - sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6"; + url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz; + sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 46422d010fa..80ac91b5489 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff"; + name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz"; src = fetchurl { - url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz; - sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x"; + url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz; + sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d932d0fa8b2..de3690e3e20 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03"; + name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; src = fetchurl { - url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz; - sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf"; + url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; + sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 74c52ac8ad9d5e7383de4a7f495d087f14ce51a7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 11:45:54 +0200 Subject: [PATCH 004/332] nixpkgs-lint: Add support for filtering by maintainer For instance, you can now say "nixpkgs-lint -m alice" to show only packages maintained by Alice. Also added command-line parsing. --- maintainers/scripts/nixpkgs-lint.pl | 58 ++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 0b1519ef15c..c82cf75e3f8 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -3,25 +3,43 @@ use strict; use List::Util qw(min); use XML::Simple qw(:strict); -use Data::Dumper; +use Getopt::Long qw(:config gnu_getopt); +# Parse the command line. +my $path = ""; my $filter = "*"; +my $maintainer; -my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`; +sub showHelp { + print <’) + +Examples: + \$ nixpkgs-lint -f /my/nixpkgs -p firefox + \$ nixpkgs-lint -f /my/nixpkgs -m eelco +EOF + exit 0; +} + +GetOptions("package|p=s" => \$filter, + "maintainer|m=s" => \$maintainer, + "file|f=s" => \$path, + "help" => sub { showHelp() } + ) + or die("syntax: $0 ...\n"); + +# Evaluate Nixpkgs into an XML representation. +my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`; +die "$0: evaluation of ‘$path’ failed\n" if $? != 0; my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output"; -#print Dumper($info); - -my %pkgsByName; - -foreach my $attr (sort keys %{$info->{item}}) { - my $pkg = $info->{item}->{$attr}; - #print STDERR "attr = $attr, name = $pkg->{name}\n"; - $pkgsByName{$pkg->{name}} //= []; - push @{$pkgsByName{$pkg->{name}}}, $pkg; -} - # Check meta information. print "=== Package meta information ===\n\n"; my $nrMissingMaintainers = 0; @@ -44,6 +62,11 @@ foreach my $attr (sort keys %{$info->{item}}) { @maintainers = ($x->{value}); } + if (defined $maintainer && scalar(grep { $_ =~ /$maintainer/i } @maintainers) == 0) { + delete $info->{item}->{$attr}; + next; + } + if (scalar @maintainers == 0) { print "$attr: Lacks a maintainer\n"; $nrMissingMaintainers++; @@ -86,6 +109,15 @@ print "\n"; # Find packages that have the same name. print "=== Package name collisions ===\n\n"; +my %pkgsByName; + +foreach my $attr (sort keys %{$info->{item}}) { + my $pkg = $info->{item}->{$attr}; + #print STDERR "attr = $attr, name = $pkg->{name}\n"; + $pkgsByName{$pkg->{name}} //= []; + push @{$pkgsByName{$pkg->{name}}}, $pkg; +} + my $nrCollisions = 0; foreach my $name (sort keys %pkgsByName) { my @pkgs = @{$pkgsByName{$name}}; From c7e680c5bd1754d6a93aec0151549d3b60384527 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 12:19:57 +0200 Subject: [PATCH 005/332] Add fs-walk node package + updated other nodejs packages --- pkgs/top-level/node-packages-generated.nix | 169 ++++++++++++--------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 99 insertions(+), 71 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f8238b52a65..4d3ae03e19f 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -758,24 +758,24 @@ { name = "colors"; spec = "0.6.x"; - version = "0.6.0"; + version = "0.6.1"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; - tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; } { name = "colors"; spec = "0.x.x"; - version = "0.6.0"; + version = "0.6.1"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; - tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; } { name = "combined-stream"; @@ -823,6 +823,18 @@ sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; } + { + name = "commander"; + spec = "1.3.2"; + version = "1.3.2"; + topLevel = false; + dependencies = [ + { name = "keypress"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + tarball = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + } { name = "commander"; spec = "~0.6.1"; @@ -1825,6 +1837,18 @@ sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; } + { + name = "fs-walk"; + spec = "*"; + version = "0.0.1"; + topLevel = true; + dependencies = [ + { name = "async"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335"; + tarball = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; + } { name = "fstream"; spec = "0"; @@ -2437,14 +2461,16 @@ { name = "ironhorse"; spec = "*"; - version = "0.0.2"; + version = "0.0.5"; topLevel = true; dependencies = [ { name = "winston"; spec = "*"; } + { name = "nconf"; spec = "*"; } + { name = "fs-walk"; spec = "*"; } ]; patchLatest = false; - sha1 = "9a8e27407ecfba7cd4d1d5886c7d97e65d44da9c"; - tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.2.tgz"; + sha1 = "d7b15b73e7da814b272e580243cc2239e7b021e6"; + tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.5.tgz"; } { name = "is-promise"; @@ -2460,20 +2486,20 @@ { name = "jade"; spec = "*"; - version = "0.33.0"; + version = "0.34.1"; topLevel = true; dependencies = [ - { name = "commander"; spec = "1.2.0"; } + { name = "commander"; spec = "1.3.2"; } { name = "mkdirp"; spec = "0.3.x"; } - { name = "transformers"; spec = "2.0.1"; } + { name = "transformers"; spec = "2.1.0"; } { name = "character-parser"; spec = "1.0.2"; } - { name = "monocle"; spec = "0.1.48"; } + { name = "monocle"; spec = "0.1.50"; } { name = "with"; spec = "~1.1.0"; } { name = "constantinople"; spec = "~1.0.1"; } ]; patchLatest = false; - sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; - tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; } { name = "jade"; @@ -2491,20 +2517,20 @@ { name = "jade"; spec = ">= 0.0.1"; - version = "0.33.0"; + version = "0.34.1"; topLevel = false; dependencies = [ - { name = "commander"; spec = "1.2.0"; } + { name = "commander"; spec = "1.3.2"; } { name = "mkdirp"; spec = "0.3.x"; } - { name = "transformers"; spec = "2.0.1"; } + { name = "transformers"; spec = "2.1.0"; } { name = "character-parser"; spec = "1.0.2"; } - { name = "monocle"; spec = "0.1.48"; } + { name = "monocle"; spec = "0.1.50"; } { name = "with"; spec = "~1.1.0"; } { name = "constantinople"; spec = "~1.0.1"; } ]; patchLatest = false; - sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; - tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; } { name = "jayschema"; @@ -2545,7 +2571,7 @@ { name = "jshint"; spec = "*"; - version = "2.1.4"; + version = "2.1.7"; topLevel = true; dependencies = [ { name = "shelljs"; spec = "0.1.x"; } @@ -2555,8 +2581,8 @@ { name = "console-browserify"; spec = "0.1.x"; } ]; patchLatest = false; - sha1 = "8d5be86628eea91c073c8700dd6e4c90afd9ab38"; - tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.4.tgz"; + sha1 = "11f4214333a0cd2df88057b88c4d751d0c0658a0"; + tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.7.tgz"; } { name = "json-schema"; @@ -2663,7 +2689,7 @@ { name = "knox"; spec = "*"; - version = "0.8.4"; + version = "0.8.5"; topLevel = true; dependencies = [ { name = "mime"; spec = "*"; } @@ -2672,8 +2698,8 @@ { name = "stream-counter"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "4e1e98e9942120c3e7fd36286ee4a249b00ac370"; - tarball = "http://registry.npmjs.org/knox/-/knox-0.8.4.tgz"; + sha1 = "86f227fcd22db2b7699106b9b6e5ce29fcbf78de"; + tarball = "http://registry.npmjs.org/knox/-/knox-0.8.5.tgz"; } { name = "kue"; @@ -2807,13 +2833,13 @@ { name = "mime"; spec = "*"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; @@ -2851,35 +2877,35 @@ { name = "mime"; spec = "~1.2.2"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; spec = "~1.2.7"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; spec = "~1.2.9"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mimelib"; @@ -3234,15 +3260,15 @@ } { name = "monocle"; - spec = "0.1.48"; - version = "0.1.48"; + spec = "0.1.50"; + version = "0.1.50"; topLevel = false; dependencies = [ { name = "readdirp"; spec = "~0.2.3"; } ]; patchLatest = false; - sha1 = "b96730f5ca900fa75a56041eb6db10aad980a383"; - tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.48.tgz"; + sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7"; + tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz"; } { name = "mpath"; @@ -3292,14 +3318,14 @@ { name = "msgpack"; spec = ">= 0.0.1"; - version = "0.1.10"; + version = "0.1.11"; topLevel = false; dependencies = [ { name = "nodeunit"; spec = "https://github.com/godsflaw/nodeunit/tarball/master"; } ]; patchLatest = false; - sha1 = "ebb2edea5ebc3616a2ce003d8d8ef73b52bf7318"; - tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.10.tgz"; + sha1 = "203f7cfd1d1917fae196bbe01a701599f338cf0b"; + tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.11.tgz"; } { name = "muri"; @@ -3675,7 +3701,7 @@ { name = "npm"; spec = "*"; - version = "1.3.5"; + version = "1.3.6"; topLevel = true; dependencies = [ { name = "semver"; spec = "~2.0.8"; } @@ -3720,8 +3746,8 @@ { name = "npm-user-validate"; spec = "0.0.3"; } ]; patchLatest = false; - sha1 = "05d6c4d01d2bc3f1adf15948adf2f7110553f471"; - tarball = "http://registry.npmjs.org/npm/-/npm-1.3.5.tgz"; + sha1 = "7c317871955f8427529c78e9b1ec21239dcd222a"; + tarball = "http://registry.npmjs.org/npm/-/npm-1.3.6.tgz"; } { name = "npm-registry-client"; @@ -4931,13 +4957,13 @@ { name = "semver"; spec = "*"; - version = "2.0.11"; + version = "2.1.0"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; @@ -4964,35 +4990,35 @@ { name = "semver"; spec = "2"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; spec = "2.x"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; spec = ">=2.0.10 <3.0.0"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; @@ -5132,15 +5158,15 @@ { name = "simplesmtp"; spec = ">= 0.1.22"; - version = "0.3.4"; + version = "0.3.5"; topLevel = false; dependencies = [ { name = "rai"; spec = "~0.1"; } { name = "xoauth2"; spec = "~0.1"; } ]; patchLatest = false; - sha1 = "fe8bfe63c2f96e0bbe54bd373a0dc0d09b594133"; - tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.4.tgz"; + sha1 = "3f8d43e7885c926037ab3aa5026b563543a67e5b"; + tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.5.tgz"; } { name = "sliced"; @@ -5384,16 +5410,17 @@ { name = "stylus"; spec = "*"; - version = "0.34.1"; + version = "0.35.1"; topLevel = true; dependencies = [ { name = "cssom"; spec = "0.2.x"; } { name = "mkdirp"; spec = "0.3.x"; } { name = "debug"; spec = "*"; } + { name = "sax"; spec = "0.5.x"; } ]; patchLatest = false; - sha1 = "937d8502a3be4e617d5ad493f204c70a93d95b14"; - tarball = "http://registry.npmjs.org/stylus/-/stylus-0.34.1.tgz"; + sha1 = "ed4f4cf378c2f883b04633f01e5c76ffe976084f"; + tarball = "http://registry.npmjs.org/stylus/-/stylus-0.35.1.tgz"; } { name = "stylus"; @@ -5598,8 +5625,8 @@ } { name = "transformers"; - spec = "2.0.1"; - version = "2.0.1"; + spec = "2.1.0"; + version = "2.1.0"; topLevel = false; dependencies = [ { name = "promise"; spec = "~2.0"; } @@ -5607,8 +5634,8 @@ { name = "uglify-js"; spec = "~2.2.5"; } ]; patchLatest = false; - sha1 = "352131dfceb93a7532dc7535a4f142510435a394"; - tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz"; + sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + tarball = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; } { name = "traverse"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 3379321bb5f..9107248a01a 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -65,6 +65,7 @@ , "tar" , "flatiron" , "ironhorse" +, "fs-walk" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From c1fcb0c2e60743b5d052043c94f2d6934ec89b32 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 13:00:05 +0200 Subject: [PATCH 006/332] Make the setup-hook work again now that nodejs modules reside in lib/node_modules --- pkgs/development/web/nodejs/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index c2888471044..41a9746ba42 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -1,5 +1,5 @@ addNodePath () { - addToSearchPath NODE_PATH $1/node_modules + addToSearchPath NODE_PATH $1/lib/node_modules } envHooks=(${envHooks[@]} addNodePath) From 97b8ac932d480f37104b0cc90efdeb5b1bb26cc2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 15:20:46 +0400 Subject: [PATCH 007/332] Adding Lush: Lisp Universal SHell --- .../development/interpreters/lush/default.nix | 32 +++++++++++++++++++ .../interpreters/lush/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/interpreters/lush/default.nix create mode 100644 pkgs/development/interpreters/lush/default.upstream diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix new file mode 100644 index 00000000000..63cf85bc506 --- /dev/null +++ b/pkgs/development/interpreters/lush/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL +, blas, binutils, intltool, gettext, zlib}: +let + s = # Generated upstream information + rec { + baseName="lush"; + version="2.0.1"; + name="${baseName}-${version}"; + hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; + sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + }; + buildInputs = [ + libX11 xproto indent readline gsl freeglut mesa SDL blas binutils + intltool gettext zlib + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + NIX_LDFLAGS=" -lz "; + meta = { + inherit (s) version; + description = ''Lisp Universal SHell''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream new file mode 100644 index 00000000000..6a3b3a8357c --- /dev/null +++ b/pkgs/development/interpreters/lush/default.upstream @@ -0,0 +1,3 @@ +url http://sourceforge.net/projects/lush/files/lush2/ +version_link '[.]tar[.]gz/download$' +SF_redirect diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 352d58393bc..2a4dab0f318 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3052,6 +3052,8 @@ let lua = lua5; }; + lush2 = callPackage ../development/interpreters/lush {}; + maude = callPackage ../development/interpreters/maude { }; octave = callPackage ../development/interpreters/octave { From 9acc0d4bc903a931ec1b01c9422d9941f9b60879 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 15:51:01 +0400 Subject: [PATCH 008/332] Adding x-cape keyboard mapping helper --- pkgs/tools/X11/xcape/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/X11/xcape/default.nix diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix new file mode 100644 index 00000000000..adeec32b17c --- /dev/null +++ b/pkgs/tools/X11/xcape/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig +, inputproto, libXi}: +let + s = rec { + baseName = "xcape"; + version = "git-2013-05-30"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + libX11 libXtst xproto xextproto pkgconfig inputproto libXi + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + url = https://github.com/alols/xcape; + rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb"; + sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg"; + }; + preConfigure = '' + makeFlags="$makeFlags PREFIX=$out" + ''; + meta = { + inherit (s) version; + description = ''A tool to have Escape and Control on a single key''; + license = stdenv.lib.licenses.gpl3 ; + inherit (s) url sha256; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4dab0f318..fb88748c157 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8745,6 +8745,8 @@ let xcalib = callPackage ../tools/X11/xcalib { }; + xcape = callPackage ../tools/X11/xcape { }; + xchainkeys = callPackage ../tools/X11/xchainkeys { }; xchat = callPackage ../applications/networking/irc/xchat { }; From 0a8b83fdd0f7fcb376d0ad766e2b4f096475e3c2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 16:02:39 +0400 Subject: [PATCH 009/332] Fix unneeded inherit --- pkgs/tools/X11/xcape/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index adeec32b17c..272f1ca0907 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { inherit (s) version; description = ''A tool to have Escape and Control on a single key''; license = stdenv.lib.licenses.gpl3 ; - inherit (s) url sha256; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; From f918e06988d3b4038530a72ca7e96f8cfe728984 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Jul 2013 14:23:48 +0200 Subject: [PATCH 010/332] wine: upgrade to 1.6 + latest gecko/mono extensions --- pkgs/misc/emulators/wine/default.nix | 30 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 69bcea87f6a..4e6ef5af00d 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -6,18 +6,28 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -stdenv.mkDerivation rec { - version = "1.5.31"; +let gecko = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; + sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + }; + + gecko64 = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; + sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + }; + + mono = fetchurl { + url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; + sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + }; + +in stdenv.mkDerivation rec { + version = "1.6"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1hlj1r3xi1mbqblkiwrcphvvb8rd50qig25jhyid58qp3r2lf9a6"; - }; - - gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi"; - sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g"; + sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1"; }; buildInputs = [ @@ -44,6 +54,10 @@ stdenv.mkDerivation rec { postInstall = '' install -D ${gecko} $out/share/wine/gecko/${gecko.name} + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + install -D ${gecko} $out/share/wine/gecko/${gecko64.name} + '' + '' + install -D ${mono} $out/share/wine/mono/${mono.name} wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib ''; From ae90a7e8f3f43517be8090c0361b8ff268fb56db Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 15:24:26 +0200 Subject: [PATCH 011/332] Added forever-monitor nodejs package --- pkgs/top-level/node-packages-generated.nix | 17 +++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 18 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 4d3ae03e19f..3751aa6c4d3 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1723,6 +1723,23 @@ sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0"; tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; } + { + name = "forever-monitor"; + spec = "*"; + version = "1.2.2"; + topLevel = true; + dependencies = [ + { name = "broadway"; spec = "0.2.x"; } + { name = "minimatch"; spec = "0.0.x"; } + { name = "pkginfo"; spec = "0.x.x"; } + { name = "ps-tree"; spec = "0.0.x"; } + { name = "watch"; spec = "0.5.x"; } + { name = "utile"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684"; + tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz"; + } { name = "forever-monitor"; spec = "1.2.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 9107248a01a..6cab338ae14 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -52,6 +52,7 @@ , "gzippo" , "walk" , "forever" +, "forever-monitor" , "kue" , "supertest" , "should" From 7c38b9d3bc0253214792a680cd652ccfbbba0305 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 10:11:40 +0000 Subject: [PATCH 012/332] nixpkgs-lint: Fix priority check --- maintainers/scripts/nixpkgs-lint.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index c82cf75e3f8..29ecb93c586 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -128,8 +128,8 @@ foreach my $name (sort keys %pkgsByName) { @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs; # Filter packages that have a lower priority. - my $highest = min (map { $_->{priority} // 0 } @pkgs); - @pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs; + my $highest = min (map { $_->{meta}->{priority}->{value} // 0 } @pkgs); + @pkgs = grep { ($_->{meta}->{priority}->{value} // 0) == $highest } @pkgs; next if scalar @pkgs == 1; From 60355207c329e8f04baf574c6ee9bed960b3c240 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:31:31 +0200 Subject: [PATCH 013/332] Fix some name collisions --- pkgs/top-level/all-packages.nix | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb88748c157..8c3ec1d5fd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,8 +4189,8 @@ let guileBindings = config.gnutls.guile or true; }; - gnutls_without_guile = gnutls.override { guileBindings = false; }; - gnutls2_without_guile = gnutls2.override { guileBindings = false; }; + gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); + gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); gpac = callPackage ../applications/video/gpac { }; @@ -5245,13 +5245,13 @@ let else stdenv; }; - qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { + qt48Full = lowPrio (callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; docs = true; demos = true; examples = true; - }; + }); qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -5779,15 +5779,15 @@ let python = pypy; }); - plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix { + plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; pythonPackages = python26Packages; - }); + }; - plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.nix { + plone42Packages = import ../development/web/plone/4.2.nix { inherit pkgs; pythonPackages = python26Packages; - }); + }; plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix { inherit pkgs; @@ -6387,23 +6387,23 @@ let ]; }; - linux_3_2_grsecurity = lib.overrideDerivation (linux_3_2.override (args: { + linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ]; - })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}); + })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); - linux_3_2_apparmor = linux_3_2.override { + linux_3_2_apparmor = lowPrio (linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; extraConfig = '' SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y ''; - }; + }); - linux_3_2_xen = linux_3_2.override { + linux_3_2_xen = lowPrio (linux_3_2.override { extraConfig = '' XEN_DOM0 y ''; - }; + }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; @@ -6416,13 +6416,13 @@ let ]; }; - linux_3_4_apparmor = linux_3_4.override { + linux_3_4_apparmor = lowPrio (linux_3_4.override { kernelPatches = [ kernelPatches.apparmor_3_4 ]; extraConfig = '' SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y ''; - }; + }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; @@ -6582,10 +6582,10 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); - linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor); - linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); + linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; + linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_4_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor); + linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); @@ -6624,7 +6624,7 @@ let linuxHeaders = glibc.kernelHeaders; }; - klibcShrunk = callPackage ../os-specific/linux/klibc/shrunk.nix { }; + klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); kmod = callPackage ../os-specific/linux/kmod { }; @@ -7447,7 +7447,7 @@ let maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; + notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. @@ -8403,12 +8403,12 @@ let libpng = libpng12; }; - sndBase = builderDefsPackage (import ../applications/audio/snd) { + sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; inherit pkgconfig gmp gettext; inherit (xlibs) libXpm libX11; inherit gtk glib; - }; + }); snd = sndBase.passthru.function { inherit mesa libtool jackaudio alsaLib; @@ -8621,8 +8621,8 @@ let # so that we can use gccApple if we're building on darwin inherit stdenvAdapters gccApple; }; - vimLatest = vim_configurable.override { source = "latest"; }; - vimNox = vim_configurable.override { source = "vim-nox"; }; + vimLatest = lowPrio (vim_configurable.override { source = "latest"; }); + vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { From b509c78ea38fe74f93040bbf1c1408bd52f6d7a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 10:33:10 +0000 Subject: [PATCH 014/332] webkitSVN: Remove It hasn't been updated in a long time. --- pkgs/development/libraries/webkit/svn.nix | 91 ----------------------- pkgs/top-level/all-packages.nix | 15 ---- pkgs/top-level/release-python.nix | 1 - 3 files changed, 107 deletions(-) delete mode 100644 pkgs/development/libraries/webkit/svn.nix diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix deleted file mode 100644 index db6fe1ba55c..00000000000 --- a/pkgs/development/libraries/webkit/svn.nix +++ /dev/null @@ -1,91 +0,0 @@ -args : with args; -let - s = import ./src-for-default.nix; - version = lib.attrByPath ["version"] s.version args; -in -rec { - src = fetchurl { - url = s.url; - sha256 = s.hash; - }; - - buildInputs = [gtk glib atk cairo curl fontconfig freetype - gettext libjpeg libpng libtiff libxml2 libxslt pango - sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue - ]; - - propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good - ]; - - configureCommand = "./autogen.sh "; - configureFlags = [ - "--enable-3D-transforms" - "--enable-web-sockets" - "--enable-web-timing" - - # https://bugs.webkit.org/show_bug.cgi?id=55294 - "--enable-image-resizer" - - "--enable-geolocation" - - # Not implemented? - # "--enable-web-audio" - - "--enable-mathml" - - "--enable-wml" - - # https://bugs.webkit.org/show_bug.cgi?id=45110 - # "--enable-indexed-database" - - "--enable-xhtmlmp" - - # "--enable-input-speech" - - "--enable-file-writer" - "--enable-blob" - - # https://bugs.webkit.org/show_bug.cgi?id=59430 - # "--enable-directory-upload" - - # https://bugs.webkit.org/show_bug.cgi?id=58443 - # "--enable-file-system" - ]; - - /* doConfigure should be specified separately */ - phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") - "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; - - setVars = fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" - '') ["minInit"]; - - doReplaceUsrBin = fullDepEntry ('' - for i in $(find . -name '*.pl') $(find . -name '*.pm'); do - sed -e 's@/usr/bin/gcc@gcc@' -i $i - done - '') ["minInit" "doUnpack"]; - - doAddPrograms = fullDepEntry ('' - mkdir -p $out/bin - for i in Programs/.libs/* Programs/*; do - cp $i $out/bin/webkit-program-$(basename $i) || true - done - '') ["minInit" "doMake" "defEnsureDir"]; - - paranoidFixComments = fullDepEntry ('' - sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') - '') ["minInit" "doUnpack"]; - - name = s.name; - meta = { - description = "WebKit - a fast and correct HTML renderer"; - maintainers = [stdenv.lib.maintainers.raskin]; - }; - passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c3ec1d5fd5..ecb859fff90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5533,21 +5533,6 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; - webkitSVN = - builderDefsPackage ../development/libraries/webkit/svn.nix { - inherit (gnome) gtkdoc libsoup; - inherit gtk atk pango glib; - inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libxml2 libxslt sqlite - icu cairo perl intltool automake libtool - pkgconfig autoconf bison libproxy enchant - python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg - gst_plugins_good; - inherit (xlibs) libXt renderproto libXrender; - inherit libpng; - }; - wildmidi = callPackage ../development/libraries/wildmidi { }; wvstreams = callPackage ../development/libraries/wvstreams { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index e09c3a76ddc..770a434c8d7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1741,7 +1741,6 @@ let wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webkitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 7f48c7a447c377350d4873f8922a3dc527bfede5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:41:17 +0200 Subject: [PATCH 015/332] Fix a name collision between glibc and glibc217 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb859fff90..85b40b8cff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4015,8 +4015,6 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc217; - glibcCross = glibc217Cross; glibc213 = (callPackage ../development/libraries/glibc/2.13 { @@ -4040,7 +4038,7 @@ let inherit fetchgit; })); - glibc217 = callPackage ../development/libraries/glibc/2.17 { + glibc = callPackage ../development/libraries/glibc/2.17 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; From 70d6623586f333dc5be144739d83d693c2ece427 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:41:30 +0200 Subject: [PATCH 016/332] Fix a name collision between two distinct KDE wallpaper packages --- pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix index 611c6a70f6b..7c9846fbf9e 100644 --- a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix +++ b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix @@ -1,7 +1,7 @@ { kde, kdelibs }: kde rec { - name = "kde-wallpapers"; + name = "kdeartwork-wallpapers"; buildInputs = [ kdelibs ]; From 3c462ded97a829bf436f6d693b6e687d08d18b1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:59:30 +0200 Subject: [PATCH 017/332] linux: Update to 3.2.49, 3.4.55 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 36e97f15c2b..1e1e41a360a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.48"; + version = "3.2.49"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1i24vpv2q8va4ywac970hjisi4jyra7ik99g9zv3bmxmm86k7nqk"; + sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 6dcd88a1f91..e02f9bd5b7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.54"; + version = "3.4.55"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "06gz0svm4ngn9iaq9hw5c63mi0613nlzh78dny2m6z00ivpbnk6i"; + sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; }; config = configWithPlatform stdenv.platform; From 394dc5da785ceb72f3556fe4496b520804120d6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 13:06:06 +0200 Subject: [PATCH 018/332] batman-adv: Disambiguate kernel versions --- pkgs/os-specific/linux/batman-adv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 693f0067701..e4b4d1104b0 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,10 +1,12 @@ -{stdenv, fetchurl, kernelDev }: +{ stdenv, fetchurl, kernelDev }: + +let base = "batman-adv-2013.2.0"; in stdenv.mkDerivation rec { - name = "batman-adv-2013.2.0"; + name = "${base}-${kernelDev.version}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/${name}/${name}.tar.gz"; + url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; sha1 = "7d2aff2ad118cbc5452de43f7e9da8374521ec0e"; }; From 1e6b14e8a491dc067a5aae281a09fff7bc94085e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 11:47:23 +0000 Subject: [PATCH 019/332] Make phpXdebug_5_3 low priority --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b40b8cff8..36e8098d369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3087,10 +3087,12 @@ let php_xcache = callPackage ../development/libraries/php-xcache { }; - phpXdebug_5_3 = callPackage ../development/interpreters/php-xdebug { + phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug { php = php53; - }; + }); + phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; + phpXdebug = phpXdebug_5_4; picolisp = callPackage ../development/interpreters/picolisp {}; From f3a17b04e630336a0e86af98ae0328797b554312 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 16:51:32 +0200 Subject: [PATCH 020/332] nixpkgs-lint: Warn against capitalised package names and missing versions --- maintainers/scripts/nixpkgs-lint.pl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 29ecb93c586..baf2cbf8ba7 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -42,6 +42,7 @@ my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, F # Check meta information. print "=== Package meta information ===\n\n"; +my $nrBadNames = 0; my $nrMissingMaintainers = 0; my $nrMissingDescriptions = 0; my $nrBadDescriptions = 0; @@ -51,7 +52,11 @@ foreach my $attr (sort keys %{$info->{item}}) { my $pkg = $info->{item}->{$attr}; my $pkgName = $pkg->{name}; - $pkgName =~ s/-[0-9].*//; + my $pkgVersion = ""; + if ($pkgName =~ /(.*)(-[0-9].*)$/) { + $pkgName = $1; + $pkgVersion = $2; + } # Check the maintainers. my @maintainers; @@ -72,6 +77,17 @@ foreach my $attr (sort keys %{$info->{item}}) { $nrMissingMaintainers++; } + # Package names should not be capitalised. + if ($pkgName =~ /^[A-Z]/) { + print "$attr: package name ‘$pkgName’ should not be capitalised\n"; + $nrBadNames++; + } + + if ($pkgVersion eq "") { + print "$attr: package has no version\n"; + $nrBadNames++; + } + # Check the license. if (!defined $pkg->{meta}->{license}) { print "$attr: Lacks a license\n"; @@ -104,6 +120,7 @@ foreach my $attr (sort keys %{$info->{item}}) { $nrBadDescriptions++ if $bad; } } + print "\n"; # Find packages that have the same name. @@ -140,6 +157,7 @@ foreach my $name (sort keys %pkgsByName) { print "=== Bottom line ===\n"; print "Number of packages: ", scalar(keys %{$info->{item}}), "\n"; +print "Number of bad names: $nrBadNames\n"; print "Number of missing maintainers: $nrMissingMaintainers\n"; print "Number of missing licenses: $nrMissingLicenses\n"; print "Number of missing descriptions: $nrMissingDescriptions\n"; From b92b8dce05d90554accad3b1a19add327b9d314b Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Tue, 30 Jul 2013 15:53:00 +0200 Subject: [PATCH 021/332] MicroGNUEmacs, a.k.a. MG --- pkgs/applications/editors/mg/configure.patch | 35 ++++++++++++++++++++ pkgs/applications/editors/mg/default.nix | 30 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 67 insertions(+) create mode 100644 pkgs/applications/editors/mg/configure.patch create mode 100644 pkgs/applications/editors/mg/default.nix diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch new file mode 100644 index 00000000000..11105299eb4 --- /dev/null +++ b/pkgs/applications/editors/mg/configure.patch @@ -0,0 +1,35 @@ +--- configure.old 2013-07-30 19:42:51.000000000 +0200 ++++ configure 2013-07-30 19:47:26.000000000 +0200 +@@ -163,31 +163,7 @@ + echo 'Fails.' + fi + +- +-if [ ! -r /usr/include/term.h ]; then +- note 'term.h' +- if [ -r /usr/include/ncurses/term.h ]; then +- echo "Found in /usr/include/ncurses" +- extraflags="$extraflags -I/usr/include/ncurses" +- else +- for i in pkg local; do +- if [ -r /usr/$i/include/term.h ]; then +- echo "Found in /usr/$i/include" +- extralibs="$extralibs -L/usr/$i/lib" +- extraflags="$extraflags -I/usr/$i/include" +- break +- else +- false +- fi +- done || +- { +- echo 'Not found!' >&2 +- echo 'Do you have the ncurses devel package installed?' >&2 +- echo 'If you know where term.h is, please email the author!' >&2 +- exit 1 +- } +- fi +-fi ++extraflags="$extraflags $NIX_CFLAGS_COMPILE" + + note 'base and dirname' + if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix new file mode 100644 index 00000000000..ce69b5c0b5a --- /dev/null +++ b/pkgs/applications/editors/mg/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, ncurses }: +stdenv.mkDerivation rec { + name = "mg-20110905"; + + src = fetchurl { + url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz; + sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw"; + }; + + dontAddPrefix = true; + + patches = [ ./configure.patch ]; + patchFlags = "-p0"; + + installPhase = '' + mkdir -p $out/bin + cp mg $out/bin + mkdir -p $out/share/man/man1 + cp mg.1 $out/share/man/man1 + ''; + + buildInputs = [ ncurses ]; + + meta = { + homepage = http://homepage.boetes.org/software/mg/; + description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."; + license = "public domain"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e8098d369..c10e737ba97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9889,5 +9889,7 @@ let dart = callPackage ../development/interpreters/dart { }; httrack = callPackage ../tools/backup/httrack { }; + + mg = callPackage ../applications/editors/mg { }; }; in pkgs From 7e0bd8d360615c92225ed89a66ded6507fbf9859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 30 Jul 2013 21:30:34 +0200 Subject: [PATCH 022/332] offlineimap: remove python prefix from package name OfflineIMAP is primarily a program/tool, not a python module (although it installs a python module too, for those who want to poke at its internals). Now we can install it with "nix-env -i offlineimap" instead of "nix-env -i python2.7-offlineimap". --- pkgs/tools/networking/offlineimap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 1b1aa768a25..a5b46ebbc3c 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "6.5.5-rc2"; name = "offlineimap-${version}"; + namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}"; From 53ffc6e0ef395a2bd7651423d9783ad8184be1d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 10:52:15 +0200 Subject: [PATCH 023/332] Drop recurseIntoAttrs from python33Packages and pypyPackages. We cannot import the packages from all of these three packages sets into the global namespace, because they are indistinguishable. For example: $ nix-env -qaP \* | grep pylint pypyPackages.pylint pylint-0.26.0 python33Packages.pylint pylint-0.26.0 python27Packages.pylint pylint-0.26.0 When someone tries to install pylint by running "nix-env -i pylint", then it's impossible to tell which one of these three versions was chosen. I can think of two ways to remedy this problem with recurseIntoAttrs: 1) Bake the name of the Python interpreter into every package's name, i.e. offer "python27-pylint", "python33-pylint", and so on. 2) Ensure that all non-default package sets mark all their packages 'lowPrio' to unsure that the choice during installation is deterministic. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c10e737ba97..8ecd352e72c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5740,11 +5740,11 @@ let python3Packages = python33Packages; - python33Packages = recurseIntoAttrs (import ./python-packages.nix { + python33Packages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python33; - }); + }; python32Packages = import ./python-packages.nix { inherit pkgs; @@ -5758,11 +5758,11 @@ let python = python27; }); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { + pypyPackages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = pypy; - }); + }; plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; From 67afed00d57bc34aa816fc667c6a92daf1f30893 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 10:52:27 +0200 Subject: [PATCH 024/332] all-packages.nix: drop trailing whitespace --- 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 8ecd352e72c..f7ebd70ee81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9889,7 +9889,7 @@ let dart = callPackage ../development/interpreters/dart { }; httrack = callPackage ../tools/backup/httrack { }; - + mg = callPackage ../applications/editors/mg { }; }; in pkgs From dc4f9a37bea3c20b028e41e2a6b102fb2fcf72ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:33:19 +0200 Subject: [PATCH 025/332] haskell-cmdargs: update to version 0.10.5 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index e180863e133..1814ab99784 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.4"; - sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0"; + version = "0.10.5"; + sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 34db77c302b721c07197ab99a72c70b2b212fdba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:33:19 +0200 Subject: [PATCH 026/332] haskell-feed: update to version 0.3.9 --- pkgs/development/libraries/haskell/feed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index d15906e0be5..bafe23aed0c 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "feed"; - version = "0.3.8"; - sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576"; + version = "0.3.9"; + sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2"; buildDepends = [ utf8String xml ]; meta = { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; From 5f960aac0f1d9d0b82735ddcb204c67414d51126 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 11:08:34 +0200 Subject: [PATCH 027/332] haskell-haskell-src-meta: update to version 0.6.0.3 --- .../libraries/haskell/haskell-src-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 98dfff8505a..7c9e7694046 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.6.0.2"; - sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp"; + version = "0.6.0.3"; + sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { From ef659fa8c0cb1b36c7f267e64d472ee28b4a67ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 11:08:34 +0200 Subject: [PATCH 028/332] haskell-unix-process-conduit: update to version 0.2.1.2 --- .../libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index d12167ac428..8dc93c21363 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.1.1"; - sha256 = "038z99gzwqhig65zzb3hc9zisnvzslvvy86wjgx6wz90p6vbxzn4"; + version = "0.2.1.2"; + sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { From 332dd4854fac730ac8bddac010d17fa9d2cd45a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 31 Jul 2013 13:32:25 +0200 Subject: [PATCH 029/332] Move namePrefix="" python packages out of python-packges.nix It doesn't make sense to build tools/applications with three different python interpreter versions, so move them out of python modules list. Also reverts 53ffc6e0ef395a2bd7651423d9783ad8184be1d0. --- .../python-modules/pylint/default.nix | 23 +++++ .../python-modules/rbtools/default.nix | 13 +++ .../python-modules/setuptools/default.nix | 3 +- pkgs/tools/admin/awscli/default.nix | 18 ++++ pkgs/tools/video/vnc2flv/default.nix | 19 ++++ pkgs/top-level/all-packages.nix | 19 ++-- pkgs/top-level/python-packages.nix | 88 ++----------------- 7 files changed, 97 insertions(+), 86 deletions(-) create mode 100644 pkgs/development/python-modules/pylint/default.nix create mode 100644 pkgs/development/python-modules/rbtools/default.nix create mode 100644 pkgs/tools/admin/awscli/default.nix create mode 100644 pkgs/tools/video/vnc2flv/default.nix diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix new file mode 100644 index 00000000000..d45d724ae58 --- /dev/null +++ b/pkgs/development/python-modules/pylint/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "pylint-0.26.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; + sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + }; + + propagatedBuildInputs = [ pythonPackages.logilab_astng ]; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp "elisp/"*.el $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://www.logilab.org/project/pylint; + description = "A bug and style checker for Python"; + }; +} diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix new file mode 100644 index 00000000000..7d82ef9adf2 --- /dev/null +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "rbtools-0.4.1"; + namePrefix = ""; + + src = fetchurl { + url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz"; + sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv"; + }; + + propagatedBuildInputs = [ pythonPackages.setuptools ]; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3dcaaca4c25..d6ad28645c1 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { ${python}/bin/${python.executable} setup.py test ''; - meta = { + meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; licenses = [ "PSF" "ZPL" ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix new file mode 100644 index 00000000000..aa8361c737f --- /dev/null +++ b/pkgs/tools/admin/awscli/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "awscli-${version}"; + version = "0.8.3"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; + sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; + }; + + propagatedBuildInputs = [ + pythonPackages.argparse + pythonPackages.botocore + pythonPackages.colorama + ]; +} diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix new file mode 100644 index 00000000000..f2f77bd84cd --- /dev/null +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "vnc2flv-20100207"; + namePrefix = ""; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; + md5 = "8492e46496e187b49fe5569b5639804e"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "Tool to record VNC sessions to Flash Video"; + homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7ebd70ee81..5d06b8732bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -421,6 +421,8 @@ let }; }; + awscli = callPackage ../tools/admin/awscli { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -1825,6 +1827,8 @@ let inherit (gnome) scrollkeeper; }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; + vncrec = builderDefsPackage ../tools/video/vncrec { inherit (xlibs) imake libX11 xproto gccmakedep libXt libXmu libXaw libXext xextproto libSM libICE libXpm @@ -5740,11 +5744,11 @@ let python3Packages = python33Packages; - python33Packages = import ./python-packages.nix { + python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python33; - }; + }); python32Packages = import ./python-packages.nix { inherit pkgs; @@ -5758,11 +5762,11 @@ let python = python27; }); - pypyPackages = import ./python-packages.nix { + pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = pypy; - }; + }); plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; @@ -5807,6 +5811,8 @@ let pyGtkGlade = pythonPackages.pyGtkGlade; + pylint = callPackage ../development/python-modules/pylint { }; + pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { inherit python openssl; }; @@ -5831,6 +5837,8 @@ let pyxml = callPackage ../development/python-modules/pyxml { }; + rbtools = callPackage ../development/python-modules/rbtools { }; + setuptools = pythonPackages.setuptools; wxPython = pythonPackages.wxPython; @@ -9308,7 +9316,8 @@ let spyder = callPackage ../applications/science/spyder { inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pylint pep8; # optional + inherit (pythonPackages) ipython pep8; # optional + inherit pylint; }; stellarium = callPackage ../applications/science/astronomy/stellarium { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd2d5cca922..d6bf93b394a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -341,24 +341,6 @@ pythonPackages = modules // rec { }; }); - - awscli = buildPythonPackage rec { - name = "awscli-0.8.3"; - namePrefix = ""; - - src = fetchurl { - url = https://github.com/aws/aws-cli/archive/0.8.3.tar.gz; - sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; - }; - - propagatedBuildInputs = - [ pythonPackages.argparse - pythonPackages.botocore - pythonPackages.colorama - ]; - }; - - beautifulsoup = buildPythonPackage (rec { name = "beautifulsoup-3.2.1"; @@ -573,11 +555,12 @@ pythonPackages = modules // rec { botocore = buildPythonPackage rec { - name = "botocore-0.8.3"; + version = "0.13.1"; + name = "botocore-${version}"; src = fetchurl { - url = https://github.com/boto/botocore/archive/0.8.3.tar.gz; - sha256 = "0dbm2clrh7zs4brqqj3xssz3nymdg24ff2lww27s3wliirwqdiv1"; + url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; + sha256 = "192kxgw76b22zmk5mxjkij5rskibb9jfaggvpznzy3ggsgja7yy8"; }; propagatedBuildInputs = @@ -2294,11 +2277,11 @@ pythonPackages = modules // rec { jmespath = buildPythonPackage rec { - name = "jmespath-0.0.1"; + name = "jmespath-0.0.2"; src = fetchurl { - url = "https://github.com/boto/jmespath/archive/0.0.1.tar.gz"; - sha256 = "1a5d62qbgfjbaw8wgkfh78gairnpy6bbdsygwm1prqwap1kyq6ch"; + url = "https://github.com/boto/jmespath/archive/0.0.2.tar.gz"; + sha256 = "0wr1gq3gdyn3n21pvj62csdm095512zxd10gkg5ai1vvxh0mbn3r"; }; propagatedBuildInputs = [ ply ]; @@ -4167,8 +4150,7 @@ pythonPackages = modules // rec { }); ldap = buildPythonPackage rec { - name = "python-ldap-2.4.10"; - namePrefix = ""; + name = "ldap-2.4.10"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz"; @@ -4201,29 +4183,6 @@ pythonPackages = modules // rec { }); - pylint = buildPythonPackage rec { - name = "pylint-0.26.0"; - namePrefix = ""; - - src = fetchurl { - url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; - }; - - propagatedBuildInputs = [ logilab_astng ]; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp "elisp/"*.el $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = http://www.logilab.org/project/pylint; - description = "A bug and style checker for Python"; - }; - }; - - pymacs = pkgs.stdenv.mkDerivation rec { version = "v0.25"; name = "Pymacs-${version}"; @@ -4514,19 +4473,6 @@ pythonPackages = modules // rec { }); - RBTools = buildPythonPackage rec { - name = "rbtools-0.4.1"; - namePrefix = ""; - - src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz"; - sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv"; - }; - - propagatedBuildInputs = [ setuptools ]; - }; - - recaptcha_client = buildPythonPackage rec { name = "recaptcha-client-1.0.6"; @@ -5445,24 +5391,6 @@ pythonPackages = modules // rec { }; }; - vnc2flv = buildPythonPackage rec { - name = "vnc2flv-20100207"; - namePrefix = ""; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; - md5 = "8492e46496e187b49fe5569b5639804e"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Tool to record VNC sessions to Flash Video"; - homepage = http://www.unixuser.org/~euske/python/vnc2flv/; - }; - }; - waitress = buildPythonPackage rec { name = "waitress-0.8.5"; From 945c70202f71e452ad957a1e073d7b3269f9401c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:19:48 +0200 Subject: [PATCH 030/332] qemu: Update to 1.5.2 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1a35b870192..e1ae4df4443 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "qemu-1.5.1"; + name = "qemu-1.5.2"; src = fetchurl { url = "http://wiki.qemu.org/download/${name}.tar.bz2"; - sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"; + sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; }; buildInputs = From 00e311e43878414a3c5f88cabd5a81cd8537c59f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:31:04 +0200 Subject: [PATCH 031/332] qemu-kvm: Remove But install a qemu-kvm wrapper in qemu. --- .../virtualization/qemu/default.nix | 12 +++- pkgs/os-specific/linux/qemu-kvm/default.nix | 58 --------------- .../linux/qemu-kvm/fix-librt-check.patch | 72 ------------------- .../linux/qemu-kvm/fix-usb-passthrough.patch | 45 ------------ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 12 insertions(+), 177 deletions(-) delete mode 100644 pkgs/os-specific/linux/qemu-kvm/default.nix delete mode 100644 pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch delete mode 100644 pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e1ae4df4443..3a6cdb6f8c6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid +, makeWrapper , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng , spiceSupport ? true, spice, spice_protocol @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 alsaLib texinfo libuuid + vde2 alsaLib texinfo libuuid makeWrapper ] ++ stdenv.lib.optionals sdlSupport [ SDL ] ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional spiceSupport "--enable-spice" ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"; + postInstall = + '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm" + fi + ''; + meta = { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix deleted file mode 100644 index 2f93769d280..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib, libaio, mesa, perl, texinfo -, spice, spice_protocol, spiceSupport ? false }: - -assert stdenv.isLinux; - -let version = "1.2.0"; in - -stdenv.mkDerivation rec { - name = "qemu-kvm-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9"; - }; - - buildInputs = - [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng - ncurses python glib libaio mesa texinfo perl - ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; - - patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ]; - - postPatch = '' - patchShebangs . - sed '/qtest_add_func.*check_time/d' -i tests/rtc-test.c - '' # disable tests that meddle with system time, they seem to work bad, maybe due to newer glib - + stdenv.lib.optionalString spiceSupport '' - for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do - substituteInPlace $i --replace '#include ' '#include ' - done - ''; - - configureFlags = - [ "--audio-drv-list=alsa" - "--smbd=smbd" # use `smbd' from $PATH - "--enable-docs" - "--python=${python}/bin/python" - ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; - - postInstall = - '' - # Libvirt expects us to be called `qemu-kvm'. Otherwise it will - # set the domain type to "qemu" rather than "kvm", which can - # cause architecture selection to misbehave. - ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm - ''; - - doCheck = true; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.linux-kvm.org/; - description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch b/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch deleted file mode 100644 index 57de288723e..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 8bacde8d86a09699207d85d4bab06162aed18dc4 -Author: Natanael Copa -Date: Wed Sep 12 09:06:51 2012 +0000 - - configure: properly check if -lrt and -lm is needed - - Fixes build against uClibc. - - uClibc provides 2 versions of clock_gettime(), one with realtime - support and one without (this is so you can avoid linking in -lrt - unless actually needed). This means that the clock_gettime() don't - need -lrt. We still need it for timer_create() so we check for this - function in addition. - - We also need check if -lm is needed for isnan(). - - Both -lm and -lrt are needed for libs_qga. - - Signed-off-by: Natanael Copa - Signed-off-by: Blue Swirl - -diff --git a/configure b/configure -index 7656c32..9ab13db 100755 ---- a/configure -+++ b/configure -@@ -2671,17 +2671,44 @@ fi - - - ########################################## -+# Do we need libm -+cat > $TMPC << EOF -+#include -+int main(void) { return isnan(sin(0.0)); } -+EOF -+if compile_prog "" "" ; then -+ : -+elif compile_prog "" "-lm" ; then -+ LIBS="-lm $LIBS" -+ libs_qga="-lm $libs_qga" -+else -+ echo -+ echo "Error: libm check failed" -+ echo -+ exit 1 -+fi -+ -+########################################## - # Do we need librt -+# uClibc provides 2 versions of clock_gettime(), one with realtime -+# support and one without. This means that the clock_gettime() don't -+# need -lrt. We still need it for timer_create() so we check for this -+# function in addition. - cat > $TMPC < - #include --int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); } -+int main(void) { -+ timer_create(CLOCK_REALTIME, NULL, NULL); -+ return clock_gettime(CLOCK_REALTIME, NULL); -+} - EOF - - if compile_prog "" "" ; then - : --elif compile_prog "" "-lrt" ; then -+# we need pthread for static linking. use previous pthread test result -+elif compile_prog "" "-lrt $pthread_lib" ; then - LIBS="-lrt $LIBS" -+ libs_qga="-lrt $libs_qga" - fi - - if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch b/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch deleted file mode 100644 index a73df310629..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.launchpad.net/qemu/+bug/1033727 - -From: Hans de Goede -Date: Wed, 12 Sep 2012 13:08:40 +0000 (+0200) -Subject: uhci: Don't queue up packets after one with the SPD flag set -X-Git-Tag: v1.3.0-rc0~483^2 -X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=72a04d0c178f01908d74539230d9de64ffc6da19 -Bug-Debian: http://bugs.debian.org/683983 - -uhci: Don't queue up packets after one with the SPD flag set - -Don't queue up packets after a packet with the SPD (short packet detect) -flag set. Since we won't know if the packet will actually be short until it -has completed, and if it is short we should stop the queue. - -This fixes a miniature photoframe emulating a USB cdrom with the windows -software for it not working. - -Signed-off-by: Hans de Goede -Signed-off-by: Gerd Hoffmann ---- - -diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c -index c7c8786..cdc8bc3 100644 ---- a/hw/usb/hcd-uhci.c -+++ b/hw/usb/hcd-uhci.c -@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td) - } - assert(ret == TD_RESULT_ASYNC_START); - assert(int_mask == 0); -+ if (ptd.ctrl & TD_CTRL_SPD) { -+ break; -+ } - plink = ptd.link; - } - } -@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s) - - case TD_RESULT_ASYNC_START: - trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf); -- if (is_valid(td.link)) { -+ if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) { - uhci_fill_queue(s, &td); - } - link = curr_qh ? qh.link : td.link; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d06b8732bb..8c6eae1919e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6717,7 +6717,7 @@ let "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; - qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; + qemu_kvm = qemu.override { x86Only = true; }; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From b5fcb5b67d104bbde4bf6a6ac565c6548ca91d11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:35:53 +0200 Subject: [PATCH 032/332] Use the qemu-kvm wrapper --- pkgs/build-support/vm/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index dbab401d9ba..2821fc0a099 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -9,9 +9,9 @@ with pkgs; rec { - kvm = pkgs.qemu; + qemu = pkgs.qemu_kvm; - qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386"); + qemuProg = "${qemu}/bin/qemu-kvm"; modulesClosure = makeModulesClosure { @@ -188,7 +188,6 @@ rec { qemuCommandLinux = '' ${qemuProg} \ - -enable-kvm \ ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ @@ -242,7 +241,7 @@ rec { createEmptyImage = {size, fullName}: '' mkdir $out diskImage=$out/disk-image.qcow2 - ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" mkdir $out/nix-support echo "${fullName}" > $out/nix-support/full-name @@ -362,7 +361,7 @@ rec { diskImage=$(pwd)/disk-image.qcow2 origImage=${attrs.diskImage} if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi - ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage + ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage ''; /* Inside the VM, run the stdenv setup script normally, but at the @@ -459,7 +458,7 @@ rec { fi diskImage="$1" if ! test -e "$diskImage"; then - ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" + ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" fi export TMPDIR=$(mktemp -d) export out=/dummy From c8c817a3b45ce124b6e6376957ae599b622551ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:50:42 +0200 Subject: [PATCH 033/332] qemu-kvm: Disambiguate --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3a6cdb6f8c6..dcf5b4e5009 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,11 +7,13 @@ , x86Only ? false }: +let n = "qemu-1.5.2"; in + stdenv.mkDerivation rec { - name = "qemu-1.5.2"; + name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.bz2"; + url = "http://wiki.qemu.org/download/${n}.tar.bz2"; sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6eae1919e..d2b472dce83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6717,7 +6717,7 @@ let "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; - qemu_kvm = qemu.override { x86Only = true; }; + qemu_kvm = lowPrio (qemu.override { x86Only = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From ab7f2aea8e644d8391ea8a05fd5baa2f8b2eaa7d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 15:02:23 +0200 Subject: [PATCH 034/332] apr: Update to 1.4.8 Also drop the accept4 hack because Linux 2.6.32 is now the minimal kernel version supported by Nixpkgs. --- pkgs/development/libraries/apr/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 07a565596bb..1893a2c9413 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -5,21 +5,19 @@ let in stdenv.mkDerivation rec { - name = "apr-1.4.6"; + name = "apr-1.4.8"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "ffee70a111fd07372982b0550bbb14b7"; + md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41"; }; patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; configureFlags = - # Don't use accept4 because it's only supported on Linux >= 2.6.28. - [ "apr_cv_accept4=no" ] # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 - ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; meta = { homepage = http://apr.apache.org/; From 32b036a4304c60b4084686ea8c2e41ad40c4b112 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 15:02:54 +0200 Subject: [PATCH 035/332] apr-util: Update to 1.5.2 --- pkgs/development/libraries/apr-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 5f6291127e9..8e49d398460 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.5.1"; + name = "apr-util-1.5.2"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "9c1db8606e520f201c451ec9a0b095f6"; + md5 = "89c1348aa79e898d7c34a6206311c9c2"; }; configureFlags = '' From 537a71a51e6b16d18ba0c8e87ae2ec60f902228e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jul 2013 16:18:18 +0200 Subject: [PATCH 036/332] openconnect and vpnc NetworkManager plugins added also openvpn plugin updated to the same version as NetworkManager --- .../network-manager-applet/default.nix | 17 +++++-- .../network-manager/openconnect.nix | 46 +++++++++++++++++++ .../networking/network-manager/openvpn.nix | 2 +- .../tools/networking/network-manager/pptp.nix | 4 +- .../tools/networking/network-manager/vpnc.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 6 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/networking/network-manager/openconnect.nix create mode 100644 pkgs/tools/networking/network-manager/vpnc.nix diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 387ccfcaed4..69c7b77e3f9 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }: +, makeWrapper, networkmanager_openvpn, networkmanager_vpnc +, networkmanager_openconnect, udev, hicolor_icon_theme }: let pn = "network-manager-applet"; @@ -31,8 +32,18 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager - ln -s ${networkmanager_openvpn}/lib/* $out/lib + mkdir -p $out/etc/NetworkManager/VPN + ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name + ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name + ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name + mkdir -p $out/lib/NetworkManager + ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ + mkdir -p $out/libexec + ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ + ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ + ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix new file mode 100644 index 00000000000..795f727599b --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openconnect"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "16sdgrabbh2y7j6g9ic9lm5z6sxn7iz3j0xininkiwnjgbsqf961"; + }; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-openconnect-service.c" \ + --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "TODO"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 9817a8cddd1..d49dcbbc92a 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a60199aab2d..41dda0086e4 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l"; + sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac"; }; buildInputs = [ networkmanager pptp ppp ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix new file mode 100644 index 00000000000..57ab5af5bcb --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-vpnc"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "1hdigqfvsjlr1zr23lwmcsvcv1x74cqhfpwrd0j0zhhmjdb4ql74"; + }; + + buildInputs = [ vpnc networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-vpnc-service.c" \ + --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "TODO"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2b472dce83..b1ff989ee68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1331,6 +1331,10 @@ let networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; }; + networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + + networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; From 77063f3f7587fdd0551a8f584ad40f13409c363f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jul 2013 08:49:31 +0200 Subject: [PATCH 037/332] adding description to networkmanager plugins --- pkgs/tools/networking/network-manager/openconnect.nix | 2 +- pkgs/tools/networking/network-manager/openvpn.nix | 2 +- pkgs/tools/networking/network-manager/vpnc.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 795f727599b..ccb5badd903 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; }; } diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index d49dcbbc92a..c51bf09f99c 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; }; } diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 57ab5af5bcb..683a7e76948 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's VPNC plugin"; inherit (networkmanager.meta) maintainers platforms; }; } From ab9be1b809c63b92c8ebb5723bf8f331c4bb9775 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 16:00:57 +0200 Subject: [PATCH 038/332] Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration --- pkgs/development/mobile/androidenv/addon.xml | 167 ++++++++++--- pkgs/development/mobile/androidenv/addons.nix | 16 +- .../mobile/androidenv/androidsdk.nix | 21 +- .../mobile/androidenv/build-tools.nix | 54 ++++ .../development/mobile/androidenv/default.nix | 12 +- .../mobile/androidenv/generate-platforms.sh | 4 +- .../mobile/androidenv/generate-platforms.xsl | 2 +- .../mobile/androidenv/generate-sysimages.sh | 2 +- .../mobile/androidenv/generate-sysimages.xsl | 2 +- .../mobile/androidenv/platform-tools.nix | 24 +- .../mobile/androidenv/platforms-linux.nix | 26 +- .../mobile/androidenv/platforms-macosx.nix | 26 +- .../{repository-7.xml => repository-8.xml} | 236 +++++++++++++----- .../development/mobile/androidenv/support.nix | 6 +- .../mobile/androidenv/sysimages.nix | 12 +- 15 files changed, 445 insertions(+), 165 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/build-tools.nix rename pkgs/development/mobile/androidenv/{repository-7.xml => repository-8.xml} (85%) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index fb5d324d778..635d0ae964f 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -731,13 +731,63 @@ August 15, 2011 - + google + Google Inc. + google_tv_addon + Google TV Addon + 13 + 1 + Android + Google TV, API 13 + http://developer.android.com/ + + + + 87721879 + b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 + google_tv-13_r01.zip + + + + + + + google Google Inc. google_apis Google APIs Android + Google APIs 17 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 137156978 + 8246f61d24f0408c8e7bc352a1e522b7e2b619ba + google_apis-17_r03.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 18 1 @@ -752,9 +802,9 @@ August 15, 2011 - 132568033 - 62cb086f11e15713878c8834d58ef1a2454c19a4 - google_apis-17_r01.zip + 147899839 + 5c0c24f04e6b65c61da83408b7aee79228c24a40 + google_apis-18_r01.zip @@ -763,8 +813,8 @@ August 15, 2011 - - 11 + + 18 Android android Android Support Library @@ -772,9 +822,27 @@ August 15, 2011 compatibility - 1264808 - d30d182d8e4c86bb4464c03a83ccffce7bc84ecd - support_r11.zip + 4438319 + bd67b4b8a6bac629f24c8aea75c3619a26d9a568 + support_r18.zip + + + + + + + + 2 + Android + android + Android Support Repository + Local Maven repository for Support Libraries + m2repository + + + 3705797 + c4284e4bf17a1e8bafc96a18de36984022d5a46a + android_m2repository_r02.zip @@ -782,6 +850,23 @@ August 15, 2011 + + google + Google Inc. + Google Repository + m2repository + 1 + Local Maven repository for Google Libraries + + + + 660833 + d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0 + google_m2repository_r01.zip + + + + google Google Inc. @@ -807,14 +892,14 @@ August 15, 2011 Google Play APK Expansion Library play_apk_expansion market_apk_expansion - 2 + 3 Google Play APK Expansion library http://developer.android.com/guide/market/expansion-files.html - 111636 - 47fa8c691fcc8cf815e7ebbf140f12e94495f73b - market_apk_expansion-r02.zip + 110201 + 5305399dc1a56814e86b8459ce24871916f78b8c + market_apk_expansion-r03.zip @@ -825,34 +910,34 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 4 + 9 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 3732458 - bbb3d11225fcf60a0bae75afa2c4737010468bf6 - google_play_services_2012110_r04.zip + 5125755 + 3e31fc0b982f938edf216afe9e532774db12607a + google_play_services_3159130_r09.zip - + google Google Inc. Google USB Driver usb_driver - 7 - USB Driver for Windows, revision 7 + 8 + USB Driver for Windows, revision 8 http://developer.android.com/ - 8681704 - 147c339fde22f98ae41b15349a8303d39a2cf6e5 - usb_driver_r07-windows.zip + 8682230 + 2b2f91098a984a865a70f0bd841a843fb54462fc + usb_driver_r08-windows.zip @@ -863,14 +948,14 @@ August 15, 2011 Google Play Billing Library play_billing market_billing - 3 + 4 Google Play Billing files and sample code http://developer.android.com/google/play/billing/index.html - 435718 - a133d454c992ef2a18e62fa810e8185f1be4b054 - play_billing_r03.zip + 437084 + 38fdae51dadb6d1e63e177adba3e4d96b751686e + play_billing_r04.zip @@ -881,14 +966,14 @@ August 15, 2011 Google Inc. Google AdMob Ads SDK admob_ads_sdk - 8 + 11 AdMob Ads SDK https://developers.google.com/mobile-ads-sdk/docs/ - 545547 - 031476aa5a491239d2624e8de8c9e46e40d93e3f - https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip + 704512 + 0102859d9575baa0bf4fd5eb422af2ad0fe6cb82 + https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip @@ -897,16 +982,16 @@ August 15, 2011 google Google Inc. - Google Analytics SDK - analytics_sdk - 2 - Analytics SDK - http://code.google.com/mobile/analytics/ + Google Analytics App Tracking SDK + analytics_sdk_v2 + 3 + Analytics App Tracking SDK + http://developers.google.com/analytics/devguides/collection/ - 53055 - 328bcdc6c241879ebb04d6edc6fec1052a171004 - https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip + 211432 + dc14026bf0ce78315cb5dd00552607de0894de83 + https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip @@ -933,10 +1018,10 @@ August 15, 2011 google Google Inc. - Google Cloud Messaging for Android Library + [Deprecated] Google Cloud Messaging for Android Library gcm 3 - Google Cloud Messaging for Android library and sample code + GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported https://developers.google.com/android/gcm/index diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index f26db5c2cb7..651c84533f0 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -185,8 +185,20 @@ in google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip; - sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4"; + url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip; + sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_18 = buildGoogleApis { + name = "google_apis-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-18_r01.zip; + sha1 = "5c0c24f04e6b65c61da83408b7aee79228c24a40"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index e8e1f919fe4..98bf7ff2ee9 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,23 +1,23 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper -, platformTools, support, platforms, sysimages, addons +, platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , freetype, fontconfig, gtk, atk }: {platformVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-21"; + name = "android-sdk-22.05"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-linux.tgz; - md5 = "7f8d73b629f808cdcfc9f9900bbd7580"; + url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; + md5 = "8201b10c21510f082c54f58a9bb082c8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-macosx.zip; - md5 = "67e46adca90dd18d7291443f6c15d6af"; + url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; + md5 = "94f3cbe896c332b94ee0408ae610a4b8"; } else throw "platform not ${stdenv.system} supported!"; @@ -61,14 +61,14 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib done ''} ''} @@ -107,6 +107,7 @@ stdenv.mkDerivation { cd .. ln -s ${platformTools}/platform-tools + ln -s ${buildTools}/build-tools ln -s ${support}/support # Symlink required Google API add-ons diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix new file mode 100644 index 00000000000..0d9cbc22080 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -0,0 +1,54 @@ +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: + +stdenv.mkDerivation { + name = "android-build-tools-r18.0.1"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + } + else throw "System ${stdenv.system} not supported!"; + + buildCommand = '' + mkdir -p $out/build-tools + cd $out/build-tools + unzip $src + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + cd android-* + + # Patch the interpreter + for i in aapt aidl dexdump llvm-rs-cc + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + done + + # These binaries need to find libstdc++ and libgcc_s + for i in aidl libLLVM.so + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + done + + # These binaries need to find libstdc++, libgcc_s and libraries in the current folder + for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i + done + + # These binaries need to find libstdc++, libgcc_s, and zlib + for i in aapt dexdump + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + done + ''} + + patchShebangs . + ''; + + buildInputs = [ unzip ]; +} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a76deb98b6e..2191a0953bf 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -3,10 +3,15 @@ rec { platformTools = import ./platform-tools.nix { inherit (pkgs) stdenv fetchurl unzip; - inherit (pkgs_i686) zlib ncurses; stdenv_32bit = pkgs_i686.stdenv; }; + buildTools = import ./build-tools.nix { + inherit (pkgs) stdenv fetchurl unzip; + stdenv_32bit = pkgs_i686.stdenv; + zlib_32bit = pkgs_i686.zlib; + }; + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -31,10 +36,10 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs) freetype fontconfig gtk atk mesa; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; - inherit platformTools support platforms sysimages addons; + inherit platformTools buildTools support platforms sysimages addons; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; @@ -43,6 +48,7 @@ rec { libXau_32bit = pkgs_i686.xorg.libXau; libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXext_32bit = pkgs_i686.xorg.libXext; + mesa_32bit = pkgs_i686.mesa; }; androidsdk_4_1 = androidsdk { diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh index 983d8bde87b..8ac4ad328f4 100755 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ b/pkgs/development/mobile/androidenv/generate-platforms.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix +xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix +xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index 1802ae63efe..249f044550b 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -1,7 +1,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index dc28c27f45f..ae4b4f35a37 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix +xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 1224ebbd4e8..6036595eb9a 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -2,7 +2,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 55499608290..191521bb654 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,15 +1,15 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: +{stdenv, stdenv_32bit, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-platform-tools-r16"; + name = "android-platform-tools-r18.0.1"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip; - sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; - sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else throw "System ${stdenv.system} not supported!"; @@ -21,20 +21,12 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' - for i in aapt adb aidl dexdump fastboot llvm-rs-cc + for i in adb fastboot do patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i done - - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt - patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc ''} - - patchShebangs . ''; buildInputs = [ unzip ]; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index f544fcc08be..2ca937b5534 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a1434bbe56c..c89cb9ed127 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-8.xml similarity index 85% rename from pkgs/development/mobile/androidenv/repository-7.xml rename to pkgs/development/mobile/androidenv/repository-8.xml index 7bbbaf1e362..4e180ac4b3e 100644 --- a/pkgs/development/mobile/androidenv/repository-7.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - + Terms and Conditions @@ -570,33 +570,33 @@ November 13, 2012 - - 3 - Android SDK Platform 4.1 + + 4 + Android SDK Platform 4.1.2 4.1.2 16 - 20 + 21 - 8 + 9 1 - 47995505 - 80d9ffef58168f9bccd862830e2ee51f686b167e - android-16_r03.zip + 48005140 + 90b9157b8b45f966be97e11a22fba4591b96c2ee + android-16_r04.zip - - 1 - Android SDK Platform 4.2 - 4.2 + + 2 + Android SDK Platform 4.2.2 + 4.2.2 17 21 @@ -607,9 +607,32 @@ November 13, 2012 - 47886130 - c2e7c8c8db40e06b804ddb1725ac2c3555b55025 - android-17_r01.zip + 48057484 + c442c32c1b702173ab0929a74486e4f86fe528ec + android-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 4.3 + 18 + + 21 + + + 9 + 1 + + + + 48752456 + c24de91d6f296cf453701aef281609779fffb379 + android-18_r01.zip @@ -666,16 +689,32 @@ November 13, 2012 - - 1 - Android SDK Platform 4.2 + + 2 + Android SDK Platform 4.2.2 17 armeabi-v7a - 116831648 - 45b9344473e0a6d063c2b1fe58d8cd47d307905e - sysimg_armv7a-17_r01.zip + 116553808 + 1c321cda1af793b84d47d1a8d15f85444d265e3c + sysimg_armv7a-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 18 + armeabi-v7a + + + 125597583 + 5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e + sysimg_armv7a-18_r01.zip @@ -866,89 +905,134 @@ November 13, 2012 + + + 1 + 18 + + + 19897793 + 73e879ce46c04a6e63ad1a9107018b4782945007 + samples-18_r01.zip + + + + + - + - 16 + 18 + 0 + 1 - 11938435 - 0d6245b685c7d303cf4a054a3d373c4427b7ad01 - platform-tools_r16-windows.zip + 954769 + b40fea3ed72296dd42dd616a7abf536b8dace20d + platform-tools_r18.0.1-windows.zip - 12676089 - 84d563ae5e324f223f335f11bf511bf6207c05fb - platform-tools_r16-linux.zip + 1011194 + cf9bdbbaa34da37b59724f914dad907c2c74a387 + platform-tools_r18.0.1-linux.zip - 13147351 - fbb0f8d2786a83b8c3eb6df402e706e136db8fed - platform-tools_r16-macosx.zip + 971087 + 126325cbb55928c38acbb9c7bb5d9145d94fad56 + platform-tools_r18.0.1-macosx.zip - + - - + + - 21 + 17 + 0 + 0 - - 16 - - 98982670 - 57bbfadcedbef44fc322e5e037666393668cf3fe - tools_r21-windows.zip + 11004914 + 899897d327b0bad492d3a40d3db4d96119c15bc0 + build-tools_r17-windows.zip - 91495104 - 013b9c04407a9d73b8bf3c574327fbe870acd264 - tools_r21-linux.zip + 11696007 + 2c2872bc3806aabf16a12e3959c2183ddc866e6d + build-tools_r17-linux.zip - 65767130 - fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d - tools_r21-macosx.zip + 12208114 + 602ee709be9dbb8f179b1e4075148a57f9419930 + build-tools_r17-macosx.zip - + - - + + + + - 21 + 18 0 1 - 1 + + + + 15413527 + a6c2afd0b6289d589351956d2f5212b37014ca7d + build-tools_r18.0.1-windows.zip + + + 16627330 + f11618492b0d2270c332325d45d752d3656a9640 + build-tools_r18.0.1-linux.zip + + + 16633121 + d84f5692fb44d60fc53e5b2507cebf9f24626902 + build-tools_r18.0.1-macosx.zip + + + + + + + + + + + 22 + 0 + 5 - 16 + 18 - 98998088 - 1503aaf2c91cb07c0240a2db3af0de027941a4f6 - tools_r21.0.1_rc1-windows.zip + 113389691 + a3f450706b5374122f0edb76a4488462ba5171ca + tools_r22.0.5-windows.zip - 91510079 - 183670a7f9878d8d3693d5fcf32e1357b69f0fed - tools_r21.0.1_rc1-linux.zip + 105904090 + 06a3e1d66b9280cba49c7ba1893ea14beae072d2 + tools_r22.0.5-linux.zip - 65777178 - 109d4f287904875f067e021be3fd1f549e6afb67 - tools_r21.0.1_rc1-macosx.zip + 77191184 + 318947edef0ab46603eb7f4d21333ee4b4fa1ff3 + tools_r22.0.5-macosx.zip @@ -957,14 +1041,14 @@ November 13, 2012 - + 1 - 17 + 18 - 171564393 - fb988cdd2beaac0dd47dc630821ccc30557c67e5 - docs-17_r01.zip + 142332266 + 83632d157781d31f2a8e52acad5c4c5d0f307cba + docs-18_r01.zip @@ -1027,4 +1111,18 @@ November 13, 2012 + + + + 1 + 18 + + + 20226735 + 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78 + sources-18_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index 2e9690de7a2..ca1988527e2 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-r11"; + name = "android-support-r18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r11.zip; - sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; + url = https://dl-ssl.google.com/android/repository/support_r18.zip; + sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index b35b4298983..71a97126935 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -41,8 +41,16 @@ in sysimg_17 = buildSystemImage { name = "armeabi-v7a-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip; - sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip; + sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; + }; + }; + + sysimg_18 = buildSystemImage { + name = "armeabi-v7a-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; + sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; }; }; From c324091a77d1ed04c13058a1655bb12a2f2271bd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 16:14:47 +0200 Subject: [PATCH 039/332] Fixed incorrect platform-tools sha1 value --- pkgs/development/mobile/androidenv/platform-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 191521bb654..bf263741bdd 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { } else if stdenv.system == "x86_64-darwin" then fetchurl { url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip; - sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; + sha1 = "126325cbb55928c38acbb9c7bb5d9145d94fad56"; } else throw "System ${stdenv.system} not supported!"; From afbc5cd5e90087713d8191c2ea0740ed1fbaa557 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 31 Jul 2013 15:20:23 +0000 Subject: [PATCH 040/332] added dhex, a nice ncurses based hex editor for the shell --- pkgs/applications/editors/dhex/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/dhex/default.nix diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix new file mode 100644 index 00000000000..45b7de900e2 --- /dev/null +++ b/pkgs/applications/editors/dhex/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "dhex-${version}"; + version = "0.68"; + + src = fetchurl { + url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz"; + sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08"; + }; + + buildInputs = [ ncurses ]; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/share/man/man1 + ensureDir $out/share/man/man5 + + cp dhex $out/bin + cp dhex.1 $out/share/man/man1 + cp dhexrc.5 $out/share/man/man5 + cp dhex_markers.5 $out/share/man/man5 + cp dhex_searchlog.5 $out/share/man/man5 + ''; + + meta = { + description = "A themeable hex editor with diff mode"; + homepage = http://www.dettus.net/dhex/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [qknight]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19afc66ad57..1af2257b986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3852,6 +3852,8 @@ let dbus_libs = dbus.libs; dbus_daemon = dbus.daemon; + dhex = callPackage ../applications/editors/dhex { }; + dclib = callPackage ../development/libraries/dclib { }; directfb = callPackage ../development/libraries/directfb { }; From 1c8b4c8950961658b80e767c8d9feed10a366c72 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 18:56:27 +0200 Subject: [PATCH 041/332] Now x86 and mips images from external repositories are supported + added GPU option to the emulate function --- .../mobile/androidenv/androidsdk.nix | 30 ++-- .../mobile/androidenv/build-app.nix | 6 +- .../development/mobile/androidenv/default.nix | 1 + .../mobile/androidenv/emulate-app.nix | 13 +- .../androidenv/generate-sysimages-others.xsl | 21 +++ .../mobile/androidenv/generate-sysimages.sh | 25 +++- .../mobile/androidenv/generate-sysimages.xsl | 18 +-- .../mobile/androidenv/sys-img-mips.xml | 132 +++++++++++++++++ .../mobile/androidenv/sys-img-x86.xml | 139 ++++++++++++++++++ .../mobile/androidenv/sysimages.nix | 73 +++++++-- 10 files changed, 412 insertions(+), 46 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/generate-sysimages-others.xsl create mode 100644 pkgs/development/mobile/androidenv/sys-img-mips.xml create mode 100644 pkgs/development/mobile/androidenv/sys-img-x86.xml diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 98bf7ff2ee9..34cc07adf35 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -5,7 +5,7 @@ , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , freetype, fontconfig, gtk, atk }: -{platformVersions, useGoogleAPIs}: +{platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { name = "android-sdk-22.05"; @@ -148,19 +148,21 @@ stdenv.mkDerivation { mkdir -p system-images cd system-images - ${stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then - let - sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages; - in - '' - mkdir -p android-${platformVersion} - cd android-${platformVersion} - ln -s ${sysimg}/* - cd .. - '' - else "" - ) platformVersions} + ${stdenv.lib.concatMapStrings (abiVersion: + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then + let + sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages; + in + '' + mkdir -p android-${platformVersion} + cd android-${platformVersion} + ln -s ${sysimg}/* + cd .. + '' + else "" + ) platformVersions + ) abiVersions} # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 8b770ede0fc..b5aa82cced7 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false +{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -10,7 +10,9 @@ let else if stdenv.system == "x86_64-darwin" then "macosx" else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; }; + androidsdkComposition = androidsdk { + inherit platformVersions abiVersions useGoogleAPIs; + }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 2191a0953bf..d7d8d92a66e 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -53,6 +53,7 @@ rec { androidsdk_4_1 = androidsdk { platformVersions = [ "16" ]; + abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 3cbe5723806..97d73bffded 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,8 +1,12 @@ {stdenv, androidsdk}: -{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}: +{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}: let - androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; }; + androidsdkComposition = androidsdk { + inherit useGoogleAPIs; + platformVersions = [ platformVersion ]; + abiVersions = [ abiVersion ]; + }; in stdenv.mkDerivation { inherit name; @@ -48,6 +52,11 @@ stdenv.mkDerivation { # Create a virtual android device ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + # Enable GPU acceleration + ${stdenv.lib.optionalString enableGPU '' + echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + ''} + # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl new file mode 100644 index 00000000000..31ab72add36 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl @@ -0,0 +1,21 @@ + + + + + + + + + + sysimg__ = buildSystemImage { + name = "-"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img//; + sha1 = ""; + }; + }; + + + diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index ae4b4f35a37..90b1e04c229 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,26 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix +cat > sysimages.nix << "EOF" +{stdenv, fetchurl, unzip}: + +let + buildSystemImage = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ +EOF + +xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix +xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix +xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix + +cat >> sysimages.nix << "EOF" +} +EOF diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 6036595eb9a..be9947d536a 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -7,22 +7,8 @@ -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - sysimg_ = buildSystemImage { + sysimg__ = buildSystemImage { name = "-"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/; @@ -30,7 +16,5 @@ in }; }; -} - diff --git a/pkgs/development/mobile/androidenv/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml new file mode 100644 index 00000000000..c839d283f4e --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-mips.xml @@ -0,0 +1,132 @@ + + + + + + + + + + 1 + Android 4.0.4 + 15 + mips + + + + 117503178 + a753bb4a6783124dad726c500ce9aec9d2c1b2d9 + sysimg_mips-15_r01.zip + + + + + + 4 + + Android 4.1.2 + 16 + mips + + + + 122482530 + 67943c54fb3943943ffeb05fdd39c0b753681f6e + sysimg_mips-16_r04.zip + + + + + + 1 + + Android 4.2.1 + 17 + mips + + + + 131781761 + f0c6e153bd584c29e51b5c9723cfbf30f996a05d + sysimg_mips-17_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml new file mode 100644 index 00000000000..f0e8347f6db --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + Android SDK Platform 2.3.7 + 2 + 10 + x86 + + + + 55463895 + 34e2436f69606cdfe35d3ef9112f0c64e3ff021d + sysimg_x86-10_r02.zip + + + + + + Android SDK Platform 4.0.4 + 1 + 15 + x86 + + + + 112619605 + d540325952e0f097509622b9e685737584b83e40 + sysimg_x86-15_r01.zip + + + + + + Android SDK Platform 4.1.1 + 1 + 16 + x86 + + + + 131840348 + 9d35bcaa4f9b40443941f32b8a50337f413c021a + sysimg_x86-16_r01.zip + + + + + + Android SDK Platform 4.2 + 1 + 17 + x86 + + + + 138799122 + ddb3313e8dcd07926003f7b828eafea1115ea35b + sysimg_x86-17_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 71a97126935..bc78ea11e6f 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -1,9 +1,8 @@ - {stdenv, fetchurl, unzip}: let buildSystemImage = args: - stdenv.mkDerivation (args // { + stdenv.mkDerivation (args // { buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out @@ -13,8 +12,8 @@ let }); in { - - sysimg_14 = buildSystemImage { + + sysimg_armeabi-v7a_14 = buildSystemImage { name = "armeabi-v7a-14"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip; @@ -22,7 +21,7 @@ in }; }; - sysimg_15 = buildSystemImage { + sysimg_armeabi-v7a_15 = buildSystemImage { name = "armeabi-v7a-15"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip; @@ -30,7 +29,7 @@ in }; }; - sysimg_16 = buildSystemImage { + sysimg_armeabi-v7a_16 = buildSystemImage { name = "armeabi-v7a-16"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip; @@ -38,7 +37,7 @@ in }; }; - sysimg_17 = buildSystemImage { + sysimg_armeabi-v7a_17 = buildSystemImage { name = "armeabi-v7a-17"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip; @@ -46,7 +45,7 @@ in }; }; - sysimg_18 = buildSystemImage { + sysimg_armeabi-v7a_18 = buildSystemImage { name = "armeabi-v7a-18"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; @@ -54,5 +53,59 @@ in }; }; -} - \ No newline at end of file + sysimg_x86_10 = buildSystemImage { + name = "x86-10"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip; + sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; + }; + }; + + sysimg_x86_15 = buildSystemImage { + name = "x86-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip; + sha1 = "d540325952e0f097509622b9e685737584b83e40"; + }; + }; + + sysimg_x86_16 = buildSystemImage { + name = "x86-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip; + sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; + }; + }; + + sysimg_x86_17 = buildSystemImage { + name = "x86-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip; + sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; + }; + }; + + sysimg_mips_15 = buildSystemImage { + name = "mips-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip; + sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; + }; + }; + + sysimg_mips_16 = buildSystemImage { + name = "mips-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + }; + }; + + sysimg_mips_17 = buildSystemImage { + name = "mips-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + }; + }; + } From d7dc9cd0d28ce73f2e49a8a13c594babe63dd35c Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 31 Jul 2013 18:15:53 +0000 Subject: [PATCH 042/332] fixed a patch which was rejected, i wonder why it was still there... --- .../kde-4.10/kdebindings/smokegen-nix.patch | 55 ++++--------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch index 03df484b63e..53257e836e0 100644 --- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch @@ -1,46 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79945c4..a244d0f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,10 +32,6 @@ set(generator_SRC - type.cpp - ) +diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in +--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 ++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 +@@ -80,8 +80,7 @@ + set(SMOKE_API_BIN "@SMOKE_API_BIN@") --# force RPATH so that the binary is usable from within the build tree --set (CMAKE_SKIP_BUILD_RPATH FALSE) --set (CMAKE_SKIP_RPATH FALSE) -- - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) + find_library(SMOKE_BASE_LIBRARY smokebase +- PATHS "@SMOKE_LIBRARY_PREFIX@" +- NO_DEFAULT_PATH) ++ PATHS "@SMOKE_LIBRARY_PREFIX@") - add_executable(smokegen ${generator_SRC}) -diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in -index 947315c..de8d66c 100644 ---- a/cmake/SmokeConfig.cmake.in -+++ b/cmake/SmokeConfig.cmake.in -@@ -44,21 +44,19 @@ macro (find_smoke_component name) - set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "") - - find_path(SMOKE_${uppercase}_INCLUDE_DIR -- ${lowercase}_smoke.h -- PATH ${SMOKE_INCLUDE_DIR} -- NO_DEFAULT_PATH -+ ${lowercase}_smoke.h -+ HINTS ${SMOKE_INCLUDE_DIR} -+ PATH_SUFFIXES smoke - ) - if(WIN32) - # DLLs are in the bin directory. - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@CMAKE_INSTALL_PREFIX@/bin" -- NO_DEFAULT_PATH) -+ PATHS "@CMAKE_INSTALL_PREFIX@/bin") - else(WIN32) - find_library(SMOKE_${uppercase}_LIBRARY - smoke${lowercase} -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - endif(WIN32) - - if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY) + if (NOT SMOKE_BASE_LIBRARY) + if (Smoke_FIND_REQUIRED) From 2238a233523b8608dd607fe9d6460e58144d55c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 31 Jul 2013 21:54:09 +0200 Subject: [PATCH 043/332] wicd: wrapper env vars prefix -> postfix Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because the latter is more deterministic; it prevents possibly wrong versions of dependencies to sneak in from the environment. Do the same for PYTHONPATH. --- pkgs/tools/networking/wicd/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 47e417ffd8a..524c93d218a 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in + sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in rm po/ast.po ''; From dccbdcf52091fe1ceff19912342896b9f94ff064 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 16:54:29 +0200 Subject: [PATCH 044/332] linux: Don't put the kernel version in meta --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 50469eb5383..85f916de1a3 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { passthru = { inherit version modDirVersion kernelPatches; # Combine the `features' attribute sets of all the kernel patches. - features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; + features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches; }; builder = ./builder.sh; @@ -133,7 +133,6 @@ stdenv.mkDerivation { " (with patches: " + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - inherit version; license = "GPLv2"; homepage = http://www.kernel.org/; maintainers = [ From 7ce325f3e042b4072298021868aa3bd8c72997e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 23:56:48 +0200 Subject: [PATCH 045/332] Unify the Linux kernel configurations Having N different copies of the NixOS kernel configuration is bad because these copies tend to diverge. For instance, our 3.10 config lacked some modules that were enabled in older configs, probably because the 3.10 config had been copied off an earlier version of some older kernel config. So now there is a single kernel config in common-config.nix. It has a few conditionals to deal with new/removed kernel options, but otherwise it's pretty straightforward. Also, a lot of cut&paste boilerplate between the kernel Nix expressions is gone (such as preConfigure). --- pkgs/os-specific/linux/kernel/builder.sh | 10 +- .../linux/kernel/common-config.nix | 288 +++++++++++++++++ pkgs/os-specific/linux/kernel/generic.nix | 20 +- pkgs/os-specific/linux/kernel/linux-3.0.nix | 258 +-------------- pkgs/os-specific/linux/kernel/linux-3.10.nix | 297 +----------------- pkgs/os-specific/linux/kernel/linux-3.2.nix | 269 +--------------- pkgs/os-specific/linux/kernel/linux-3.4.nix | 280 +---------------- pkgs/os-specific/linux/kernel/linux-3.8.nix | 293 +---------------- pkgs/os-specific/linux/kernel/linux-3.9.nix | 296 +---------------- .../linux/kernel/linux-rpi-3.6.nix | 51 +-- pkgs/top-level/all-packages.nix | 10 +- 11 files changed, 390 insertions(+), 1682 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/common-config.nix diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 47c7a22c177..bea53e9c4dd 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -10,19 +10,20 @@ postPatch() { # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc. # Patch these away, assuming the tools are in $PATH. for mf in $(find -name Makefile); do - echo "stripping FHS paths in \`$mf'..." - sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' done } configurePhase() { if test -n "$preConfigure"; then - eval "$preConfigure"; + eval "$preConfigure" fi export INSTALL_PATH=$out export INSTALL_MOD_PATH=$out + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" # Set our own localversion, if specified. rm -f localversion* @@ -30,7 +31,6 @@ configurePhase() { echo "$localVersion" > localversion-nix fi - # Patch kconfig to print "###" after every question so that # generate-config.pl can answer them. sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c @@ -112,7 +112,7 @@ installPhase() { if test "$dontStrip" = "1"; then # copy any debugging info that can be found - cp --parents -rv `find -name \*.debug -o -name debug.a` \ + cp --parents -rv `find -name \*.debug -o -name debug.a` \ "$out/lib/modules/$version/build" fi diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix new file mode 100644 index 00000000000..4b19cd2aa2a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -0,0 +1,288 @@ +{ stdenv, version, kernelPlatform, extraConfig }: + +with stdenv.lib; + +'' + # Power management and debugging. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + ${optionalString (versionOlder version "3.10") '' + USB_SUSPEND y + ''} + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI y + MTD_COMPLEX_MAPPINGS y # needed for many devices + ${optionalString (versionOlder version "3.2") '' + NET_POCKET y # enable pocket and portable adapters + ''} + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + CFG80211_WEXT y # Without it, ipw2200 drivers don't build + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + ${optionalString (versionAtLeast version "3.2") '' + B43_PHY_HT y + ''} + BCMA_HOST_PCI y + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration. + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + ${optionalString (versionOlder version "3.9") '' + DRM_RADEON_KMS y + ''} + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y + EXT2_FS_POSIX_ACL y + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NFS_FSCACHE y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + ${optionalString (versionAtLeast version "3.3") '' + AUDIT_LOGINUID_IMMUTABLE y + ''} + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM_TTY? y # RFCOMM TTY support + CRASH_DUMP n + ${optionalString (versionOlder version "3.1") '' + DMAR? n # experimental + ''} + DVB_DYNAMIC_MINORS? y # we use udev + ${optionalString (versionAtLeast version "3.3") '' + EFI_STUB y # EFI bootloader in the bzImage itself + ''} + FHANDLE y # used by systemd + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + ${optionalString (versionAtLeast version "3.6") '' + RC_DEVICES? y # Enable IR devices + ''} + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux containers. + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + ${if versionAtLeast version "3.6" then '' + MEMCG y + MEMCG_SWAP y + '' else '' + CGROUP_MEM_RES_CTLR y + CGROUP_MEM_RES_CTLR_SWAP y + ''} + DEVPTS_MULTIPLE_INSTANCES y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing. + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + # Easier debugging of NFS issues. + ${optionalString (versionAtLeast version "3.4") '' + SUNRPC_DEBUG y + ''} + + # Virtualisation. + XEN_DOM0? y + + # Media support. + ${optionalString (versionAtLeast version "3.6") '' + MEDIA_DIGITAL_TV_SUPPORT y + MEDIA_CAMERA_SUPPORT y + MEDIA_RC_SUPPORT y + ''} + ${optionalString (versionAtLeast version "3.7") '' + MEDIA_USB_SUPPORT y + ''} + + # Our initrd init uses shebang scripts, so can't be modular. + ${optionalString (versionAtLeast version "3.10") '' + BINFMT_SCRIPT y + ''} + + # Enable the 9P cache to speed up NixOS VM tests. + 9P_FSCACHE y + 9P_FS_POSIX_ACL y + + ${kernelPlatform.kernelExtraConfig or ""} + ${extraConfig} +'' diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 85f916de1a3..ad243ae5b7c 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, mktemp, module_init_tools +{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc , # The kernel source tarball. src @@ -6,15 +6,12 @@ , # The kernel version. version +, # Overrides to the kernel config. + extraConfig ? "" + , # The version number used for the module directory modDirVersion ? version -, # The kernel configuration. - config - -, # The kernel configuration when cross building. - configCross ? {} - , # An attribute set whose attributes express the availability of # certain features in this kernel. E.g. `{iwlwifi = true;}' # indicates a kernel that provides Intel wireless support. Used in @@ -40,7 +37,6 @@ # we force building the target asked: bzImage/zImage/uImage/... postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef" -, extraNativeBuildInputs ? [] , ... }: @@ -59,6 +55,12 @@ let map ({extraConfig ? "", ...}: extraConfig) kernelPatches; in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); + configWithPlatform = kernelPlatform: + import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + in stdenv.mkDerivation { @@ -85,7 +87,7 @@ stdenv.mkDerivation { # For UML and non-PC, just ignore all options that don't apply (We are lazy). ignoreConfigErrors = stdenv.platform.name != "pc"; - nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs; + nativeBuildInputs = [ perl mktemp bc ]; buildInputs = lib.optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 9f1a36db7dd..48197ae14ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -1,252 +1,12 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.0.88"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.0.80"; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 7de8aa85392..4b5e4d001a6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,287 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools, bc -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.10.4"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS? y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - # Our initrd init uses shebang scripts, so can't be modular - BINFMT_SCRIPT y - - # Enable the 9P cache to speed up NixOS VM tests. - 9P_FSCACHE y - 9P_FS_POSIX_ACL y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.10.4"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - - extraNativeBuildInputs = [bc]; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 1e1e41a360a..9b1d1bcf6c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,263 +1,12 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.2.49"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.2.49"; - - modDirVersion = version; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e02f9bd5b7b..2cb37987ff4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,271 +1,15 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.4.55"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.4.55"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 1516f97521d..f455f4ee7f8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -1,283 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.8.13"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_SUPPORT y - MEDIA_DIGITAL_TV_SUPPORT y - - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.8.13"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index b3909900c66..51bcf35b3fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -1,286 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools, bc -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.9.11"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS? y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - # Enable the 9P cache to speed up NixOS VM tests. - 9P_FSCACHE y - 9P_FS_POSIX_ACL y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.9.10"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - - extraNativeBuildInputs = [bc]; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index cf88544abd5..319c2ba42b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -1,44 +1,17 @@ -args @ { - stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ... -}: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; +let rev = "91a3be5b2b"; in - rev = "91a3be5b2b"; -in +import ./generic.nix (args // rec { + version = "3.6.y-${rev}"; -import ./generic.nix ( + src = fetchurl { + url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; + name = "linux-raspberrypi-${version}.tar.gz"; + sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; + }; - rec { - version = "3.6.y-${rev}"; - testing = false; + features.iwlwifi = true; - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; - name = "linux-raspberrypi-${version}.tar.gz"; - sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - #features.efiBootStub = true; - #features.needsCifsUtils = true; - #features.canDisableNetfilterConntrackHelpers = true; - #features.netfilterRPFilter = true; - - extraMeta.platforms = []; - } - - // removeAttrs args ["extraConfig"] -) + extraMeta.platforms = []; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f4dbf72ab..8e599a83a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6370,7 +6370,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_0 @@ -6378,7 +6378,7 @@ let }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 @@ -6405,7 +6405,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_4 @@ -6424,11 +6424,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; }; linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 From e1a7be4294f2bac112fa918a2cbf1dd5f0956c6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:02:00 +0200 Subject: [PATCH 046/332] iwlwifi4965ucodeV1: Remove This is verrrry obsolete. --- .../firmware/iwlwifi-4965-ucode/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 8 +---- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix deleted file mode 100644 index 266c7795d23..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-4965-ucode-228.57.1.21"; - - src = fetchurl { - url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - - # The driver expects the `-1' in the file name. - cd "$out" - ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode - ''; - - meta = { - description = "Firmware for the Intel 4965ABG wireless card"; - - longDescription = '' - This package provides version 2 of the Intel wireless card - firmware, for Linux up to 2.6.26. It contains the - `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965' - driver found in recent kernels. - ''; - - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e599a83a11..f3ced7dbc39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6313,8 +6313,6 @@ let iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; - iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { }; - iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { }; iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { }; @@ -6510,11 +6508,7 @@ let iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - iwlwifi4965ucode = - if builtins.compareVersions self.kernel.version "2.6.27" == 0 - || builtins.compareVersions self.kernel.version "2.6.27" == 1 - then iwlwifi4965ucodeV2 - else iwlwifi4965ucodeV1; + iwlwifi4965ucode = iwlwifi4965ucodeV2; atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; From bc8186be1e02f7f63916a8d158890f9e21a0773b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:08:44 +0200 Subject: [PATCH 047/332] linux: Disable /dev/kmem See e.g. https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled --- pkgs/os-specific/linux/kernel/common-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4b19cd2aa2a..2e64dae23fe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -163,7 +163,8 @@ with stdenv.lib; # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default + DEVKMEM n # Disable /dev/kmem # Misc. options. 8139TOO_8129 y From 956d71f8432f9f7b073aaf19d51cf6e3d02ed691 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:14:07 +0200 Subject: [PATCH 048/332] linux: Remove some unused patches --- .../linux/kernel/guruplug-defconfig.patch | 2714 ----------------- .../linux/kernel/guruplug-mach-type.patch | 15 - pkgs/os-specific/linux/kernel/patches.nix | 15 - 3 files changed, 2744 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/guruplug-defconfig.patch delete mode 100644 pkgs/os-specific/linux/kernel/guruplug-mach-type.patch diff --git a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch b/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch deleted file mode 100644 index add982951ad..00000000000 --- a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch +++ /dev/null @@ -1,2714 +0,0 @@ -From 4b82fc0ee759b81c92d33ba4e3dd7bd5f66cc0d6 Mon Sep 17 00:00:00 2001 -From: Siddarth Gore -Date: Mon, 29 Mar 2010 11:00:06 +0530 -Subject: [PATCH] Initial defconfig - -Signed-off-by: Siddarth Gore ---- - arch/arm/configs/guruplug_defconfig | 2694 +++++++++++++++++++++++++++++++++++ - 1 files changed, 2694 insertions(+), 0 deletions(-) - create mode 100644 arch/arm/configs/guruplug_defconfig - -diff --git a/arch/arm/configs/guruplug_defconfig b/arch/arm/configs/guruplug_defconfig -new file mode 100644 -index 0000000..5c164ce ---- /dev/null -+++ b/arch/arm/configs/guruplug_defconfig -@@ -0,0 +1,2694 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.33.2 -+# Thu Apr 22 14:31:17 2010 -+# -+CONFIG_ARM=y -+CONFIG_SYS_SUPPORTS_APM_EMULATION=y -+CONFIG_GENERIC_GPIO=y -+CONFIG_GENERIC_TIME=y -+CONFIG_GENERIC_CLOCKEVENTS=y -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_STACKTRACE_SUPPORT=y -+CONFIG_HAVE_LATENCYTOP_SUPPORT=y -+CONFIG_LOCKDEP_SUPPORT=y -+CONFIG_TRACE_IRQFLAGS_SUPPORT=y -+CONFIG_HARDIRQS_SW_RESEND=y -+CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_RWSEM_GENERIC_SPINLOCK=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -+CONFIG_VECTORS_BASE=0xffff0000 -+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -+CONFIG_CONSTRUCTORS=y -+ -+# -+# General setup -+# -+CONFIG_EXPERIMENTAL=y -+CONFIG_BROKEN_ON_SMP=y -+CONFIG_LOCK_KERNEL=y -+CONFIG_INIT_ENV_ARG_LIMIT=32 -+CONFIG_LOCALVERSION="" -+CONFIG_LOCALVERSION_AUTO=y -+CONFIG_HAVE_KERNEL_GZIP=y -+CONFIG_HAVE_KERNEL_LZO=y -+CONFIG_KERNEL_GZIP=y -+# CONFIG_KERNEL_BZIP2 is not set -+# CONFIG_KERNEL_LZMA is not set -+# CONFIG_KERNEL_LZO is not set -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+# CONFIG_POSIX_MQUEUE is not set -+# CONFIG_BSD_PROCESS_ACCT is not set -+# CONFIG_TASKSTATS is not set -+# CONFIG_AUDIT is not set -+ -+# -+# RCU Subsystem -+# -+CONFIG_TREE_RCU=y -+# CONFIG_TREE_PREEMPT_RCU is not set -+# CONFIG_TINY_RCU is not set -+# CONFIG_RCU_TRACE is not set -+CONFIG_RCU_FANOUT=32 -+# CONFIG_RCU_FANOUT_EXACT is not set -+# CONFIG_TREE_RCU_TRACE is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_LOG_BUF_SHIFT=19 -+# CONFIG_GROUP_SCHED is not set -+# CONFIG_CGROUPS is not set -+# CONFIG_SYSFS_DEPRECATED_V2 is not set -+# CONFIG_RELAY is not set -+CONFIG_NAMESPACES=y -+# CONFIG_UTS_NS is not set -+# CONFIG_IPC_NS is not set -+# CONFIG_USER_NS is not set -+# CONFIG_PID_NS is not set -+# CONFIG_NET_NS is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+CONFIG_RD_GZIP=y -+CONFIG_RD_BZIP2=y -+CONFIG_RD_LZMA=y -+CONFIG_RD_LZO=y -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_SYSCTL=y -+CONFIG_ANON_INODES=y -+# CONFIG_EMBEDDED is not set -+CONFIG_UID16=y -+CONFIG_SYSCTL_SYSCALL=y -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+# CONFIG_KALLSYMS_EXTRA_PASS is not set -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_BASE_FULL=y -+CONFIG_FUTEX=y -+CONFIG_EPOLL=y -+CONFIG_SIGNALFD=y -+CONFIG_TIMERFD=y -+CONFIG_EVENTFD=y -+CONFIG_SHMEM=y -+CONFIG_AIO=y -+ -+# -+# Kernel Performance Events And Counters -+# -+CONFIG_VM_EVENT_COUNTERS=y -+CONFIG_PCI_QUIRKS=y -+CONFIG_SLUB_DEBUG=y -+CONFIG_COMPAT_BRK=y -+# CONFIG_SLAB is not set -+CONFIG_SLUB=y -+# CONFIG_SLOB is not set -+CONFIG_PROFILING=y -+CONFIG_OPROFILE=y -+CONFIG_HAVE_OPROFILE=y -+CONFIG_KPROBES=y -+CONFIG_KRETPROBES=y -+CONFIG_HAVE_KPROBES=y -+CONFIG_HAVE_KRETPROBES=y -+ -+# -+# GCOV-based kernel profiling -+# -+# CONFIG_GCOV_KERNEL is not set -+CONFIG_SLOW_WORK=y -+# CONFIG_SLOW_WORK_DEBUG is not set -+CONFIG_HAVE_GENERIC_DMA_COHERENT=y -+CONFIG_SLABINFO=y -+CONFIG_RT_MUTEXES=y -+CONFIG_BASE_SMALL=0 -+CONFIG_MODULES=y -+# CONFIG_MODULE_FORCE_LOAD is not set -+CONFIG_MODULE_UNLOAD=y -+# CONFIG_MODULE_FORCE_UNLOAD is not set -+# CONFIG_MODVERSIONS is not set -+# CONFIG_MODULE_SRCVERSION_ALL is not set -+CONFIG_BLOCK=y -+CONFIG_LBDAF=y -+# CONFIG_BLK_DEV_BSG is not set -+# CONFIG_BLK_DEV_INTEGRITY is not set -+ -+# -+# IO Schedulers -+# -+CONFIG_IOSCHED_NOOP=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+# CONFIG_DEFAULT_DEADLINE is not set -+CONFIG_DEFAULT_CFQ=y -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="cfq" -+# CONFIG_INLINE_SPIN_TRYLOCK is not set -+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK is not set -+# CONFIG_INLINE_SPIN_LOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_SPIN_UNLOCK is not set -+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_READ_TRYLOCK is not set -+# CONFIG_INLINE_READ_LOCK is not set -+# CONFIG_INLINE_READ_LOCK_BH is not set -+# CONFIG_INLINE_READ_LOCK_IRQ is not set -+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_READ_UNLOCK is not set -+# CONFIG_INLINE_READ_UNLOCK_BH is not set -+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_WRITE_TRYLOCK is not set -+# CONFIG_INLINE_WRITE_LOCK is not set -+# CONFIG_INLINE_WRITE_LOCK_BH is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_WRITE_UNLOCK is not set -+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -+# CONFIG_MUTEX_SPIN_ON_OWNER is not set -+CONFIG_FREEZER=y -+ -+# -+# System Type -+# -+CONFIG_MMU=y -+# CONFIG_ARCH_AAEC2000 is not set -+# CONFIG_ARCH_INTEGRATOR is not set -+# CONFIG_ARCH_REALVIEW is not set -+# CONFIG_ARCH_VERSATILE is not set -+# CONFIG_ARCH_AT91 is not set -+# CONFIG_ARCH_CLPS711X is not set -+# CONFIG_ARCH_GEMINI is not set -+# CONFIG_ARCH_EBSA110 is not set -+# CONFIG_ARCH_EP93XX is not set -+# CONFIG_ARCH_FOOTBRIDGE is not set -+# CONFIG_ARCH_MXC is not set -+# CONFIG_ARCH_STMP3XXX is not set -+# CONFIG_ARCH_NETX is not set -+# CONFIG_ARCH_H720X is not set -+# CONFIG_ARCH_NOMADIK is not set -+# CONFIG_ARCH_IOP13XX is not set -+# CONFIG_ARCH_IOP32X is not set -+# CONFIG_ARCH_IOP33X is not set -+# CONFIG_ARCH_IXP23XX is not set -+# CONFIG_ARCH_IXP2000 is not set -+# CONFIG_ARCH_IXP4XX is not set -+# CONFIG_ARCH_L7200 is not set -+# CONFIG_ARCH_DOVE is not set -+CONFIG_ARCH_KIRKWOOD=y -+# CONFIG_ARCH_LOKI is not set -+# CONFIG_ARCH_MV78XX0 is not set -+# CONFIG_ARCH_ORION5X is not set -+# CONFIG_ARCH_MMP is not set -+# CONFIG_ARCH_KS8695 is not set -+# CONFIG_ARCH_NS9XXX is not set -+# CONFIG_ARCH_W90X900 is not set -+# CONFIG_ARCH_PNX4008 is not set -+# CONFIG_ARCH_PXA is not set -+# CONFIG_ARCH_MSM is not set -+# CONFIG_ARCH_RPC is not set -+# CONFIG_ARCH_SA1100 is not set -+# CONFIG_ARCH_S3C2410 is not set -+# CONFIG_ARCH_S3C64XX is not set -+# CONFIG_ARCH_S5PC1XX is not set -+# CONFIG_ARCH_SHARK is not set -+# CONFIG_ARCH_LH7A40X is not set -+# CONFIG_ARCH_U300 is not set -+# CONFIG_ARCH_DAVINCI is not set -+# CONFIG_ARCH_OMAP is not set -+# CONFIG_ARCH_BCMRING is not set -+# CONFIG_ARCH_U8500 is not set -+ -+# -+# Marvell Kirkwood Implementations -+# -+CONFIG_MACH_DB88F6281_BP=y -+CONFIG_MACH_RD88F6192_NAS=y -+CONFIG_MACH_RD88F6281=y -+# CONFIG_MACH_MV88F6281GTW_GE is not set -+CONFIG_MACH_SHEEVAPLUG=y -+CONFIG_MACH_GURUPLUG=y -+CONFIG_MACH_TS219=y -+CONFIG_MACH_TS41X=y -+CONFIG_MACH_OPENRD_BASE=y -+# CONFIG_MACH_NETSPACE_V2 is not set -+CONFIG_PLAT_ORION=y -+ -+# -+# Processor Type -+# -+CONFIG_CPU_FEROCEON=y -+# CONFIG_CPU_FEROCEON_OLD_ID is not set -+CONFIG_CPU_32v5=y -+CONFIG_CPU_ABRT_EV5T=y -+CONFIG_CPU_PABRT_LEGACY=y -+CONFIG_CPU_CACHE_VIVT=y -+CONFIG_CPU_COPY_FEROCEON=y -+CONFIG_CPU_TLB_FEROCEON=y -+CONFIG_CPU_CP15=y -+CONFIG_CPU_CP15_MMU=y -+ -+# -+# Processor Features -+# -+CONFIG_ARM_THUMB=y -+# CONFIG_CPU_ICACHE_DISABLE is not set -+# CONFIG_CPU_DCACHE_DISABLE is not set -+CONFIG_OUTER_CACHE=y -+CONFIG_CACHE_FEROCEON_L2=y -+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -+CONFIG_ARM_L1_CACHE_SHIFT=5 -+ -+# -+# Bus support -+# -+CONFIG_PCI=y -+CONFIG_PCI_SYSCALL=y -+# CONFIG_ARCH_SUPPORTS_MSI is not set -+CONFIG_PCI_LEGACY=y -+# CONFIG_PCI_DEBUG is not set -+# CONFIG_PCI_STUB is not set -+# CONFIG_PCI_IOV is not set -+# CONFIG_PCCARD is not set -+ -+# -+# Kernel Features -+# -+CONFIG_TICK_ONESHOT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+CONFIG_VMSPLIT_3G=y -+# CONFIG_VMSPLIT_2G is not set -+# CONFIG_VMSPLIT_1G is not set -+CONFIG_PAGE_OFFSET=0xC0000000 -+# CONFIG_PREEMPT_NONE is not set -+# CONFIG_PREEMPT_VOLUNTARY is not set -+CONFIG_PREEMPT=y -+CONFIG_HZ=100 -+CONFIG_AEABI=y -+# CONFIG_OABI_COMPAT is not set -+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -+# CONFIG_HIGHMEM is not set -+CONFIG_SELECT_MEMORY_MODEL=y -+CONFIG_FLATMEM_MANUAL=y -+# CONFIG_DISCONTIGMEM_MANUAL is not set -+# CONFIG_SPARSEMEM_MANUAL is not set -+CONFIG_FLATMEM=y -+CONFIG_FLAT_NODE_MEM_MAP=y -+CONFIG_PAGEFLAGS_EXTENDED=y -+CONFIG_SPLIT_PTLOCK_CPUS=999999 -+# CONFIG_PHYS_ADDR_T_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=0 -+CONFIG_VIRT_TO_BUS=y -+# CONFIG_KSM is not set -+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -+CONFIG_ALIGNMENT_TRAP=y -+CONFIG_UACCESS_WITH_MEMCPY=y -+ -+# -+# Boot options -+# -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="" -+# CONFIG_XIP_KERNEL is not set -+# CONFIG_KEXEC is not set -+ -+# -+# CPU Power Management -+# -+CONFIG_CPU_IDLE=y -+CONFIG_CPU_IDLE_GOV_LADDER=y -+CONFIG_CPU_IDLE_GOV_MENU=y -+ -+# -+# Floating point emulation -+# -+ -+# -+# At least one emulation must be selected -+# -+# CONFIG_VFP is not set -+ -+# -+# Userspace binary formats -+# -+CONFIG_BINFMT_ELF=y -+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -+CONFIG_HAVE_AOUT=y -+# CONFIG_BINFMT_AOUT is not set -+# CONFIG_BINFMT_MISC is not set -+ -+# -+# Power management options -+# -+CONFIG_PM=y -+# CONFIG_PM_DEBUG is not set -+CONFIG_PM_SLEEP=y -+CONFIG_SUSPEND=y -+CONFIG_SUSPEND_FREEZER=y -+# CONFIG_APM_EMULATION is not set -+# CONFIG_PM_RUNTIME is not set -+CONFIG_ARCH_SUSPEND_POSSIBLE=y -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+CONFIG_PACKET_MMAP=y -+CONFIG_UNIX=y -+CONFIG_XFRM=y -+CONFIG_XFRM_USER=m -+# CONFIG_XFRM_SUB_POLICY is not set -+# CONFIG_XFRM_MIGRATE is not set -+# CONFIG_XFRM_STATISTICS is not set -+CONFIG_XFRM_IPCOMP=m -+CONFIG_NET_KEY=m -+# CONFIG_NET_KEY_MIGRATE is not set -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_ASK_IP_FIB_HASH=y -+# CONFIG_IP_FIB_TRIE is not set -+CONFIG_IP_FIB_HASH=y -+# CONFIG_IP_MULTIPLE_TABLES is not set -+# CONFIG_IP_ROUTE_MULTIPATH is not set -+# CONFIG_IP_ROUTE_VERBOSE is not set -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_BOOTP=y -+# CONFIG_IP_PNP_RARP is not set -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE=m -+# CONFIG_NET_IPGRE_BROADCAST is not set -+# CONFIG_IP_MROUTE is not set -+# CONFIG_ARPD is not set -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_TUNNEL=m -+CONFIG_INET_TUNNEL=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_LRO=y -+CONFIG_INET_DIAG=y -+CONFIG_INET_TCP_DIAG=y -+# CONFIG_TCP_CONG_ADVANCED is not set -+CONFIG_TCP_CONG_CUBIC=y -+CONFIG_DEFAULT_TCP_CONG="cubic" -+# CONFIG_TCP_MD5SIG is not set -+CONFIG_IPV6=m -+# CONFIG_IPV6_PRIVACY is not set -+# CONFIG_IPV6_ROUTER_PREF is not set -+# CONFIG_IPV6_OPTIMISTIC_DAD is not set -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+# CONFIG_IPV6_MIP6 is not set -+CONFIG_INET6_XFRM_TUNNEL=m -+CONFIG_INET6_TUNNEL=m -+CONFIG_INET6_XFRM_MODE_TRANSPORT=m -+CONFIG_INET6_XFRM_MODE_TUNNEL=m -+CONFIG_INET6_XFRM_MODE_BEET=m -+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -+CONFIG_IPV6_SIT=m -+# CONFIG_IPV6_SIT_6RD is not set -+CONFIG_IPV6_NDISC_NODETYPE=y -+# CONFIG_IPV6_TUNNEL is not set -+# CONFIG_IPV6_MULTIPLE_TABLES is not set -+# CONFIG_IPV6_MROUTE is not set -+# CONFIG_NETWORK_SECMARK is not set -+CONFIG_NETFILTER=y -+# CONFIG_NETFILTER_DEBUG is not set -+CONFIG_NETFILTER_ADVANCED=y -+CONFIG_BRIDGE_NETFILTER=y -+ -+# -+# Core Netfilter Configuration -+# -+CONFIG_NETFILTER_NETLINK=m -+# CONFIG_NETFILTER_NETLINK_QUEUE is not set -+CONFIG_NETFILTER_NETLINK_LOG=m -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CT_ACCT=y -+CONFIG_NF_CONNTRACK_MARK=y -+# CONFIG_NF_CONNTRACK_EVENTS is not set -+CONFIG_NF_CT_PROTO_DCCP=m -+CONFIG_NF_CT_PROTO_GRE=m -+CONFIG_NF_CT_PROTO_SCTP=m -+CONFIG_NF_CT_PROTO_UDPLITE=m -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+# CONFIG_NF_CT_NETLINK is not set -+CONFIG_NETFILTER_TPROXY=m -+CONFIG_NETFILTER_XTABLES=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HL=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_RATEEST=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_HL=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y -+CONFIG_NETFILTER_XT_MATCH_SCTP=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+# CONFIG_IP_VS is not set -+ -+# -+# IP: Netfilter Configuration -+# -+CONFIG_NF_DEFRAG_IPV4=m -+CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_NF_CONNTRACK_PROC_COMPAT=y -+# CONFIG_IP_NF_QUEUE is not set -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_ADDRTYPE=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_TARGET_LOG=m -+CONFIG_IP_NF_TARGET_ULOG=m -+CONFIG_NF_NAT=m -+CONFIG_NF_NAT_NEEDED=y -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_NF_NAT_SNMP_BASIC=m -+CONFIG_NF_NAT_PROTO_DCCP=m -+CONFIG_NF_NAT_PROTO_GRE=m -+CONFIG_NF_NAT_PROTO_UDPLITE=m -+CONFIG_NF_NAT_PROTO_SCTP=m -+CONFIG_NF_NAT_FTP=m -+CONFIG_NF_NAT_IRC=m -+CONFIG_NF_NAT_TFTP=m -+CONFIG_NF_NAT_AMANDA=m -+CONFIG_NF_NAT_PPTP=m -+CONFIG_NF_NAT_H323=m -+CONFIG_NF_NAT_SIP=m -+CONFIG_IP_NF_MANGLE=m -+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+ -+# -+# IPv6: Netfilter Configuration -+# -+CONFIG_NF_CONNTRACK_IPV6=m -+# CONFIG_IP6_NF_QUEUE is not set -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_TARGET_LOG=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_ULOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+# CONFIG_IP_DCCP is not set -+# CONFIG_IP_SCTP is not set -+# CONFIG_RDS is not set -+# CONFIG_TIPC is not set -+# CONFIG_ATM is not set -+CONFIG_STP=m -+CONFIG_BRIDGE=m -+CONFIG_NET_DSA=y -+# CONFIG_NET_DSA_TAG_DSA is not set -+CONFIG_NET_DSA_TAG_EDSA=y -+# CONFIG_NET_DSA_TAG_TRAILER is not set -+CONFIG_NET_DSA_MV88E6XXX=y -+# CONFIG_NET_DSA_MV88E6060 is not set -+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -+# CONFIG_NET_DSA_MV88E6131 is not set -+CONFIG_NET_DSA_MV88E6123_61_65=y -+CONFIG_VLAN_8021Q=m -+# CONFIG_VLAN_8021Q_GVRP is not set -+# CONFIG_DECNET is not set -+CONFIG_LLC=m -+# CONFIG_LLC2 is not set -+# CONFIG_IPX is not set -+CONFIG_ATALK=m -+CONFIG_DEV_APPLETALK=m -+# CONFIG_IPDDP is not set -+# CONFIG_X25 is not set -+# CONFIG_LAPB is not set -+# CONFIG_ECONET is not set -+# CONFIG_WAN_ROUTER is not set -+# CONFIG_PHONET is not set -+# CONFIG_IEEE802154 is not set -+CONFIG_NET_SCHED=y -+ -+# -+# Queueing/Scheduling -+# -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+# CONFIG_NET_SCH_INGRESS is not set -+ -+# -+# Classification -+# -+CONFIG_NET_CLS=y -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_ROUTE=y -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_PERF=y -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_STACK=32 -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_CLS_ACT=y -+# CONFIG_NET_ACT_POLICE is not set -+# CONFIG_NET_ACT_GACT is not set -+# CONFIG_NET_ACT_MIRRED is not set -+# CONFIG_NET_ACT_IPT is not set -+# CONFIG_NET_ACT_NAT is not set -+# CONFIG_NET_ACT_PEDIT is not set -+# CONFIG_NET_ACT_SIMP is not set -+# CONFIG_NET_ACT_SKBEDIT is not set -+# CONFIG_NET_CLS_IND is not set -+CONFIG_NET_SCH_FIFO=y -+# CONFIG_DCB is not set -+ -+# -+# Network testing -+# -+CONFIG_NET_PKTGEN=m -+# CONFIG_NET_TCPPROBE is not set -+# CONFIG_HAMRADIO is not set -+# CONFIG_CAN is not set -+# CONFIG_IRDA is not set -+CONFIG_BT=m -+CONFIG_BT_L2CAP=m -+CONFIG_BT_SCO=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+# CONFIG_BT_BNEP_MC_FILTER is not set -+# CONFIG_BT_BNEP_PROTO_FILTER is not set -+CONFIG_BT_HIDP=m -+ -+# -+# Bluetooth device drivers -+# -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIBTSDIO=m -+# CONFIG_BT_HCIUART is not set -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+# CONFIG_BT_ATH3K is not set -+# CONFIG_AF_RXRPC is not set -+CONFIG_WIRELESS=y -+CONFIG_WIRELESS_EXT=y -+CONFIG_WEXT_CORE=y -+CONFIG_WEXT_PROC=y -+CONFIG_WEXT_SPY=y -+CONFIG_CFG80211=y -+# CONFIG_NL80211_TESTMODE is not set -+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -+# CONFIG_CFG80211_REG_DEBUG is not set -+CONFIG_CFG80211_DEFAULT_PS=y -+# CONFIG_CFG80211_DEBUGFS is not set -+CONFIG_WIRELESS_OLD_REGULATORY=y -+CONFIG_CFG80211_WEXT=y -+CONFIG_WIRELESS_EXT_SYSFS=y -+CONFIG_LIB80211=y -+# CONFIG_LIB80211_DEBUG is not set -+CONFIG_MAC80211=y -+CONFIG_MAC80211_RC_MINSTREL=y -+# CONFIG_MAC80211_RC_DEFAULT_PID is not set -+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -+CONFIG_MAC80211_RC_DEFAULT="minstrel" -+# CONFIG_MAC80211_MESH is not set -+# CONFIG_MAC80211_LEDS is not set -+# CONFIG_MAC80211_DEBUGFS is not set -+# CONFIG_MAC80211_DEBUG_MENU is not set -+# CONFIG_WIMAX is not set -+# CONFIG_RFKILL is not set -+# CONFIG_NET_9P is not set -+ -+# -+# Device Drivers -+# -+ -+# -+# Generic Driver Options -+# -+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -+# CONFIG_DEVTMPFS is not set -+CONFIG_STANDALONE=y -+CONFIG_PREVENT_FIRMWARE_BUILD=y -+CONFIG_FW_LOADER=y -+CONFIG_FIRMWARE_IN_KERNEL=y -+CONFIG_EXTRA_FIRMWARE="" -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_CONNECTOR is not set -+CONFIG_MTD=y -+# CONFIG_MTD_DEBUG is not set -+# CONFIG_MTD_TESTS is not set -+# CONFIG_MTD_CONCAT is not set -+CONFIG_MTD_PARTITIONS=y -+# CONFIG_MTD_REDBOOT_PARTS is not set -+CONFIG_MTD_CMDLINE_PARTS=y -+# CONFIG_MTD_AFS_PARTS is not set -+# CONFIG_MTD_AR7_PARTS is not set -+ -+# -+# User Modules And Translation Layers -+# -+CONFIG_MTD_CHAR=y -+CONFIG_MTD_BLKDEVS=y -+CONFIG_MTD_BLOCK=y -+# CONFIG_FTL is not set -+# CONFIG_NFTL is not set -+# CONFIG_INFTL is not set -+# CONFIG_RFD_FTL is not set -+# CONFIG_SSFDC is not set -+# CONFIG_MTD_OOPS is not set -+ -+# -+# RAM/ROM/Flash chip drivers -+# -+CONFIG_MTD_CFI=y -+CONFIG_MTD_JEDECPROBE=y -+CONFIG_MTD_GEN_PROBE=y -+CONFIG_MTD_CFI_ADV_OPTIONS=y -+CONFIG_MTD_CFI_NOSWAP=y -+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -+CONFIG_MTD_CFI_GEOMETRY=y -+CONFIG_MTD_MAP_BANK_WIDTH_1=y -+CONFIG_MTD_MAP_BANK_WIDTH_2=y -+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -+CONFIG_MTD_CFI_I1=y -+CONFIG_MTD_CFI_I2=y -+# CONFIG_MTD_CFI_I4 is not set -+# CONFIG_MTD_CFI_I8 is not set -+# CONFIG_MTD_OTP is not set -+CONFIG_MTD_CFI_INTELEXT=y -+# CONFIG_MTD_CFI_AMDSTD is not set -+CONFIG_MTD_CFI_STAA=y -+CONFIG_MTD_CFI_UTIL=y -+# CONFIG_MTD_RAM is not set -+# CONFIG_MTD_ROM is not set -+# CONFIG_MTD_ABSENT is not set -+ -+# -+# Mapping drivers for chip access -+# -+# CONFIG_MTD_COMPLEX_MAPPINGS is not set -+CONFIG_MTD_PHYSMAP=y -+# CONFIG_MTD_PHYSMAP_COMPAT is not set -+# CONFIG_MTD_ARM_INTEGRATOR is not set -+# CONFIG_MTD_IMPA7 is not set -+# CONFIG_MTD_INTEL_VR_NOR is not set -+# CONFIG_MTD_PLATRAM is not set -+ -+# -+# Self-contained MTD device drivers -+# -+# CONFIG_MTD_PMC551 is not set -+# CONFIG_MTD_DATAFLASH is not set -+CONFIG_MTD_M25P80=y -+CONFIG_M25PXX_USE_FAST_READ=y -+# CONFIG_MTD_SST25L is not set -+# CONFIG_MTD_SLRAM is not set -+# CONFIG_MTD_PHRAM is not set -+# CONFIG_MTD_MTDRAM is not set -+# CONFIG_MTD_BLOCK2MTD is not set -+ -+# -+# Disk-On-Chip Device Drivers -+# -+# CONFIG_MTD_DOC2000 is not set -+# CONFIG_MTD_DOC2001 is not set -+# CONFIG_MTD_DOC2001PLUS is not set -+CONFIG_MTD_NAND=y -+# CONFIG_MTD_NAND_VERIFY_WRITE is not set -+# CONFIG_MTD_NAND_ECC_SMC is not set -+# CONFIG_MTD_NAND_MUSEUM_IDS is not set -+# CONFIG_MTD_NAND_GPIO is not set -+CONFIG_MTD_NAND_IDS=y -+# CONFIG_MTD_NAND_DISKONCHIP is not set -+# CONFIG_MTD_NAND_CAFE is not set -+# CONFIG_MTD_NAND_NANDSIM is not set -+# CONFIG_MTD_NAND_PLATFORM is not set -+# CONFIG_MTD_ALAUDA is not set -+CONFIG_MTD_NAND_ORION=y -+# CONFIG_MTD_ONENAND is not set -+ -+# -+# LPDDR flash memory drivers -+# -+# CONFIG_MTD_LPDDR is not set -+ -+# -+# UBI - Unsorted block images -+# -+CONFIG_MTD_UBI=y -+CONFIG_MTD_UBI_WL_THRESHOLD=4096 -+CONFIG_MTD_UBI_BEB_RESERVE=1 -+# CONFIG_MTD_UBI_GLUEBI is not set -+ -+# -+# UBI debugging options -+# -+# CONFIG_MTD_UBI_DEBUG is not set -+# CONFIG_PARPORT is not set -+CONFIG_BLK_DEV=y -+# CONFIG_BLK_CPQ_DA is not set -+# CONFIG_BLK_CPQ_CISS_DA is not set -+# CONFIG_BLK_DEV_DAC960 is not set -+# CONFIG_BLK_DEV_UMEM is not set -+# CONFIG_BLK_DEV_COW_COMMON is not set -+CONFIG_BLK_DEV_LOOP=y -+# CONFIG_BLK_DEV_CRYPTOLOOP is not set -+ -+# -+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -+# -+# CONFIG_BLK_DEV_NBD is not set -+# CONFIG_BLK_DEV_SX8 is not set -+# CONFIG_BLK_DEV_UB is not set -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=8192 -+# CONFIG_BLK_DEV_XIP is not set -+# CONFIG_CDROM_PKTCDVD is not set -+CONFIG_ATA_OVER_ETH=m -+# CONFIG_MG_DISK is not set -+# CONFIG_MISC_DEVICES is not set -+CONFIG_EEPROM_93CX6=m -+CONFIG_HAVE_IDE=y -+# CONFIG_IDE is not set -+ -+# -+# SCSI device support -+# -+# CONFIG_RAID_ATTRS is not set -+CONFIG_SCSI=y -+CONFIG_SCSI_DMA=y -+# CONFIG_SCSI_TGT is not set -+# CONFIG_SCSI_NETLINK is not set -+# CONFIG_SCSI_PROC_FS is not set -+ -+# -+# SCSI support type (disk, tape, CD-ROM) -+# -+CONFIG_BLK_DEV_SD=y -+# CONFIG_CHR_DEV_ST is not set -+# CONFIG_CHR_DEV_OSST is not set -+CONFIG_BLK_DEV_SR=m -+# CONFIG_BLK_DEV_SR_VENDOR is not set -+CONFIG_CHR_DEV_SG=y -+# CONFIG_CHR_DEV_SCH is not set -+CONFIG_SCSI_MULTI_LUN=y -+# CONFIG_SCSI_CONSTANTS is not set -+# CONFIG_SCSI_LOGGING is not set -+# CONFIG_SCSI_SCAN_ASYNC is not set -+CONFIG_SCSI_WAIT_SCAN=m -+ -+# -+# SCSI Transports -+# -+# CONFIG_SCSI_SPI_ATTRS is not set -+# CONFIG_SCSI_FC_ATTRS is not set -+# CONFIG_SCSI_ISCSI_ATTRS is not set -+# CONFIG_SCSI_SAS_LIBSAS is not set -+# CONFIG_SCSI_SRP_ATTRS is not set -+CONFIG_SCSI_LOWLEVEL=y -+# CONFIG_ISCSI_TCP is not set -+# CONFIG_SCSI_BNX2_ISCSI is not set -+# CONFIG_BE2ISCSI is not set -+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -+# CONFIG_SCSI_HPSA is not set -+# CONFIG_SCSI_3W_9XXX is not set -+# CONFIG_SCSI_3W_SAS is not set -+# CONFIG_SCSI_ACARD is not set -+# CONFIG_SCSI_AACRAID is not set -+# CONFIG_SCSI_AIC7XXX is not set -+# CONFIG_SCSI_AIC7XXX_OLD is not set -+# CONFIG_SCSI_AIC79XX is not set -+# CONFIG_SCSI_AIC94XX is not set -+# CONFIG_SCSI_MVSAS is not set -+# CONFIG_SCSI_DPT_I2O is not set -+# CONFIG_SCSI_ADVANSYS is not set -+# CONFIG_SCSI_ARCMSR is not set -+# CONFIG_MEGARAID_NEWGEN is not set -+# CONFIG_MEGARAID_LEGACY is not set -+# CONFIG_MEGARAID_SAS is not set -+# CONFIG_SCSI_MPT2SAS is not set -+# CONFIG_SCSI_HPTIOP is not set -+# CONFIG_LIBFC is not set -+# CONFIG_LIBFCOE is not set -+# CONFIG_FCOE is not set -+# CONFIG_SCSI_DMX3191D is not set -+# CONFIG_SCSI_FUTURE_DOMAIN is not set -+# CONFIG_SCSI_IPS is not set -+# CONFIG_SCSI_INITIO is not set -+# CONFIG_SCSI_INIA100 is not set -+# CONFIG_SCSI_STEX is not set -+# CONFIG_SCSI_SYM53C8XX_2 is not set -+# CONFIG_SCSI_IPR is not set -+# CONFIG_SCSI_QLOGIC_1280 is not set -+# CONFIG_SCSI_QLA_FC is not set -+# CONFIG_SCSI_QLA_ISCSI is not set -+# CONFIG_SCSI_LPFC is not set -+# CONFIG_SCSI_DC395x is not set -+# CONFIG_SCSI_DC390T is not set -+# CONFIG_SCSI_NSP32 is not set -+# CONFIG_SCSI_DEBUG is not set -+# CONFIG_SCSI_PMCRAID is not set -+# CONFIG_SCSI_PM8001 is not set -+# CONFIG_SCSI_SRP is not set -+# CONFIG_SCSI_BFA_FC is not set -+# CONFIG_SCSI_DH is not set -+# CONFIG_SCSI_OSD_INITIATOR is not set -+CONFIG_ATA=y -+# CONFIG_ATA_NONSTANDARD is not set -+CONFIG_ATA_VERBOSE_ERROR=y -+CONFIG_SATA_PMP=y -+# CONFIG_SATA_AHCI is not set -+# CONFIG_SATA_SIL24 is not set -+CONFIG_ATA_SFF=y -+# CONFIG_SATA_SVW is not set -+# CONFIG_ATA_PIIX is not set -+CONFIG_SATA_MV=m -+# CONFIG_SATA_NV is not set -+# CONFIG_PDC_ADMA is not set -+# CONFIG_SATA_QSTOR is not set -+# CONFIG_SATA_PROMISE is not set -+# CONFIG_SATA_SX4 is not set -+# CONFIG_SATA_SIL is not set -+# CONFIG_SATA_SIS is not set -+# CONFIG_SATA_ULI is not set -+# CONFIG_SATA_VIA is not set -+# CONFIG_SATA_VITESSE is not set -+# CONFIG_SATA_INIC162X is not set -+# CONFIG_PATA_ALI is not set -+# CONFIG_PATA_AMD is not set -+# CONFIG_PATA_ARTOP is not set -+# CONFIG_PATA_ATP867X is not set -+# CONFIG_PATA_ATIIXP is not set -+# CONFIG_PATA_CMD640_PCI is not set -+# CONFIG_PATA_CMD64X is not set -+# CONFIG_PATA_CS5520 is not set -+# CONFIG_PATA_CS5530 is not set -+# CONFIG_PATA_CYPRESS is not set -+# CONFIG_PATA_EFAR is not set -+# CONFIG_ATA_GENERIC is not set -+# CONFIG_PATA_HPT366 is not set -+# CONFIG_PATA_HPT37X is not set -+# CONFIG_PATA_HPT3X2N is not set -+# CONFIG_PATA_HPT3X3 is not set -+# CONFIG_PATA_IT821X is not set -+# CONFIG_PATA_IT8213 is not set -+# CONFIG_PATA_JMICRON is not set -+# CONFIG_PATA_TRIFLEX is not set -+# CONFIG_PATA_MARVELL is not set -+# CONFIG_PATA_MPIIX is not set -+# CONFIG_PATA_OLDPIIX is not set -+# CONFIG_PATA_NETCELL is not set -+# CONFIG_PATA_NINJA32 is not set -+# CONFIG_PATA_NS87410 is not set -+# CONFIG_PATA_NS87415 is not set -+# CONFIG_PATA_OPTI is not set -+# CONFIG_PATA_OPTIDMA is not set -+# CONFIG_PATA_PDC2027X is not set -+# CONFIG_PATA_PDC_OLD is not set -+# CONFIG_PATA_RADISYS is not set -+# CONFIG_PATA_RDC is not set -+# CONFIG_PATA_RZ1000 is not set -+# CONFIG_PATA_SC1200 is not set -+# CONFIG_PATA_SERVERWORKS is not set -+# CONFIG_PATA_SIL680 is not set -+# CONFIG_PATA_SIS is not set -+# CONFIG_PATA_TOSHIBA is not set -+# CONFIG_PATA_VIA is not set -+# CONFIG_PATA_WINBOND is not set -+# CONFIG_PATA_SCH is not set -+CONFIG_MD=y -+CONFIG_BLK_DEV_MD=m -+CONFIG_MD_LINEAR=m -+CONFIG_MD_RAID0=m -+CONFIG_MD_RAID1=m -+CONFIG_MD_RAID10=m -+CONFIG_MD_RAID456=m -+CONFIG_MD_RAID6_PQ=m -+# CONFIG_ASYNC_RAID6_TEST is not set -+# CONFIG_MD_MULTIPATH is not set -+# CONFIG_MD_FAULTY is not set -+CONFIG_BLK_DEV_DM=m -+# CONFIG_DM_DEBUG is not set -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_MIRROR=m -+# CONFIG_DM_LOG_USERSPACE is not set -+CONFIG_DM_ZERO=m -+CONFIG_DM_MULTIPATH=m -+# CONFIG_DM_MULTIPATH_QL is not set -+# CONFIG_DM_MULTIPATH_ST is not set -+# CONFIG_DM_DELAY is not set -+# CONFIG_DM_UEVENT is not set -+# CONFIG_FUSION is not set -+ -+# -+# IEEE 1394 (FireWire) support -+# -+ -+# -+# You can enable one or both FireWire driver stacks. -+# -+ -+# -+# The newer stack is recommended. -+# -+# CONFIG_FIREWIRE is not set -+# CONFIG_IEEE1394 is not set -+# CONFIG_I2O is not set -+CONFIG_NETDEVICES=y -+# CONFIG_IFB is not set -+# CONFIG_DUMMY is not set -+# CONFIG_BONDING is not set -+# CONFIG_MACVLAN is not set -+# CONFIG_EQUALIZER is not set -+CONFIG_TUN=m -+# CONFIG_VETH is not set -+# CONFIG_ARCNET is not set -+CONFIG_PHYLIB=y -+ -+# -+# MII PHY device drivers -+# -+CONFIG_MARVELL_PHY=y -+# CONFIG_DAVICOM_PHY is not set -+# CONFIG_QSEMI_PHY is not set -+# CONFIG_LXT_PHY is not set -+# CONFIG_CICADA_PHY is not set -+# CONFIG_VITESSE_PHY is not set -+# CONFIG_SMSC_PHY is not set -+# CONFIG_BROADCOM_PHY is not set -+# CONFIG_ICPLUS_PHY is not set -+# CONFIG_REALTEK_PHY is not set -+# CONFIG_NATIONAL_PHY is not set -+# CONFIG_STE10XP is not set -+# CONFIG_LSI_ET1011C_PHY is not set -+# CONFIG_FIXED_PHY is not set -+# CONFIG_MDIO_BITBANG is not set -+CONFIG_NET_ETHERNET=y -+CONFIG_MII=y -+# CONFIG_AX88796 is not set -+# CONFIG_HAPPYMEAL is not set -+# CONFIG_SUNGEM is not set -+# CONFIG_CASSINI is not set -+# CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_SMC91X is not set -+# CONFIG_DM9000 is not set -+# CONFIG_ENC28J60 is not set -+# CONFIG_ETHOC is not set -+# CONFIG_SMC911X is not set -+# CONFIG_SMSC911X is not set -+# CONFIG_DNET is not set -+# CONFIG_NET_TULIP is not set -+# CONFIG_HP100 is not set -+# CONFIG_IBM_NEW_EMAC_ZMII is not set -+# CONFIG_IBM_NEW_EMAC_RGMII is not set -+# CONFIG_IBM_NEW_EMAC_TAH is not set -+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -+CONFIG_NET_PCI=y -+# CONFIG_PCNET32 is not set -+# CONFIG_AMD8111_ETH is not set -+# CONFIG_ADAPTEC_STARFIRE is not set -+# CONFIG_B44 is not set -+# CONFIG_FORCEDETH is not set -+# CONFIG_E100 is not set -+# CONFIG_FEALNX is not set -+# CONFIG_NATSEMI is not set -+# CONFIG_NE2K_PCI is not set -+# CONFIG_8139CP is not set -+# CONFIG_8139TOO is not set -+# CONFIG_R6040 is not set -+# CONFIG_SIS900 is not set -+# CONFIG_EPIC100 is not set -+# CONFIG_SMSC9420 is not set -+# CONFIG_SUNDANCE is not set -+# CONFIG_TLAN is not set -+# CONFIG_KS8842 is not set -+# CONFIG_KS8851 is not set -+# CONFIG_KS8851_MLL is not set -+# CONFIG_VIA_RHINE is not set -+# CONFIG_SC92031 is not set -+# CONFIG_ATL2 is not set -+CONFIG_NETDEV_1000=y -+# CONFIG_ACENIC is not set -+# CONFIG_DL2K is not set -+# CONFIG_E1000 is not set -+# CONFIG_E1000E is not set -+# CONFIG_IP1000 is not set -+# CONFIG_IGB is not set -+# CONFIG_IGBVF is not set -+# CONFIG_NS83820 is not set -+# CONFIG_HAMACHI is not set -+# CONFIG_YELLOWFIN is not set -+# CONFIG_R8169 is not set -+# CONFIG_SIS190 is not set -+# CONFIG_SKGE is not set -+# CONFIG_SKY2 is not set -+# CONFIG_VIA_VELOCITY is not set -+# CONFIG_TIGON3 is not set -+# CONFIG_BNX2 is not set -+# CONFIG_CNIC is not set -+CONFIG_MV643XX_ETH=y -+# CONFIG_QLA3XXX is not set -+# CONFIG_ATL1 is not set -+# CONFIG_ATL1E is not set -+# CONFIG_ATL1C is not set -+# CONFIG_JME is not set -+# CONFIG_NETDEV_10000 is not set -+# CONFIG_TR is not set -+CONFIG_WLAN=y -+# CONFIG_LIBERTAS_THINFIRM is not set -+CONFIG_LIBERTAS_UAP=m -+# CONFIG_ATMEL is not set -+# CONFIG_AT76C50X_USB is not set -+# CONFIG_PRISM54 is not set -+# CONFIG_USB_ZD1201 is not set -+CONFIG_USB_NET_RNDIS_WLAN=m -+# CONFIG_RTL8180 is not set -+CONFIG_RTL8187=m -+# CONFIG_ADM8211 is not set -+# CONFIG_MAC80211_HWSIM is not set -+# CONFIG_MWL8K is not set -+# CONFIG_ATH_COMMON is not set -+# CONFIG_B43 is not set -+# CONFIG_B43LEGACY is not set -+# CONFIG_HOSTAP is not set -+# CONFIG_IPW2100 is not set -+# CONFIG_IPW2200 is not set -+# CONFIG_IWLWIFI is not set -+# CONFIG_IWM is not set -+CONFIG_LIBERTAS=m -+# CONFIG_LIBERTAS_USB is not set -+CONFIG_LIBERTAS_SDIO=m -+# CONFIG_LIBERTAS_SPI is not set -+# CONFIG_LIBERTAS_DEBUG is not set -+# CONFIG_HERMES is not set -+# CONFIG_P54_COMMON is not set -+# CONFIG_RT2X00 is not set -+# CONFIG_WL12XX is not set -+# CONFIG_ZD1211RW is not set -+ -+# -+# Enable WiMAX (Networking options) to see the WiMAX drivers -+# -+ -+# -+# USB Network Adapters -+# -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_USBNET=m -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_CDCETHER=m -+# CONFIG_USB_NET_CDC_EEM is not set -+CONFIG_USB_NET_DM9601=m -+# CONFIG_USB_NET_SMSC95XX is not set -+# CONFIG_USB_NET_GL620A is not set -+CONFIG_USB_NET_NET1080=m -+# CONFIG_USB_NET_PLUSB is not set -+# CONFIG_USB_NET_MCS7830 is not set -+CONFIG_USB_NET_RNDIS_HOST=m -+CONFIG_USB_NET_CDC_SUBSET=m -+# CONFIG_USB_ALI_M5632 is not set -+# CONFIG_USB_AN2720 is not set -+CONFIG_USB_BELKIN=y -+CONFIG_USB_ARMLINUX=y -+# CONFIG_USB_EPSON2888 is not set -+# CONFIG_USB_KC2190 is not set -+CONFIG_USB_NET_ZAURUS=m -+# CONFIG_USB_NET_INT51X1 is not set -+# CONFIG_WAN is not set -+# CONFIG_FDDI is not set -+# CONFIG_HIPPI is not set -+CONFIG_PPP=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_MPPE=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+# CONFIG_SLIP is not set -+CONFIG_SLHC=m -+# CONFIG_NET_FC is not set -+# CONFIG_NETCONSOLE is not set -+# CONFIG_NETPOLL is not set -+# CONFIG_NET_POLL_CONTROLLER is not set -+# CONFIG_VMXNET3 is not set -+# CONFIG_ISDN is not set -+# CONFIG_PHONE is not set -+ -+# -+# Input device support -+# -+CONFIG_INPUT=y -+# CONFIG_INPUT_FF_MEMLESS is not set -+# CONFIG_INPUT_POLLDEV is not set -+# CONFIG_INPUT_SPARSEKMAP is not set -+ -+# -+# Userland interfaces -+# -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_MOUSEDEV_PSAUX=y -+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -+# CONFIG_INPUT_JOYDEV is not set -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_EVBUG is not set -+ -+# -+# Input Device Drivers -+# -+CONFIG_INPUT_KEYBOARD=y -+# CONFIG_KEYBOARD_ADP5588 is not set -+CONFIG_KEYBOARD_ATKBD=y -+# CONFIG_QT2160 is not set -+# CONFIG_KEYBOARD_LKKBD is not set -+CONFIG_KEYBOARD_GPIO=y -+# CONFIG_KEYBOARD_MATRIX is not set -+# CONFIG_KEYBOARD_LM8323 is not set -+# CONFIG_KEYBOARD_MAX7359 is not set -+# CONFIG_KEYBOARD_NEWTON is not set -+# CONFIG_KEYBOARD_OPENCORES is not set -+# CONFIG_KEYBOARD_STOWAWAY is not set -+# CONFIG_KEYBOARD_SUNKBD is not set -+# CONFIG_KEYBOARD_XTKBD is not set -+# CONFIG_INPUT_MOUSE is not set -+# CONFIG_INPUT_JOYSTICK is not set -+# CONFIG_INPUT_TABLET is not set -+# CONFIG_INPUT_TOUCHSCREEN is not set -+# CONFIG_INPUT_MISC is not set -+ -+# -+# Hardware I/O ports -+# -+CONFIG_SERIO=y -+CONFIG_SERIO_SERPORT=y -+# CONFIG_SERIO_PCIPS2 is not set -+CONFIG_SERIO_LIBPS2=y -+# CONFIG_SERIO_RAW is not set -+# CONFIG_SERIO_ALTERA_PS2 is not set -+# CONFIG_GAMEPORT is not set -+ -+# -+# Character devices -+# -+CONFIG_VT=y -+CONFIG_CONSOLE_TRANSLATIONS=y -+CONFIG_VT_CONSOLE=y -+CONFIG_HW_CONSOLE=y -+# CONFIG_VT_HW_CONSOLE_BINDING is not set -+# CONFIG_DEVKMEM is not set -+# CONFIG_SERIAL_NONSTANDARD is not set -+# CONFIG_NOZOMI is not set -+ -+# -+# Serial drivers -+# -+CONFIG_SERIAL_8250=y -+CONFIG_SERIAL_8250_CONSOLE=y -+CONFIG_SERIAL_8250_PCI=y -+CONFIG_SERIAL_8250_NR_UARTS=4 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -+# CONFIG_SERIAL_8250_EXTENDED is not set -+ -+# -+# Non-8250 serial port support -+# -+# CONFIG_SERIAL_MAX3100 is not set -+CONFIG_SERIAL_CORE=y -+CONFIG_SERIAL_CORE_CONSOLE=y -+# CONFIG_SERIAL_JSM is not set -+CONFIG_UNIX98_PTYS=y -+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -+CONFIG_LEGACY_PTYS=y -+CONFIG_LEGACY_PTY_COUNT=16 -+# CONFIG_IPMI_HANDLER is not set -+# CONFIG_HW_RANDOM is not set -+# CONFIG_R3964 is not set -+# CONFIG_APPLICOM is not set -+# CONFIG_RAW_DRIVER is not set -+# CONFIG_TCG_TPM is not set -+CONFIG_DEVPORT=y -+CONFIG_I2C=y -+CONFIG_I2C_BOARDINFO=y -+CONFIG_I2C_COMPAT=y -+CONFIG_I2C_CHARDEV=y -+CONFIG_I2C_HELPER_AUTO=y -+CONFIG_I2C_ALGOBIT=m -+ -+# -+# I2C Hardware Bus support -+# -+ -+# -+# PC SMBus host controller drivers -+# -+# CONFIG_I2C_ALI1535 is not set -+# CONFIG_I2C_ALI1563 is not set -+# CONFIG_I2C_ALI15X3 is not set -+# CONFIG_I2C_AMD756 is not set -+# CONFIG_I2C_AMD8111 is not set -+# CONFIG_I2C_I801 is not set -+# CONFIG_I2C_ISCH is not set -+# CONFIG_I2C_PIIX4 is not set -+# CONFIG_I2C_NFORCE2 is not set -+# CONFIG_I2C_SIS5595 is not set -+# CONFIG_I2C_SIS630 is not set -+# CONFIG_I2C_SIS96X is not set -+# CONFIG_I2C_VIA is not set -+# CONFIG_I2C_VIAPRO is not set -+ -+# -+# I2C system bus drivers (mostly embedded / system-on-chip) -+# -+# CONFIG_I2C_GPIO is not set -+CONFIG_I2C_MV64XXX=y -+# CONFIG_I2C_OCORES is not set -+# CONFIG_I2C_SIMTEC is not set -+ -+# -+# External I2C/SMBus adapter drivers -+# -+# CONFIG_I2C_PARPORT_LIGHT is not set -+# CONFIG_I2C_TAOS_EVM is not set -+# CONFIG_I2C_TINY_USB is not set -+ -+# -+# Other I2C/SMBus bus drivers -+# -+# CONFIG_I2C_PCA_PLATFORM is not set -+# CONFIG_I2C_STUB is not set -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_SENSORS_TSL2550 is not set -+# CONFIG_I2C_DEBUG_CORE is not set -+# CONFIG_I2C_DEBUG_ALGO is not set -+# CONFIG_I2C_DEBUG_BUS is not set -+# CONFIG_I2C_DEBUG_CHIP is not set -+CONFIG_SPI=y -+# CONFIG_SPI_DEBUG is not set -+CONFIG_SPI_MASTER=y -+ -+# -+# SPI Master Controller Drivers -+# -+# CONFIG_SPI_BITBANG is not set -+# CONFIG_SPI_GPIO is not set -+CONFIG_SPI_ORION=y -+# CONFIG_SPI_XILINX is not set -+# CONFIG_SPI_DESIGNWARE is not set -+ -+# -+# SPI Protocol Masters -+# -+# CONFIG_SPI_SPIDEV is not set -+# CONFIG_SPI_TLE62X0 is not set -+ -+# -+# PPS support -+# -+# CONFIG_PPS is not set -+CONFIG_ARCH_REQUIRE_GPIOLIB=y -+CONFIG_GPIOLIB=y -+# CONFIG_DEBUG_GPIO is not set -+# CONFIG_GPIO_SYSFS is not set -+ -+# -+# Memory mapped GPIO expanders: -+# -+ -+# -+# I2C GPIO expanders: -+# -+# CONFIG_GPIO_MAX732X is not set -+# CONFIG_GPIO_PCA953X is not set -+# CONFIG_GPIO_PCF857X is not set -+# CONFIG_GPIO_ADP5588 is not set -+ -+# -+# PCI GPIO expanders: -+# -+# CONFIG_GPIO_CS5535 is not set -+# CONFIG_GPIO_BT8XX is not set -+# CONFIG_GPIO_LANGWELL is not set -+ -+# -+# SPI GPIO expanders: -+# -+# CONFIG_GPIO_MAX7301 is not set -+# CONFIG_GPIO_MCP23S08 is not set -+# CONFIG_GPIO_MC33880 is not set -+ -+# -+# AC97 GPIO expanders: -+# -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+# CONFIG_THERMAL is not set -+CONFIG_WATCHDOG=y -+# CONFIG_WATCHDOG_NOWAYOUT is not set -+ -+# -+# Watchdog Device Drivers -+# -+CONFIG_SOFT_WATCHDOG=m -+CONFIG_ORION_WATCHDOG=m -+# CONFIG_ALIM7101_WDT is not set -+ -+# -+# PCI-based Watchdog Cards -+# -+# CONFIG_PCIPCWATCHDOG is not set -+# CONFIG_WDTPCI is not set -+ -+# -+# USB-based Watchdog Cards -+# -+# CONFIG_USBPCWATCHDOG is not set -+CONFIG_SSB_POSSIBLE=y -+ -+# -+# Sonics Silicon Backplane -+# -+# CONFIG_SSB is not set -+ -+# -+# Multifunction device drivers -+# -+# CONFIG_MFD_CORE is not set -+# CONFIG_MFD_SM501 is not set -+# CONFIG_MFD_ASIC3 is not set -+# CONFIG_HTC_EGPIO is not set -+# CONFIG_HTC_PASIC3 is not set -+# CONFIG_TPS65010 is not set -+# CONFIG_TWL4030_CORE is not set -+# CONFIG_MFD_TMIO is not set -+# CONFIG_MFD_TC6393XB is not set -+# CONFIG_PMIC_DA903X is not set -+# CONFIG_PMIC_ADP5520 is not set -+# CONFIG_MFD_WM8400 is not set -+# CONFIG_MFD_WM831X is not set -+# CONFIG_MFD_WM8350_I2C is not set -+# CONFIG_MFD_PCF50633 is not set -+# CONFIG_MFD_MC13783 is not set -+# CONFIG_AB3100_CORE is not set -+# CONFIG_EZX_PCAP is not set -+# CONFIG_MFD_88PM8607 is not set -+# CONFIG_AB4500_CORE is not set -+# CONFIG_REGULATOR is not set -+CONFIG_MEDIA_SUPPORT=m -+ -+# -+# Multimedia core support -+# -+CONFIG_VIDEO_DEV=m -+CONFIG_VIDEO_V4L2_COMMON=m -+CONFIG_VIDEO_ALLOW_V4L1=y -+CONFIG_VIDEO_V4L1_COMPAT=y -+CONFIG_DVB_CORE=m -+CONFIG_VIDEO_MEDIA=m -+ -+# -+# Multimedia drivers -+# -+CONFIG_IR_CORE=m -+CONFIG_VIDEO_IR=m -+CONFIG_MEDIA_ATTACH=y -+CONFIG_MEDIA_TUNER=m -+CONFIG_MEDIA_TUNER_CUSTOMISE=y -+CONFIG_MEDIA_TUNER_SIMPLE=m -+CONFIG_MEDIA_TUNER_TDA8290=m -+CONFIG_MEDIA_TUNER_TDA827X=m -+CONFIG_MEDIA_TUNER_TDA18271=m -+CONFIG_MEDIA_TUNER_TDA9887=m -+CONFIG_MEDIA_TUNER_TEA5761=m -+CONFIG_MEDIA_TUNER_TEA5767=m -+CONFIG_MEDIA_TUNER_MT20XX=m -+CONFIG_MEDIA_TUNER_MT2060=m -+CONFIG_MEDIA_TUNER_MT2266=m -+CONFIG_MEDIA_TUNER_MT2131=m -+CONFIG_MEDIA_TUNER_QT1010=m -+CONFIG_MEDIA_TUNER_XC2028=m -+CONFIG_MEDIA_TUNER_XC5000=m -+CONFIG_MEDIA_TUNER_MXL5005S=m -+CONFIG_MEDIA_TUNER_MXL5007T=m -+CONFIG_MEDIA_TUNER_MC44S803=m -+CONFIG_MEDIA_TUNER_MAX2165=m -+CONFIG_VIDEO_V4L2=m -+CONFIG_VIDEO_V4L1=m -+CONFIG_VIDEOBUF_GEN=m -+CONFIG_VIDEOBUF_VMALLOC=m -+CONFIG_VIDEOBUF_DVB=m -+CONFIG_VIDEO_TVEEPROM=m -+CONFIG_VIDEO_TUNER=m -+CONFIG_VIDEO_CAPTURE_DRIVERS=y -+# CONFIG_VIDEO_ADV_DEBUG is not set -+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -+CONFIG_VIDEO_IR_I2C=m -+CONFIG_VIDEO_MSP3400=m -+CONFIG_VIDEO_CS53L32A=m -+CONFIG_VIDEO_M52790=m -+CONFIG_VIDEO_WM8775=m -+CONFIG_VIDEO_WM8739=m -+CONFIG_VIDEO_VP27SMPX=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_VIDEO_SAA711X=m -+CONFIG_VIDEO_SAA717X=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_CX25840=m -+CONFIG_VIDEO_CX2341X=m -+CONFIG_VIDEO_SAA7127=m -+CONFIG_VIDEO_UPD64031A=m -+CONFIG_VIDEO_UPD64083=m -+# CONFIG_VIDEO_VIVI is not set -+# CONFIG_VIDEO_BT848 is not set -+# CONFIG_VIDEO_CPIA is not set -+# CONFIG_VIDEO_CPIA2 is not set -+# CONFIG_VIDEO_SAA5246A is not set -+# CONFIG_VIDEO_SAA5249 is not set -+# CONFIG_VIDEO_STRADIS is not set -+# CONFIG_VIDEO_ZORAN is not set -+# CONFIG_VIDEO_SAA7134 is not set -+# CONFIG_VIDEO_MXB is not set -+# CONFIG_VIDEO_HEXIUM_ORION is not set -+# CONFIG_VIDEO_HEXIUM_GEMINI is not set -+# CONFIG_VIDEO_CX88 is not set -+# CONFIG_VIDEO_CX23885 is not set -+# CONFIG_VIDEO_AU0828 is not set -+CONFIG_VIDEO_IVTV=m -+# CONFIG_VIDEO_FB_IVTV is not set -+# CONFIG_VIDEO_CX18 is not set -+# CONFIG_VIDEO_SAA7164 is not set -+# CONFIG_VIDEO_CAFE_CCIC is not set -+# CONFIG_SOC_CAMERA is not set -+CONFIG_V4L_USB_DRIVERS=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -+CONFIG_USB_GSPCA=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SN9C20X=m -+# CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_PVRUSB2_SYSFS=y -+CONFIG_VIDEO_PVRUSB2_DVB=y -+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -+# CONFIG_VIDEO_HDPVR is not set -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+# CONFIG_VIDEO_CX231XX is not set -+# CONFIG_VIDEO_USBVISION is not set -+CONFIG_VIDEO_USBVIDEO=m -+# CONFIG_USB_VICAM is not set -+CONFIG_USB_IBMCAM=m -+# CONFIG_USB_KONICAWC is not set -+# CONFIG_USB_QUICKCAM_MESSENGER is not set -+# CONFIG_USB_ET61X251 is not set -+# CONFIG_VIDEO_OVCAMCHIP is not set -+# CONFIG_USB_OV511 is not set -+# CONFIG_USB_SE401 is not set -+# CONFIG_USB_SN9C102 is not set -+# CONFIG_USB_STV680 is not set -+# CONFIG_USB_ZC0301 is not set -+# CONFIG_USB_PWC is not set -+CONFIG_USB_PWC_INPUT_EVDEV=y -+# CONFIG_USB_ZR364XX is not set -+# CONFIG_USB_STKWEBCAM is not set -+# CONFIG_USB_S2255 is not set -+# CONFIG_RADIO_ADAPTERS is not set -+CONFIG_DVB_MAX_ADAPTERS=8 -+# CONFIG_DVB_DYNAMIC_MINORS is not set -+CONFIG_DVB_CAPTURE_DRIVERS=y -+ -+# -+# Supported SAA7146 based PCI Adapters -+# -+# CONFIG_TTPCI_EEPROM is not set -+# CONFIG_DVB_AV7110 is not set -+# CONFIG_DVB_BUDGET_CORE is not set -+ -+# -+# Supported USB Adapters -+# -+# CONFIG_DVB_USB is not set -+# CONFIG_DVB_TTUSB_BUDGET is not set -+# CONFIG_DVB_TTUSB_DEC is not set -+# CONFIG_SMS_SIANO_MDTV is not set -+ -+# -+# Supported FlexCopII (B2C2) Adapters -+# -+# CONFIG_DVB_B2C2_FLEXCOP is not set -+ -+# -+# Supported BT878 Adapters -+# -+ -+# -+# Supported Pluto2 Adapters -+# -+# CONFIG_DVB_PLUTO2 is not set -+ -+# -+# Supported SDMC DM1105 Adapters -+# -+# CONFIG_DVB_DM1105 is not set -+ -+# -+# Supported Earthsoft PT1 Adapters -+# -+# CONFIG_DVB_PT1 is not set -+ -+# -+# Supported Mantis Adapters -+# -+# CONFIG_MANTIS_CORE is not set -+ -+# -+# Supported DVB Frontends -+# -+# CONFIG_DVB_FE_CUSTOMISE is not set -+CONFIG_DVB_ZL10353=m -+CONFIG_DVB_TDA10048=m -+CONFIG_DVB_TDA10023=m -+CONFIG_DVB_LGDT330X=m -+CONFIG_DVB_S5H1409=m -+CONFIG_DVB_S5H1411=m -+# CONFIG_DAB is not set -+ -+# -+# Graphics support -+# -+CONFIG_VGA_ARB=y -+# CONFIG_DRM is not set -+# CONFIG_VGASTATE is not set -+# CONFIG_VIDEO_OUTPUT_CONTROL is not set -+CONFIG_FB=m -+# CONFIG_FIRMWARE_EDID is not set -+# CONFIG_FB_DDC is not set -+# CONFIG_FB_BOOT_VESA_SUPPORT is not set -+# CONFIG_FB_CFB_FILLRECT is not set -+# CONFIG_FB_CFB_COPYAREA is not set -+# CONFIG_FB_CFB_IMAGEBLIT is not set -+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -+# CONFIG_FB_SYS_FILLRECT is not set -+# CONFIG_FB_SYS_COPYAREA is not set -+# CONFIG_FB_SYS_IMAGEBLIT is not set -+# CONFIG_FB_FOREIGN_ENDIAN is not set -+# CONFIG_FB_SYS_FOPS is not set -+# CONFIG_FB_SVGALIB is not set -+# CONFIG_FB_MACMODES is not set -+# CONFIG_FB_BACKLIGHT is not set -+# CONFIG_FB_MODE_HELPERS is not set -+# CONFIG_FB_TILEBLITTING is not set -+ -+# -+# Frame buffer hardware drivers -+# -+# CONFIG_FB_CIRRUS is not set -+# CONFIG_FB_PM2 is not set -+# CONFIG_FB_CYBER2000 is not set -+# CONFIG_FB_S1D13XXX is not set -+# CONFIG_FB_NVIDIA is not set -+# CONFIG_FB_RIVA is not set -+# CONFIG_FB_MATROX is not set -+# CONFIG_FB_RADEON is not set -+# CONFIG_FB_ATY128 is not set -+# CONFIG_FB_ATY is not set -+# CONFIG_FB_S3 is not set -+# CONFIG_FB_SAVAGE is not set -+# CONFIG_FB_SIS is not set -+# CONFIG_FB_VIA is not set -+# CONFIG_FB_NEOMAGIC is not set -+# CONFIG_FB_KYRO is not set -+# CONFIG_FB_3DFX is not set -+# CONFIG_FB_VOODOO1 is not set -+# CONFIG_FB_VT8623 is not set -+# CONFIG_FB_TRIDENT is not set -+# CONFIG_FB_ARK is not set -+# CONFIG_FB_PM3 is not set -+# CONFIG_FB_CARMINE is not set -+# CONFIG_FB_VIRTUAL is not set -+# CONFIG_FB_METRONOME is not set -+# CONFIG_FB_MB862XX is not set -+# CONFIG_FB_BROADSHEET is not set -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+# CONFIG_DISPLAY_SUPPORT is not set -+ -+# -+# Console display driver support -+# -+# CONFIG_VGA_CONSOLE is not set -+CONFIG_DUMMY_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE=m -+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -+# CONFIG_FONTS is not set -+CONFIG_FONT_8x8=y -+CONFIG_FONT_8x16=y -+# CONFIG_LOGO is not set -+CONFIG_SOUND=m -+# CONFIG_SOUND_OSS_CORE is not set -+CONFIG_SND=m -+CONFIG_SND_TIMER=m -+CONFIG_SND_PCM=m -+CONFIG_SND_HWDEP=m -+CONFIG_SND_RAWMIDI=m -+CONFIG_SND_SEQUENCER=m -+# CONFIG_SND_SEQ_DUMMY is not set -+# CONFIG_SND_MIXER_OSS is not set -+# CONFIG_SND_PCM_OSS is not set -+# CONFIG_SND_SEQUENCER_OSS is not set -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -+# CONFIG_SND_DYNAMIC_MINORS is not set -+CONFIG_SND_SUPPORT_OLD_API=y -+CONFIG_SND_VERBOSE_PROCFS=y -+# CONFIG_SND_VERBOSE_PRINTK is not set -+# CONFIG_SND_DEBUG is not set -+CONFIG_SND_RAWMIDI_SEQ=m -+# CONFIG_SND_OPL3_LIB_SEQ is not set -+# CONFIG_SND_OPL4_LIB_SEQ is not set -+# CONFIG_SND_SBAWE_SEQ is not set -+# CONFIG_SND_EMU10K1_SEQ is not set -+CONFIG_SND_DRIVERS=y -+# CONFIG_SND_DUMMY is not set -+# CONFIG_SND_VIRMIDI is not set -+# CONFIG_SND_MTPAV is not set -+# CONFIG_SND_SERIAL_U16550 is not set -+# CONFIG_SND_MPU401 is not set -+# CONFIG_SND_PCI is not set -+CONFIG_SND_ARM=y -+CONFIG_SND_SPI=y -+CONFIG_SND_USB=y -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_CAIAQ=m -+# CONFIG_SND_USB_CAIAQ_INPUT is not set -+# CONFIG_SND_SOC is not set -+# CONFIG_SOUND_PRIME is not set -+CONFIG_HID_SUPPORT=y -+CONFIG_HID=y -+# CONFIG_HIDRAW is not set -+ -+# -+# USB Input Devices -+# -+CONFIG_USB_HID=y -+# CONFIG_HID_PID is not set -+CONFIG_USB_HIDDEV=y -+ -+# -+# Special HID drivers -+# -+CONFIG_HID_A4TECH=y -+CONFIG_HID_APPLE=y -+CONFIG_HID_BELKIN=y -+CONFIG_HID_CHERRY=y -+CONFIG_HID_CHICONY=y -+CONFIG_HID_CYPRESS=y -+CONFIG_HID_DRAGONRISE=y -+# CONFIG_DRAGONRISE_FF is not set -+CONFIG_HID_EZKEY=y -+CONFIG_HID_KYE=y -+CONFIG_HID_GYRATION=y -+CONFIG_HID_TWINHAN=y -+CONFIG_HID_KENSINGTON=y -+CONFIG_HID_LOGITECH=y -+# CONFIG_LOGITECH_FF is not set -+# CONFIG_LOGIRUMBLEPAD2_FF is not set -+CONFIG_HID_MICROSOFT=y -+CONFIG_HID_MONTEREY=y -+CONFIG_HID_NTRIG=y -+CONFIG_HID_PANTHERLORD=y -+# CONFIG_PANTHERLORD_FF is not set -+CONFIG_HID_PETALYNX=y -+CONFIG_HID_SAMSUNG=y -+CONFIG_HID_SONY=y -+CONFIG_HID_SUNPLUS=y -+CONFIG_HID_GREENASIA=y -+# CONFIG_GREENASIA_FF is not set -+CONFIG_HID_SMARTJOYPLUS=y -+# CONFIG_SMARTJOYPLUS_FF is not set -+CONFIG_HID_TOPSEED=y -+CONFIG_HID_THRUSTMASTER=y -+# CONFIG_THRUSTMASTER_FF is not set -+CONFIG_HID_WACOM=m -+CONFIG_HID_ZEROPLUS=y -+# CONFIG_ZEROPLUS_FF is not set -+CONFIG_USB_SUPPORT=y -+CONFIG_USB_ARCH_HAS_HCD=y -+CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB_ARCH_HAS_EHCI=y -+CONFIG_USB=y -+# CONFIG_USB_DEBUG is not set -+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set -+ -+# -+# Miscellaneous USB options -+# -+CONFIG_USB_DEVICEFS=y -+CONFIG_USB_DEVICE_CLASS=y -+# CONFIG_USB_DYNAMIC_MINORS is not set -+CONFIG_USB_SUSPEND=y -+# CONFIG_USB_OTG is not set -+# CONFIG_USB_MON is not set -+# CONFIG_USB_WUSB is not set -+# CONFIG_USB_WUSB_CBAF is not set -+ -+# -+# USB Host Controller Drivers -+# -+# CONFIG_USB_C67X00_HCD is not set -+# CONFIG_USB_XHCI_HCD is not set -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_ROOT_HUB_TT=y -+CONFIG_USB_EHCI_TT_NEWSCHED=y -+# CONFIG_USB_OXU210HP_HCD is not set -+# CONFIG_USB_ISP116X_HCD is not set -+# CONFIG_USB_ISP1760_HCD is not set -+# CONFIG_USB_ISP1362_HCD is not set -+# CONFIG_USB_OHCI_HCD is not set -+# CONFIG_USB_UHCI_HCD is not set -+# CONFIG_USB_SL811_HCD is not set -+# CONFIG_USB_R8A66597_HCD is not set -+# CONFIG_USB_WHCI_HCD is not set -+# CONFIG_USB_HWA_HCD is not set -+# CONFIG_USB_MUSB_HDRC is not set -+ -+# -+# USB Device Class drivers -+# -+CONFIG_USB_ACM=m -+CONFIG_USB_PRINTER=m -+CONFIG_USB_WDM=m -+# CONFIG_USB_TMC is not set -+ -+# -+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -+# -+ -+# -+# also be needed; see USB_STORAGE Help for more info -+# -+CONFIG_USB_STORAGE=y -+# CONFIG_USB_STORAGE_DEBUG is not set -+CONFIG_USB_STORAGE_DATAFAB=y -+CONFIG_USB_STORAGE_FREECOM=y -+# CONFIG_USB_STORAGE_ISD200 is not set -+# CONFIG_USB_STORAGE_USBAT is not set -+CONFIG_USB_STORAGE_SDDR09=y -+CONFIG_USB_STORAGE_SDDR55=y -+CONFIG_USB_STORAGE_JUMPSHOT=y -+# CONFIG_USB_STORAGE_ALAUDA is not set -+# CONFIG_USB_STORAGE_ONETOUCH is not set -+# CONFIG_USB_STORAGE_KARMA is not set -+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -+# CONFIG_USB_LIBUSUAL is not set -+ -+# -+# USB Imaging devices -+# -+# CONFIG_USB_MDC800 is not set -+# CONFIG_USB_MICROTEK is not set -+ -+# -+# USB port drivers -+# -+CONFIG_USB_SERIAL=m -+CONFIG_USB_EZUSB=y -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_FUNSOFT=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_MOTOROLA=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_HP4X=m -+CONFIG_USB_SERIAL_SAFE=m -+# CONFIG_USB_SERIAL_SAFE_PADDED is not set -+CONFIG_USB_SERIAL_SIEMENS_MPI=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_DEBUG=m -+ -+# -+# USB Miscellaneous drivers -+# -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+# CONFIG_USB_ADUTUX is not set -+# CONFIG_USB_SEVSEG is not set -+# CONFIG_USB_RIO500 is not set -+# CONFIG_USB_LEGOTOWER is not set -+# CONFIG_USB_LCD is not set -+# CONFIG_USB_BERRY_CHARGE is not set -+# CONFIG_USB_LED is not set -+# CONFIG_USB_CYPRESS_CY7C63 is not set -+# CONFIG_USB_CYTHERM is not set -+# CONFIG_USB_IDMOUSE is not set -+# CONFIG_USB_FTDI_ELAN is not set -+# CONFIG_USB_APPLEDISPLAY is not set -+CONFIG_USB_SISUSBVGA=m -+CONFIG_USB_SISUSBVGA_CON=y -+# CONFIG_USB_LD is not set -+# CONFIG_USB_TRANCEVIBRATOR is not set -+# CONFIG_USB_IOWARRIOR is not set -+# CONFIG_USB_TEST is not set -+# CONFIG_USB_ISIGHTFW is not set -+# CONFIG_USB_VST is not set -+# CONFIG_USB_GADGET is not set -+ -+# -+# OTG and related infrastructure -+# -+# CONFIG_USB_GPIO_VBUS is not set -+# CONFIG_USB_ULPI is not set -+# CONFIG_NOP_USB_XCEIV is not set -+# CONFIG_UWB is not set -+CONFIG_MMC=y -+# CONFIG_MMC_DEBUG is not set -+# CONFIG_MMC_UNSAFE_RESUME is not set -+ -+# -+# MMC/SD/SDIO Card Drivers -+# -+CONFIG_MMC_BLOCK=y -+CONFIG_MMC_BLOCK_BOUNCE=y -+CONFIG_SDIO_UART=y -+# CONFIG_MMC_TEST is not set -+ -+# -+# MMC/SD/SDIO Host Controller Drivers -+# -+CONFIG_MMC_SDHCI=y -+# CONFIG_MMC_SDHCI_PCI is not set -+CONFIG_MMC_SDHCI_PLTFM=y -+# CONFIG_MMC_AT91 is not set -+# CONFIG_MMC_ATMELMCI is not set -+# CONFIG_MMC_TIFM_SD is not set -+CONFIG_MMC_MVSDIO=y -+# CONFIG_MMC_SPI is not set -+# CONFIG_MMC_CB710 is not set -+# CONFIG_MMC_VIA_SDMMC is not set -+# CONFIG_MEMSTICK is not set -+CONFIG_NEW_LEDS=y -+CONFIG_LEDS_CLASS=y -+ -+# -+# LED drivers -+# -+# CONFIG_LEDS_PCA9532 is not set -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_GPIO_PLATFORM=y -+# CONFIG_LEDS_LP3944 is not set -+# CONFIG_LEDS_PCA955X is not set -+# CONFIG_LEDS_DAC124S085 is not set -+# CONFIG_LEDS_BD2802 is not set -+# CONFIG_LEDS_LT3593 is not set -+ -+# -+# LED Triggers -+# -+CONFIG_LEDS_TRIGGERS=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -+CONFIG_LEDS_TRIGGER_GPIO=m -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+ -+# -+# iptables trigger is under Netfilter config (LED target) -+# -+# CONFIG_ACCESSIBILITY is not set -+# CONFIG_INFINIBAND is not set -+CONFIG_RTC_LIB=y -+CONFIG_RTC_CLASS=y -+CONFIG_RTC_HCTOSYS=y -+CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -+# CONFIG_RTC_DEBUG is not set -+ -+# -+# RTC interfaces -+# -+CONFIG_RTC_INTF_SYSFS=y -+CONFIG_RTC_INTF_PROC=y -+CONFIG_RTC_INTF_DEV=y -+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -+# CONFIG_RTC_DRV_TEST is not set -+ -+# -+# I2C RTC drivers -+# -+# CONFIG_RTC_DRV_DS1307 is not set -+# CONFIG_RTC_DRV_DS1374 is not set -+# CONFIG_RTC_DRV_DS1672 is not set -+# CONFIG_RTC_DRV_MAX6900 is not set -+# CONFIG_RTC_DRV_RS5C372 is not set -+# CONFIG_RTC_DRV_ISL1208 is not set -+# CONFIG_RTC_DRV_X1205 is not set -+# CONFIG_RTC_DRV_PCF8563 is not set -+# CONFIG_RTC_DRV_PCF8583 is not set -+# CONFIG_RTC_DRV_M41T80 is not set -+# CONFIG_RTC_DRV_BQ32K is not set -+CONFIG_RTC_DRV_S35390A=y -+# CONFIG_RTC_DRV_FM3130 is not set -+# CONFIG_RTC_DRV_RX8581 is not set -+# CONFIG_RTC_DRV_RX8025 is not set -+ -+# -+# SPI RTC drivers -+# -+# CONFIG_RTC_DRV_M41T94 is not set -+# CONFIG_RTC_DRV_DS1305 is not set -+# CONFIG_RTC_DRV_DS1390 is not set -+# CONFIG_RTC_DRV_MAX6902 is not set -+# CONFIG_RTC_DRV_R9701 is not set -+# CONFIG_RTC_DRV_RS5C348 is not set -+# CONFIG_RTC_DRV_DS3234 is not set -+# CONFIG_RTC_DRV_PCF2123 is not set -+ -+# -+# Platform RTC drivers -+# -+# CONFIG_RTC_DRV_CMOS is not set -+# CONFIG_RTC_DRV_DS1286 is not set -+# CONFIG_RTC_DRV_DS1511 is not set -+# CONFIG_RTC_DRV_DS1553 is not set -+# CONFIG_RTC_DRV_DS1742 is not set -+# CONFIG_RTC_DRV_STK17TA8 is not set -+# CONFIG_RTC_DRV_M48T86 is not set -+# CONFIG_RTC_DRV_M48T35 is not set -+# CONFIG_RTC_DRV_M48T59 is not set -+# CONFIG_RTC_DRV_MSM6242 is not set -+# CONFIG_RTC_DRV_BQ4802 is not set -+# CONFIG_RTC_DRV_RP5C01 is not set -+# CONFIG_RTC_DRV_V3020 is not set -+ -+# -+# on-CPU RTC drivers -+# -+CONFIG_RTC_DRV_MV=y -+CONFIG_DMADEVICES=y -+ -+# -+# DMA Devices -+# -+CONFIG_MV_XOR=y -+CONFIG_DMA_ENGINE=y -+ -+# -+# DMA Clients -+# -+# CONFIG_NET_DMA is not set -+# CONFIG_ASYNC_TX_DMA is not set -+# CONFIG_DMATEST is not set -+# CONFIG_AUXDISPLAY is not set -+# CONFIG_UIO is not set -+ -+# -+# TI VLYNQ -+# -+# CONFIG_STAGING is not set -+ -+# -+# File systems -+# -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -+CONFIG_EXT3_FS_XATTR=y -+CONFIG_EXT3_FS_POSIX_ACL=y -+# CONFIG_EXT3_FS_SECURITY is not set -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_XATTR=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+# CONFIG_EXT4_FS_SECURITY is not set -+# CONFIG_EXT4_DEBUG is not set -+CONFIG_JBD=y -+# CONFIG_JBD_DEBUG is not set -+CONFIG_JBD2=y -+# CONFIG_JBD2_DEBUG is not set -+CONFIG_FS_MBCACHE=y -+CONFIG_REISERFS_FS=m -+# CONFIG_REISERFS_CHECK is not set -+# CONFIG_REISERFS_PROC_INFO is not set -+# CONFIG_REISERFS_FS_XATTR is not set -+CONFIG_JFS_FS=y -+CONFIG_JFS_POSIX_ACL=y -+# CONFIG_JFS_SECURITY is not set -+# CONFIG_JFS_DEBUG is not set -+# CONFIG_JFS_STATISTICS is not set -+CONFIG_FS_POSIX_ACL=y -+CONFIG_XFS_FS=m -+# CONFIG_XFS_QUOTA is not set -+CONFIG_XFS_POSIX_ACL=y -+# CONFIG_XFS_RT is not set -+# CONFIG_XFS_DEBUG is not set -+# CONFIG_GFS2_FS is not set -+# CONFIG_OCFS2_FS is not set -+CONFIG_BTRFS_FS=m -+# CONFIG_BTRFS_FS_POSIX_ACL is not set -+# CONFIG_NILFS2_FS is not set -+CONFIG_FILE_LOCKING=y -+CONFIG_FSNOTIFY=y -+CONFIG_DNOTIFY=y -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+# CONFIG_QUOTA is not set -+CONFIG_AUTOFS_FS=m -+CONFIG_AUTOFS4_FS=m -+CONFIG_FUSE_FS=m -+# CONFIG_CUSE is not set -+ -+# -+# Caches -+# -+# CONFIG_FSCACHE is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+# CONFIG_ZISOFS is not set -+CONFIG_UDF_FS=m -+CONFIG_UDF_NLS=y -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_CODEPAGE=437 -+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -+CONFIG_NTFS_FS=m -+# CONFIG_NTFS_DEBUG is not set -+# CONFIG_NTFS_RW is not set -+ -+# -+# Pseudo filesystems -+# -+CONFIG_PROC_FS=y -+CONFIG_PROC_SYSCTL=y -+CONFIG_PROC_PAGE_MONITOR=y -+CONFIG_SYSFS=y -+CONFIG_TMPFS=y -+# CONFIG_TMPFS_POSIX_ACL is not set -+# CONFIG_HUGETLB_PAGE is not set -+# CONFIG_CONFIGFS_FS is not set -+CONFIG_MISC_FILESYSTEMS=y -+# CONFIG_ADFS_FS is not set -+# CONFIG_AFFS_FS is not set -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+# CONFIG_BEFS_FS is not set -+# CONFIG_BFS_FS is not set -+# CONFIG_EFS_FS is not set -+CONFIG_JFFS2_FS=y -+CONFIG_JFFS2_FS_DEBUG=0 -+CONFIG_JFFS2_FS_WRITEBUFFER=y -+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -+# CONFIG_JFFS2_SUMMARY is not set -+# CONFIG_JFFS2_FS_XATTR is not set -+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -+CONFIG_JFFS2_ZLIB=y -+# CONFIG_JFFS2_LZO is not set -+CONFIG_JFFS2_RTIME=y -+# CONFIG_JFFS2_RUBIN is not set -+CONFIG_UBIFS_FS=y -+# CONFIG_UBIFS_FS_XATTR is not set -+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -+CONFIG_UBIFS_FS_LZO=y -+CONFIG_UBIFS_FS_ZLIB=y -+# CONFIG_UBIFS_FS_DEBUG is not set -+CONFIG_CRAMFS=y -+# CONFIG_SQUASHFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_OMFS_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_ROMFS_FS is not set -+# CONFIG_SYSV_FS is not set -+# CONFIG_UFS_FS is not set -+CONFIG_NETWORK_FILESYSTEMS=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3=y -+# CONFIG_NFS_V3_ACL is not set -+CONFIG_NFS_V4=y -+# CONFIG_NFS_V4_1 is not set -+CONFIG_ROOT_NFS=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3=y -+# CONFIG_NFSD_V3_ACL is not set -+CONFIG_NFSD_V4=y -+CONFIG_LOCKD=y -+CONFIG_LOCKD_V4=y -+CONFIG_EXPORTFS=m -+CONFIG_NFS_COMMON=y -+CONFIG_SUNRPC=y -+CONFIG_SUNRPC_GSS=y -+CONFIG_RPCSEC_GSS_KRB5=y -+# CONFIG_RPCSEC_GSS_SPKM3 is not set -+# CONFIG_SMB_FS is not set -+CONFIG_CIFS=m -+# CONFIG_CIFS_STATS is not set -+# CONFIG_CIFS_WEAK_PW_HASH is not set -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+# CONFIG_CIFS_DEBUG2 is not set -+# CONFIG_CIFS_EXPERIMENTAL is not set -+# CONFIG_NCP_FS is not set -+# CONFIG_CODA_FS is not set -+# CONFIG_AFS_FS is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_ACORN_PARTITION is not set -+# CONFIG_OSF_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_ATARI_PARTITION is not set -+CONFIG_MAC_PARTITION=y -+CONFIG_MSDOS_PARTITION=y -+# CONFIG_BSD_DISKLABEL is not set -+# CONFIG_MINIX_SUBPARTITION is not set -+# CONFIG_SOLARIS_X86_PARTITION is not set -+# CONFIG_UNIXWARE_DISKLABEL is not set -+# CONFIG_LDM_PARTITION is not set -+# CONFIG_SGI_PARTITION is not set -+# CONFIG_ULTRIX_PARTITION is not set -+# CONFIG_SUN_PARTITION is not set -+# CONFIG_KARMA_PARTITION is not set -+CONFIG_EFI_PARTITION=y -+# CONFIG_SYSV68_PARTITION is not set -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+CONFIG_NLS_CODEPAGE_437=y -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+CONFIG_NLS_CODEPAGE_850=y -+# CONFIG_NLS_CODEPAGE_852 is not set -+# CONFIG_NLS_CODEPAGE_855 is not set -+# CONFIG_NLS_CODEPAGE_857 is not set -+# CONFIG_NLS_CODEPAGE_860 is not set -+# CONFIG_NLS_CODEPAGE_861 is not set -+# CONFIG_NLS_CODEPAGE_862 is not set -+# CONFIG_NLS_CODEPAGE_863 is not set -+# CONFIG_NLS_CODEPAGE_864 is not set -+# CONFIG_NLS_CODEPAGE_865 is not set -+# CONFIG_NLS_CODEPAGE_866 is not set -+# CONFIG_NLS_CODEPAGE_869 is not set -+# CONFIG_NLS_CODEPAGE_936 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# CONFIG_NLS_CODEPAGE_932 is not set -+# CONFIG_NLS_CODEPAGE_949 is not set -+# CONFIG_NLS_CODEPAGE_874 is not set -+# CONFIG_NLS_ISO8859_8 is not set -+# CONFIG_NLS_CODEPAGE_1250 is not set -+# CONFIG_NLS_CODEPAGE_1251 is not set -+# CONFIG_NLS_ASCII is not set -+CONFIG_NLS_ISO8859_1=y -+CONFIG_NLS_ISO8859_2=y -+# CONFIG_NLS_ISO8859_3 is not set -+# CONFIG_NLS_ISO8859_4 is not set -+# CONFIG_NLS_ISO8859_5 is not set -+# CONFIG_NLS_ISO8859_6 is not set -+# CONFIG_NLS_ISO8859_7 is not set -+# CONFIG_NLS_ISO8859_9 is not set -+# CONFIG_NLS_ISO8859_13 is not set -+# CONFIG_NLS_ISO8859_14 is not set -+# CONFIG_NLS_ISO8859_15 is not set -+# CONFIG_NLS_KOI8_R is not set -+# CONFIG_NLS_KOI8_U is not set -+CONFIG_NLS_UTF8=y -+# CONFIG_DLM is not set -+ -+# -+# Kernel hacking -+# -+# CONFIG_PRINTK_TIME is not set -+CONFIG_ENABLE_WARN_DEPRECATED=y -+CONFIG_ENABLE_MUST_CHECK=y -+CONFIG_FRAME_WARN=1024 -+CONFIG_MAGIC_SYSRQ=y -+# CONFIG_STRIP_ASM_SYMS is not set -+# CONFIG_UNUSED_SYMBOLS is not set -+CONFIG_DEBUG_FS=y -+# CONFIG_HEADERS_CHECK is not set -+CONFIG_DEBUG_KERNEL=y -+# CONFIG_DEBUG_SHIRQ is not set -+CONFIG_DETECT_SOFTLOCKUP=y -+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -+CONFIG_SCHED_DEBUG=y -+# CONFIG_SCHEDSTATS is not set -+CONFIG_TIMER_STATS=y -+# CONFIG_DEBUG_OBJECTS is not set -+# CONFIG_SLUB_DEBUG_ON is not set -+# CONFIG_SLUB_STATS is not set -+# CONFIG_DEBUG_KMEMLEAK is not set -+CONFIG_DEBUG_PREEMPT=y -+# CONFIG_DEBUG_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+# CONFIG_DEBUG_MUTEXES is not set -+# CONFIG_DEBUG_LOCK_ALLOC is not set -+# CONFIG_PROVE_LOCKING is not set -+# CONFIG_LOCK_STAT is not set -+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -+# CONFIG_DEBUG_KOBJECT is not set -+CONFIG_DEBUG_BUGVERBOSE=y -+# CONFIG_DEBUG_INFO is not set -+# CONFIG_DEBUG_VM is not set -+# CONFIG_DEBUG_WRITECOUNT is not set -+CONFIG_DEBUG_MEMORY_INIT=y -+# CONFIG_DEBUG_LIST is not set -+# CONFIG_DEBUG_SG is not set -+# CONFIG_DEBUG_NOTIFIERS is not set -+# CONFIG_DEBUG_CREDENTIALS is not set -+# CONFIG_BOOT_PRINTK_DELAY is not set -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_RCU_CPU_STALL_DETECTOR is not set -+# CONFIG_KPROBES_SANITY_TEST is not set -+# CONFIG_BACKTRACE_SELF_TEST is not set -+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -+# CONFIG_LKDTM is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_LATENCYTOP is not set -+CONFIG_SYSCTL_SYSCALL_CHECK=y -+# CONFIG_PAGE_POISONING is not set -+CONFIG_HAVE_FUNCTION_TRACER=y -+CONFIG_RING_BUFFER=y -+CONFIG_RING_BUFFER_ALLOW_SWAP=y -+CONFIG_TRACING_SUPPORT=y -+CONFIG_FTRACE=y -+# CONFIG_FUNCTION_TRACER is not set -+# CONFIG_IRQSOFF_TRACER is not set -+# CONFIG_PREEMPT_TRACER is not set -+# CONFIG_SCHED_TRACER is not set -+# CONFIG_ENABLE_DEFAULT_TRACERS is not set -+# CONFIG_BOOT_TRACER is not set -+CONFIG_BRANCH_PROFILE_NONE=y -+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -+# CONFIG_PROFILE_ALL_BRANCHES is not set -+# CONFIG_STACK_TRACER is not set -+# CONFIG_KMEMTRACE is not set -+# CONFIG_WORKQUEUE_TRACER is not set -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_RING_BUFFER_BENCHMARK is not set -+# CONFIG_DYNAMIC_DEBUG is not set -+# CONFIG_SAMPLES is not set -+CONFIG_HAVE_ARCH_KGDB=y -+# CONFIG_KGDB is not set -+CONFIG_ARM_UNWIND=y -+CONFIG_DEBUG_USER=y -+# CONFIG_DEBUG_ERRORS is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+# CONFIG_DEBUG_LL is not set -+# CONFIG_OC_ETM is not set -+ -+# -+# Security options -+# -+# CONFIG_KEYS is not set -+# CONFIG_SECURITY is not set -+# CONFIG_SECURITYFS is not set -+# CONFIG_DEFAULT_SECURITY_SELINUX is not set -+# CONFIG_DEFAULT_SECURITY_SMACK is not set -+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -+CONFIG_DEFAULT_SECURITY_DAC=y -+CONFIG_DEFAULT_SECURITY="" -+CONFIG_XOR_BLOCKS=m -+CONFIG_ASYNC_CORE=m -+CONFIG_ASYNC_MEMCPY=m -+CONFIG_ASYNC_XOR=m -+CONFIG_ASYNC_PQ=m -+CONFIG_ASYNC_RAID6_RECOV=m -+CONFIG_CRYPTO=y -+ -+# -+# Crypto core or helper -+# -+CONFIG_CRYPTO_FIPS=y -+CONFIG_CRYPTO_ALGAPI=y -+CONFIG_CRYPTO_ALGAPI2=y -+CONFIG_CRYPTO_AEAD=m -+CONFIG_CRYPTO_AEAD2=y -+CONFIG_CRYPTO_BLKCIPHER=y -+CONFIG_CRYPTO_BLKCIPHER2=y -+CONFIG_CRYPTO_HASH=y -+CONFIG_CRYPTO_HASH2=y -+CONFIG_CRYPTO_RNG=m -+CONFIG_CRYPTO_RNG2=y -+CONFIG_CRYPTO_PCOMP=y -+CONFIG_CRYPTO_MANAGER=y -+CONFIG_CRYPTO_MANAGER2=y -+CONFIG_CRYPTO_GF128MUL=m -+CONFIG_CRYPTO_NULL=m -+CONFIG_CRYPTO_WORKQUEUE=y -+CONFIG_CRYPTO_CRYPTD=m -+CONFIG_CRYPTO_AUTHENC=m -+CONFIG_CRYPTO_TEST=m -+ -+# -+# Authenticated Encryption with Associated Data -+# -+CONFIG_CRYPTO_CCM=m -+CONFIG_CRYPTO_GCM=m -+CONFIG_CRYPTO_SEQIV=m -+ -+# -+# Block modes -+# -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTR=m -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_ECB=y -+CONFIG_CRYPTO_LRW=m -+CONFIG_CRYPTO_PCBC=m -+CONFIG_CRYPTO_XTS=m -+ -+# -+# Hash modes -+# -+CONFIG_CRYPTO_HMAC=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_VMAC=m -+ -+# -+# Digest -+# -+CONFIG_CRYPTO_CRC32C=y -+CONFIG_CRYPTO_GHASH=m -+CONFIG_CRYPTO_MD4=m -+CONFIG_CRYPTO_MD5=y -+CONFIG_CRYPTO_MICHAEL_MIC=m -+CONFIG_CRYPTO_RMD128=m -+CONFIG_CRYPTO_RMD160=m -+CONFIG_CRYPTO_RMD256=m -+CONFIG_CRYPTO_RMD320=m -+CONFIG_CRYPTO_SHA1=m -+CONFIG_CRYPTO_SHA256=m -+CONFIG_CRYPTO_SHA512=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+ -+# -+# Ciphers -+# -+CONFIG_CRYPTO_AES=y -+CONFIG_CRYPTO_ANUBIS=m -+CONFIG_CRYPTO_ARC4=y -+CONFIG_CRYPTO_BLOWFISH=m -+CONFIG_CRYPTO_CAMELLIA=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_CAST6=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_FCRYPT=m -+CONFIG_CRYPTO_KHAZAD=m -+CONFIG_CRYPTO_SALSA20=m -+CONFIG_CRYPTO_SEED=m -+CONFIG_CRYPTO_SERPENT=m -+CONFIG_CRYPTO_TEA=m -+CONFIG_CRYPTO_TWOFISH=m -+CONFIG_CRYPTO_TWOFISH_COMMON=m -+ -+# -+# Compression -+# -+CONFIG_CRYPTO_DEFLATE=y -+CONFIG_CRYPTO_ZLIB=m -+CONFIG_CRYPTO_LZO=y -+ -+# -+# Random Number Generation -+# -+CONFIG_CRYPTO_ANSI_CPRNG=m -+CONFIG_CRYPTO_HW=y -+CONFIG_CRYPTO_DEV_MV_CESA=m -+# CONFIG_CRYPTO_DEV_HIFN_795X is not set -+# CONFIG_BINARY_PRINTF is not set -+ -+# -+# Library routines -+# -+CONFIG_BITREVERSE=y -+CONFIG_GENERIC_FIND_LAST_BIT=y -+CONFIG_CRC_CCITT=y -+CONFIG_CRC16=y -+# CONFIG_CRC_T10DIF is not set -+CONFIG_CRC_ITU_T=m -+CONFIG_CRC32=y -+# CONFIG_CRC7 is not set -+CONFIG_LIBCRC32C=y -+CONFIG_ZLIB_INFLATE=y -+CONFIG_ZLIB_DEFLATE=y -+CONFIG_LZO_COMPRESS=y -+CONFIG_LZO_DECOMPRESS=y -+CONFIG_DECOMPRESS_GZIP=y -+CONFIG_DECOMPRESS_BZIP2=y -+CONFIG_DECOMPRESS_LZMA=y -+CONFIG_DECOMPRESS_LZO=y -+CONFIG_TEXTSEARCH=y -+CONFIG_TEXTSEARCH_KMP=m -+CONFIG_TEXTSEARCH_BM=m -+CONFIG_TEXTSEARCH_FSM=m -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y -+CONFIG_NLATTR=y --- -1.6.0.3 - diff --git a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch b/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch deleted file mode 100644 index bfcbcf44aa4..00000000000 --- a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch +++ /dev/null @@ -1,15 +0,0 @@ -The GuruPlug's u-boot is configured with the wrong `arch_number', so -change Linux so that it matches u-boot's expectations. See -. - ---- linux-2.6.35.3/arch/arm/tools/mach-types 2010-08-20 20:55:55.000000000 +0200 -+++ linux-2.6.35.3/arch/arm/tools/mach-types 2010-09-13 22:49:41.000000000 +0200 -@@ -2643,7 +2643,7 @@ rfp43 MACH_RFP43 RFP43 2655 - sk86r0301 MACH_SK86R0301 SK86R0301 2656 - ctpxa MACH_CTPXA CTPXA 2657 - epb_arm9_a MACH_EPB_ARM9_A EPB_ARM9_A 2658 --guruplug MACH_GURUPLUG GURUPLUG 2659 -+guruplug MACH_GURUPLUG GURUPLUG 2601 - spear310 MACH_SPEAR310 SPEAR310 2660 - spear320 MACH_SPEAR320 SPEAR320 2661 - robotx MACH_ROBOTX ROBOTX 2662 diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 37c5f926e87..d9bd6f2c934 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -163,19 +163,4 @@ rec { }); }; - guruplug_defconfig = - { # Default configuration for the GuruPlug. From - # . - name = "guruplug-defconfig"; - patch = ./guruplug-defconfig.patch; - }; - - guruplug_arch_number = - { # Hack to match the `arch_number' of the U-Boot that ships with the - # GuruPlug. This is only needed when using this specific U-Boot - # binary. See - # . - name = "guruplug-arch-number"; - patch = ./guruplug-mach-type.patch; - }; } From ff99631753002a8e4c8125d50d1e1eb53e0a0b28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:15:31 +0200 Subject: [PATCH 049/332] linux: Remove CIFS timeout patch We longer use CIFS in the VM tests so we don't need this anymore. --- .../linux/kernel/cifs-timeout-2.6.38.patch | 13 ------------- pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch deleted file mode 100644 index 8168ffb5a1a..00000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2011-03-27 20:37:20.000000000 +0200 -+++ linux-2.6.32.14/fs/cifs/transport.c 2011-04-01 11:07:17.700305670 +0200 -@@ -182,8 +182,8 @@ - after the retries we will kill the socket and - reconnect which may clear the network problem. - */ -- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { -- cERROR(1, "sends on sock %p stuck for 15 seconds", -+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { -+ cERROR(1, "sends on sock %p stuck for 119 seconds", - ssocket); - rc = -EAGAIN; - break; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d9bd6f2c934..42f1be071f9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -125,14 +125,6 @@ rec { features.aufs3 = true; }; - # Increase the timeout on CIFS requests from 15 to 120 seconds to - # make CIFS more resilient to high load on the CIFS server. - cifs_timeout_2_6_38 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-2.6.38.patch; - features.cifsTimeout = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3ced7dbc39..bc212974836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6380,7 +6380,6 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 - kernelPatches.cifs_timeout_2_6_38 ]; }; From b976e00ff27068d73d4e7bb891956c42e5220de6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:16:45 +0200 Subject: [PATCH 050/332] linux: Remove obsolete AUFS 3.7 patch --- pkgs/os-specific/linux/kernel/patches.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42f1be071f9..7bd8c6f94ed 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -110,21 +110,6 @@ rec { features.aufs3 = true; }; - # not officially released yet, but 3.x seems to work fine - aufs3_7 = rec { - name = "aufs3.7"; - version = "3.x.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "8d24d728c7eb54dd624bccd8e87afa826670142c"; - sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; From c564d012f8237b5d667a7bebfd782efff9a78ec5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:20:20 +0200 Subject: [PATCH 051/332] Style fix --- pkgs/os-specific/linux/kernel/patches.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7bd8c6f94ed..c77785167cc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -133,11 +133,10 @@ rec { grsecurity_2_9_1_3_2_48 = { name = "grsecurity-2.9.1-3.2.48"; - patch = - (fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; - sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; - }); + patch = fetchurl { + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; + sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; + }; }; } From f2f00c56e4e54e6df6393035b73796ab5d8cc48a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:38:54 +0200 Subject: [PATCH 052/332] linux: Enable stack protector This may prevent exploitation of buffer overflows. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2e64dae23fe..83417787f0d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -165,6 +165,7 @@ with stdenv.lib; STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem + CC_STACKPROTECTOR y # Detect buffer overflows on the stack # Misc. options. 8139TOO_8129 y From d1de0e2d6db53134b142c692bed538fe6db18631 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:50:48 +0200 Subject: [PATCH 053/332] linux: Enable detection of hung tasks --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 83417787f0d..cc9be98c838 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -19,6 +19,7 @@ with stdenv.lib; DEBUG_STACKOVERFLOW n RCU_TORTURE_TEST n SCHEDSTATS n + DETECT_HUNG_TASK y # Support drivers that need external firmware. STANDALONE n From 14ca9c0bf1480ded542ceb64e754b630294eaba7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 01:39:59 +0200 Subject: [PATCH 054/332] linux: Include "NixOS" in "uname -v" --- pkgs/os-specific/linux/kernel/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index bea53e9c4dd..621237fa9a3 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup -makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags" +makeFlags="ARCH=$arch SHELL=/bin/sh KBUILD_BUILD_VERSION=1-NixOS $makeFlags" if [ -n "$crossConfig" ]; then makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-" fi From 77dd343e1e729a19cc471992515b6538130d46f0 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 11:21:54 +0200 Subject: [PATCH 055/332] - System images are not required for building. Disabling them makes building faster. - Make ant flags configurable --- pkgs/development/mobile/androidenv/build-app.nix | 7 ++++--- pkgs/development/mobile/androidenv/default.nix | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index b5aa82cced7..2792d364f15 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false +{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -11,7 +11,8 @@ let else throw "Platform: ${stdenv.system} is not supported!"; androidsdkComposition = androidsdk { - inherit platformVersions abiVersions useGoogleAPIs; + inherit platformVersions useGoogleAPIs; + abiVersions = []; }; in stdenv.mkDerivation { @@ -34,7 +35,7 @@ stdenv.mkDerivation { ''} export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ant ${if release then "release" else "debug"} + ant ${antFlags} ${if release then "release" else "debug"} ''; installPhase = '' diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index d7d8d92a66e..6e410d4c5db 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -57,6 +57,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_2 = androidsdk { + platformVersions = [ "17" ]; + abiVersions = [ "armeabi-v7a" ]; + useGoogleAPIs = true; + }; + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant; inherit androidsdk; From c81e70fc305b8714101479bb884da0c60cdd7d69 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 11:32:57 +0200 Subject: [PATCH 056/332] Shut up annoying question to configure hardware profiles --- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 97d73bffded..eb39d854d1f 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device - ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} # Enable GPU acceleration ${stdenv.lib.optionalString enableGPU '' From 9a2b9ba6b30ed233851f1941030e06f07b3fae9a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 12:43:33 +0200 Subject: [PATCH 057/332] Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's OpenGL driver to be used --- pkgs/development/mobile/androidenv/androidsdk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 34cc07adf35..1573de63e09 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -61,14 +61,14 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib done ''} ''} From f155a35d7d8562b1da40a7e0b4265829d54455bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:01:59 +0200 Subject: [PATCH 058/332] Move kernelExtraConfig to common-config.nix (for x86) It's bad to have the kernel config scattered across two places. (This should also be done for the other architectures.) Also, restore Xen and KVM guest support in Linux 3.10. --- pkgs/os-specific/linux/kernel/common-config.nix | 15 +++++++++++++++ pkgs/top-level/platforms.nix | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cc9be98c838..0c3aca17e4e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -265,7 +265,22 @@ with stdenv.lib; ''} # Virtualisation. + PARAVIRT y + ${if versionAtLeast version "3.10" then '' + HYPERVISOR_GUEST y + '' else '' + PARAVIRT_GUEST y + ''} + KVM_GUEST y + ${optionalString (versionOlder version "3.7") '' + KVM_CLOCK y + ''} + XEN y XEN_DOM0? y + KSM y + ${optionalString (!stdenv.is64bit) '' + HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. + ''} # Media support. ${optionalString (versionAtLeast version "3.6") '' diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index ec047efecb0..d6408286581 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -10,19 +10,6 @@ rec { # Currently ignored - it should be set according to 'system' once it is # not ignored. This is for stdenv-updates. kernelArch = "i386"; - kernelExtraConfig = - '' - # Virtualisation (KVM, Xen...). - HYPERVISOR_GUEST? y #3.10 version of the paravirt options - PARAVIRT_GUEST? y #Doesn't exist in 3.10 - KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7 - KVM_GUEST? y #Doesn't exist in 3.10 - XEN? y #Doesn't exist in 3.10 - KSM y - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - ''; }; pc_simplekernel = pc // { From d077851b7d4c3728811237d6d105b6f9622ae244 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:30:18 +0200 Subject: [PATCH 059/332] VM builds: Use the default kernel --- pkgs/build-support/vm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2821fc0a099..b0911fd99c3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,5 +1,5 @@ { pkgs -, kernel ? pkgs.linux_3_9 +, kernel ? pkgs.linux , img ? "bzImage" , rootModules ? [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] @@ -114,14 +114,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc From 4342a32debf7d3961581e500b7e445e7ca466c33 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:35:04 +0200 Subject: [PATCH 060/332] VM builds: Reduce kernel verbosity --- pkgs/build-support/vm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b0911fd99c3..5f9381cd00c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -91,8 +91,8 @@ rec { esac done + echo "loading kernel modules..." for i in $(cat ${modulesClosure}/insmod-list); do - echo "loading module $(basename $i .ko)" insmod $i done @@ -133,7 +133,7 @@ rec { ln -sf /proc/mounts /fs/etc/mtab echo "127.0.0.1 localhost" > /fs/etc/hosts - echo "Now running: $command" + echo "starting stage 2 ($command)" test -n "$command" set +e @@ -195,7 +195,7 @@ rec { -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \ + -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; From 4ec1f8b68aa4902fb577a988d25c712245be7cf1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:26:02 +0200 Subject: [PATCH 061/332] git: Update to 1.8.3.4 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dd603e75562..074bcd6c289 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.3.2"; + version = "1.8.3.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63"; + sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From 80a82a2858fd767384d974798b36f0555618fca1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:36:54 +0200 Subject: [PATCH 062/332] git: Install git-subtree --- .../version-management/git-and-tools/git/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 074bcd6c289..c22b358189d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -50,6 +50,13 @@ stdenv.mkDerivation { chmod +x $1 } + # Install git-subtree. + pushd contrib/subtree + make + make install install-doc + popd + rm -rf contrib/subtree + # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ From 65ad55c425ddd3f6dea06f1b6a1c51e076179965 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:37:36 +0200 Subject: [PATCH 063/332] git-subtree: Remove This package is obsolete because it's now part of git (see https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE). --- .../git-and-tools/default.nix | 4 --- .../git-and-tools/git-subtree/default.nix | 27 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-subtree/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 69aeba92fd8..b5b3d4044c5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,9 +89,5 @@ rec { svn2git_kde = callPackage ./svn2git-kde { }; - gitSubtree = import ./git-subtree { - inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; - }; - darcsToGit = callPackage ./darcs-to-git { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix deleted file mode 100644 index dd00572b150..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }: - -stdenv.mkDerivation { - name = "git-subtree-0.4-2-g2793ee6"; - - src = fetchurl { - url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974"; - sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6"; - name = "git-subtree-0.4-2-g2793ee6.tar.gz"; - }; - - buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; - - configurePhase = "export prefix=$out"; - - buildPhase = "true"; - - installPhase = "make install prefix=$out gitdir=$out/bin"; - - meta= { - description = "experimental alternative to the git-submodule command"; - homepage = http://github.com/apenwarr/git-subtree; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} From 35333935d6a620177bfe8e02aad836b830175be8 Mon Sep 17 00:00:00 2001 From: Evan Danaher Date: Thu, 1 Aug 2013 20:12:44 +0200 Subject: [PATCH 064/332] Add simple hsetroot package. --- pkgs/tools/X11/hsetroot/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/X11/hsetroot/default.nix diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix new file mode 100644 index 00000000000..96241bd02cd --- /dev/null +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, imlib2, libX11, libXext }: + +stdenv.mkDerivation { + name = "hsetroot-1.0.2"; + + # The primary download site seems to no longer exist; use Gentoo's mirror for now. + src = fetchurl { + url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz"; + sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; + }; + + buildInputs = [ imlib2 libX11 libXext ]; + + meta = { + description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + homepage = http://thegraveyard.org/hsetroot.html; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc212974836..5f71de14653 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9153,6 +9153,8 @@ let gnome = recurseIntoAttrs gnome2; + hsetroot = callPackage ../tools/X11/hsetroot { }; + kde4 = recurseIntoAttrs pkgs.kde410; kde48 = kdePackagesFor (pkgs.kde48 // { From bfbbb12e353bcd367acfc9bfde6b9bb22f55f34d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Aug 2013 09:39:20 +0400 Subject: [PATCH 065/332] Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations --- .../tools/misc/cl-launch/default.nix | 34 +++++++++++++++++++ .../tools/misc/cl-launch/default.upstream | 2 ++ pkgs/lib/licenses.nix | 6 ++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/misc/cl-launch/default.nix create mode 100644 pkgs/development/tools/misc/cl-launch/default.upstream diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix new file mode 100644 index 00000000000..63c585b00a9 --- /dev/null +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="cl-launch"; + version="3.21.1"; + name="${baseName}-${version}"; + hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz"; + sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + preConfigure = '' + export makeFlags="$makeFlags PREFIX='$out'" + mkdir -p "$out/bin" + ''; + + meta = { + inherit (s) version; + description = ''Common Lisp launcher script''; + license = stdenv.lib.licenses.llgpl21 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream new file mode 100644 index 00000000000..1ff5daca02c --- /dev/null +++ b/pkgs/development/tools/misc/cl-launch/default.upstream @@ -0,0 +1,2 @@ +url http://common-lisp.net/project/xcvb/cl-launch/ +version_link '.-[0-9].*[0-9][.]tar[.].*' diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 0dcdff0bee4..fcf7420e425 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -148,6 +148,12 @@ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; }; + llgpl21 = { + shortName = "LLGPLv2.1"; + fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; + url = http://opensource.franz.com/preamble.html; + }; + lgpl3 = { shortName = "LGPLv3"; fullName = "GNU Lesser General Public License version 3 only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc212974836..808def18abd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3360,6 +3360,8 @@ let chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + complexity = callPackage ../development/tools/misc/complexity { }; ctags = callPackage ../development/tools/misc/ctags { }; From 1362d479cbc13517d160a9a5e2a821aab94f23cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Aug 2013 07:33:20 +0200 Subject: [PATCH 066/332] nixpart: Update to bugfix version 0.4.1. Contains the following fix: - Fix mounting btrfs when mount_only (-m) is used. I would like to update blivet as well, but at the moment it breaks for nixpart, so let's retry later when we're at 0.5.x or even 1.x :-) Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 36972573b35..2cd40bb0867 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,11 +9,11 @@ let }; in buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6"; + sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; From 9b9fa35ebd30a9b86c6124be31fb1244a4207ead Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Aug 2013 10:49:39 +0200 Subject: [PATCH 067/332] blivet: Update sha256, as it changed upstream. The sha256 was magically changed upstream with the same contents but different timestamps, so let's update it. Thanks to @rbvermaa for noticing. Signed-off-by: aszlig --- pkgs/development/python-modules/blivet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 564b89347b5..403bb264892 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -18,7 +18,7 @@ in buildPythonPackage rec { src = fetchurl { url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + "${name}.tar.bz2"; - sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5"; + sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; }; postPatch = '' From a672551d448ff45ad55301e25bd8fe9f56362f3e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Aug 2013 07:27:12 +0200 Subject: [PATCH 068/332] python-paramiko: Update to version 0.11.0. This also now uses the md5 istead of the sha256, because pypi actually directly provides MD5 sums. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6bf93b394a..fa8e24861c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3267,11 +3267,11 @@ pythonPackages = modules // rec { }; paramiko = buildPythonPackage rec { - name = "paramiko-1.10.1"; + name = "paramiko-1.11.0"; src = fetchurl { - url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz; - sha256 = "1g5sbzfxdhps61z3vm30wa87m5xq1j9ar3qvgr5bz63l7nxhvb2z"; + url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz"; + md5 = "a2c55dc04904bd08d984533703177084"; }; buildInputs = [ pycrypto ]; From 4489dc729ead712c73fb558d7b9b54f2e62576a3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Aug 2013 07:28:05 +0200 Subject: [PATCH 069/332] python-paramiko: Propagate pycrypto dependency. Leaving this just in buildInputs won't help here, because the project using Paramiko will need pycrypto in any case. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa8e24861c7..2bc2ed7a6fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3274,7 +3274,7 @@ pythonPackages = modules // rec { md5 = "a2c55dc04904bd08d984533703177084"; }; - buildInputs = [ pycrypto ]; + propagatedBuildInputs = [ pycrypto ]; meta = { homepage = "http://www.lag.net/paramiko/"; From bcb9417c0e3966644d1e622c2b9bb40e310cb6aa Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Aug 2013 09:05:37 +0200 Subject: [PATCH 070/332] chromium: Update stable and dev release channels. This introduces the following new versions: stable: 28.0.1500.71 -> 28.0.1500.95 (builds fine, tested) dev: 30.0.1573.2 -> 30.0.1581.2 (builds fine, tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 31d9ed10b4c..c2a5518c6ca 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 = "30.0.1573.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz"; - sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz"; + version = "30.0.1581.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1581.2.tar.xz"; + sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r"; }; beta = { version = "29.0.1547.32"; @@ -11,8 +11,8 @@ sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w"; }; stable = { - version = "28.0.1500.71"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz"; - sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r"; + version = "28.0.1500.95"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.95.tar.xz"; + sha256 = "0d6pj57nyx7wfgxws98f6ly749flcyv7zg5sc3w16ggdxf5qhf1w"; }; } From 41126666a62756784617a11e41a0dd2002956692 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Aug 2013 10:39:07 +0200 Subject: [PATCH 071/332] bison: add version 3.0 --- .../parsing/bison/{default.nix => 2.x.nix} | 0 pkgs/development/tools/parsing/bison/3.x.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 43 insertions(+), 1 deletion(-) rename pkgs/development/tools/parsing/bison/{default.nix => 2.x.nix} (100%) create mode 100644 pkgs/development/tools/parsing/bison/3.x.nix diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/2.x.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/default.nix rename to pkgs/development/tools/parsing/bison/2.x.nix diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix new file mode 100644 index 00000000000..63ceb7d6b6a --- /dev/null +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "bison-3.0"; + + src = fetchurl { + url = "mirror://gnu/bison/${name}.tar.xz"; + sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79"; + }; + + nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + propagatedBuildInputs = [ m4 ]; + + doCheck = true; + + meta = { + homepage = "http://www.gnu.org/software/bison/"; + description = "GNU Bison, a Yacc-compatible parser generator"; + license = "GPLv3+"; + + longDescription = '' + Bison is a general-purpose parser generator that converts an + annotated context-free grammar into an LALR(1) or GLR parser for + that grammar. Once you are proficient with Bison, you can use + it to develop a wide range of language parsers, from those used + in simple desk calculators to complex programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc + grammars ought to work with Bison with no change. Anyone + familiar with Yacc should be able to use Bison with little + trouble. You need to be fluent in C or C++ programming in order + to use Bison. + ''; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.unix; + }; + + passthru = { glrSupport = true; }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4758e7e6d2d..7fc37fc8790 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3319,7 +3319,9 @@ let cross = assert crossSystem != null; crossSystem; })); - bison = callPackage ../development/tools/parsing/bison { }; + bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; + bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; + bison = bison2; buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; From 61c880d5582c9bfd91a4ddb9c27973e31aed8c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:49 +0200 Subject: [PATCH 072/332] haskell-idris: update to version 0.9.9 --- pkgs/development/compilers/idris/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 225f8afcd82..804c4838317 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,19 +1,20 @@ -{ cabal, binary, Cabal, filepath, gmp, happy, haskeline -, languageJava, libffi, mtl, parsec, split, text, transformers +{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline +, languageJava, libffi, llvmGeneral, mtl, parsec, split, text +, transformers, vector, vectorBinaryInstances }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.8"; - sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h"; + version = "0.9.9"; + sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m"; isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal filepath haskeline languageJava libffi mtl parsec - split text transformers + binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl + parsec split text transformers vector vectorBinaryInstances ]; buildTools = [ happy ]; - extraLibraries = [ gmp ]; + extraLibraries = [ boehmgc gmp ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; From bf1ce4f47b15894f22fbfa40f8be8c08f3dcb57e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 073/332] haskell-MonadRandom: update to version 0.1.11 --- pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 2dead8de40d..9018bc603cf 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.10"; - sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs"; + version = "0.1.11"; + sha256 = "107f3ch84riagxa9x6yk4gxq2vq5dsk63rd0780g1fdplnf1sky3"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; From bcd9344f9b3edfff1068d8d0ef47c70fa0a79462 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 074/332] haskell-fast-logger: update to version 0.3.3 --- pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index b192c1e0c61..fb8714f3e85 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.3.2"; - sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla"; + version = "0.3.3"; + sha256 = "0ya9dn9j2nddpclj00w6jgmiq2xx500sws056fa2s4bdsl8vn5rh"; buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; testDepends = [ hspec ]; meta = { From dd0031cbadaa4577372ebc8a7fd35820dcd88ee8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 075/332] haskell-feed: update to version 0.3.9.1 --- pkgs/development/libraries/haskell/feed/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index bafe23aed0c..a2c1ccde86b 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "feed"; - version = "0.3.9"; - sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2"; + version = "0.3.9.1"; + sha256 = "1c7dj9w9qj8408qql1kfq8m28fwvfd7bpgkj32lmk5x9qm5iz04k"; buildDepends = [ utf8String xml ]; meta = { + homepage = "https://github.com/sof/feed"; description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 5fd7636a2e9d52bd9c6a8262e81f2c50ea93e04f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 076/332] haskell-generic-deriving: update to version 1.6.1 --- .../libraries/haskell/generic-deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 043156ab5e1..f1a1ec837fd 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.5.0"; - sha256 = "1m3hckwpzmarlvm2xq22za3386ady6p89kg7nd8cnjkifnnbz20r"; + version = "1.6.1"; + sha256 = "0c3b3xkjdfp14w48gfk3f6aqz4cgk6i3bl5mci23mbb3f33jcx1j"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; From cb8f500a17b735556c6b9c5934c0daf06bac7d51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 077/332] haskell-profunctor-extras: update to version 3.3.3.1 --- .../libraries/haskell/profunctor-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index 0094ec5a340..6844bcc369a 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "profunctor-extras"; - version = "3.3.1"; - sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb"; + version = "3.3.3.1"; + sha256 = "16naa6ksgwy6fh8vwflcc9s0rpamn886as8qhjqrkpjlc8s83h7g"; buildDepends = [ comonad profunctors semigroupoidExtras semigroupoids tagged transformers From e6239c406f27819becaf3034ef83fe7b3658a1a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 078/332] haskell-reactive-banana: update to version 0.7.1.3 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 8d1ee0ffc95..0bf7747d46b 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.2"; - sha256 = "1x4ln3dr937va0ii7lr86d6wsrh2qd1sxany4y9dkpcrsvb3db0l"; + version = "0.7.1.3"; + sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb"; buildDepends = [ hashable transformers unorderedContainers vault ]; testDepends = [ hashable HUnit testFramework testFrameworkHunit transformers From 30135c6b508889aa6d7887c595cab02673bcf601 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 079/332] haskell-stm-conduit: update to version 2.1.1 --- .../libraries/haskell/stm-conduit/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 79171aefb9f..24af3f8b734 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,13 +1,15 @@ -{ cabal, conduit, HUnit, QuickCheck, resourcet, stm, stmChans -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, transformers +{ cabal, async, conduit, HUnit, monadControl, QuickCheck, resourcet +, stm, stmChans, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, transformers }: cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.1.0"; - sha256 = "0rxnw7kpxvhwmpbn2v9ps0b2hw9321817nyywjjq3x8fadg8w99l"; - buildDepends = [ conduit resourcet stm stmChans transformers ]; + version = "2.1.1"; + sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr"; + buildDepends = [ + async conduit monadControl resourcet stm stmChans transformers + ]; testDepends = [ conduit HUnit QuickCheck stm stmChans testFramework testFrameworkHunit testFrameworkQuickcheck2 transformers From 02db4b9f7026346f9005cc2d30560acb68cbcd02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:50 +0200 Subject: [PATCH 080/332] haskell-unix-process-conduit: update to version 0.2.2 --- .../libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 8dc93c21363..1f04d939d9c 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.1.2"; - sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1"; + version = "0.2.2"; + sha256 = "15n6n925avv51kr2avwkp8sq8mfl287i0445vl9iy6hyxjjgpgr6"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { From 1d0659202548ff335da9c02948371d7042e9b4ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Aug 2013 16:19:51 +0200 Subject: [PATCH 081/332] haskell-unix-time: update to version 0.2.0 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 691787e7f87..846e3d88883 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.10"; - sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf"; + version = "0.2.0"; + sha256 = "1gmchi6crbd3lpnw1j0zaaj7y0gib8dbqd8ip2s5p3f50qqlsxj8"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; From cc691d95f5c94e7402aa14511511603a13952566 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Aug 2013 10:32:39 +0200 Subject: [PATCH 082/332] haskell-lens: jailbreak to fix build with latest version of generic-deriving --- pkgs/development/libraries/haskell/lens/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 4531603214e..8bc221f1493 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -26,6 +26,9 @@ cabal.mkDerivation (self: { transformers unorderedContainers vector ]; doCheck = false; + patchPhase = '' + sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal + ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; From 0c331a4a421ba0571991e029451e35bf275a8db5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Aug 2013 12:10:39 +0200 Subject: [PATCH 083/332] haskell-idris: revert update to version 0.9.9 This reverts commit 61c880d5582c9bfd91a4ddb9c27973e31aed8c12. The new Idris version depends on a version of LLVM that we don't have in master yet: it's only in x-updates. --- pkgs/development/compilers/idris/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 804c4838317..225f8afcd82 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,20 +1,19 @@ -{ cabal, binary, boehmgc, Cabal, filepath, gmp, happy, haskeline -, languageJava, libffi, llvmGeneral, mtl, parsec, split, text -, transformers, vector, vectorBinaryInstances +{ cabal, binary, Cabal, filepath, gmp, happy, haskeline +, languageJava, libffi, mtl, parsec, split, text, transformers }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.9"; - sha256 = "0wwssgpiyn7akyfrpi1khvqxx1k8753kk7151zvvymz0zkks643m"; + version = "0.9.8"; + sha256 = "1mxc6mic3d508ni9pqxw8q31f27shyaxs1rchfl2jg58i9w6iy7h"; isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal filepath haskeline languageJava libffi llvmGeneral mtl - parsec split text transformers vector vectorBinaryInstances + binary Cabal filepath haskeline languageJava libffi mtl parsec + split text transformers ]; buildTools = [ happy ]; - extraLibraries = [ boehmgc gmp ]; + extraLibraries = [ gmp ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; From d5cad473f95d448fc76d73a8f107d42964361dc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Aug 2013 12:14:03 +0200 Subject: [PATCH 084/332] bison3: mark low-prio until the check phase is fixed --- 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 7fc37fc8790..effaf77680c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3320,7 +3320,7 @@ let })); bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; - bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; + bison3 = lowPrio (callPackage ../development/tools/parsing/bison/3.x.nix { }); bison = bison2; buildbot = callPackage ../development/tools/build-managers/buildbot { From cd531d70f6151d1c582ef8f62559c6dd712d1051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Jul 2013 22:38:32 +0200 Subject: [PATCH 085/332] lightdm updates (merge #574) Also fixes the situation where some session stuff is written to nix store. --- .../lightdm-gtk-greeter/default.nix | 42 ++++++++++++++----- .../display-managers/lightdm/default.nix | 34 ++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 501826b82df..0b8863752d2 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -1,23 +1,43 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, gtk3, intltool }: +{ stdenv, fetchurl, lightdm, pkgconfig, intltool +, hicolor_icon_theme, makeWrapper +, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported +}: -stdenv.mkDerivation { - name = "lightdm-gtk-greeter"; +#ToDo: bad icons with gtk2; +# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from + +#ToDo: Failed to open sessions directory: Error opening directory '${lightdm}/share/lightdm/remote-sessions': No such file or directory + +let + ver_branch = "1.6"; + version = "1.5.1"; # 1.5.2 and 1.6.0 result into infinite cycling of X in restarts +in +stdenv.mkDerivation rec { + name = "lightdm-gtk-greeter-${version}"; src = fetchurl { - url = "https://launchpad.net/lightdm-gtk-greeter/1.6/1.5.1/+download/lightdm-gtk-greeter-1.5.1.tar.gz"; - sha256 = "ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621"; + url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz"; + sha256 = "08fnsbnay5jhd7ps8n91i6c227zq6xizpyn34qhqzykrga8pxkpc"; }; - buildInputs = [ pkgconfig gtk3 lightdm intltool ]; - - patches = - [ ./lightdm-gtk-greeter.patch - ]; - + patches = [ ./lightdm-gtk-greeter.patch ]; patchFlags = "-p0"; + buildInputs = [ pkgconfig lightdm intltool ] + ++ (if useGTK2 then [ gtk2 makeWrapper ] else [ gtk3 ]); + + configureFlags = stdenv.lib.optional useGTK2 "--with-gtk2"; + postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" + '' + stdenv.lib.optionalString useGTK2 '' + wrapProgram "$out/sbin/lightdm-gtk-greeter" \ + --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" ''; + + meta = { + homepage = http://launchpad.net/lightdm-gtk-greeter; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index ce1f4400b27..598c42199be 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2, intltool, x11, libxklavier, libgcrypt, makeWrapper }: +{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 +, intltool, x11, libxklavier, libgcrypt, dbus/*for tests*/ }: -stdenv.mkDerivation { - name = "lightdm-1.5.1"; +let + ver_branch = "1.8"; + version = "1.7.0"; +in +stdenv.mkDerivation rec { + name = "lightdm-${version}"; src = fetchurl { - url = https://launchpad.net/lightdm/1.6/1.5.1/+download/lightdm-1.5.1.tar.xz; - sha256 = "645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86"; + url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; + sha256 = "0nwwjgc9xvwili6714ag88wsrf0lr5hv1i6z9f0xvin4ym18cbs5"; }; - buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt makeWrapper ]; - - configureFlags = [ "--enable-liblightdm-gobject" ]; - - patches = - [ ./lightdm.patch - ]; - + patches = [ ./lightdm.patch ]; patchFlags = "-p0"; + buildInputs = [ + pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt + ] ++ stdenv.lib.optional doCheck dbus.daemon; + + configureFlags = [ "--enable-liblightdm-gobject" "--localstatedir=/var" ]; + + doCheck = false; # some tests fail, don't know why + meta = { homepage = http://launchpad.net/lightdm; platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} From 018b39d28bd550f0a6ca15b507a27448d76d0d2c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 5 Aug 2013 01:00:34 +0200 Subject: [PATCH 086/332] iodined: Fix iptables and route path to bin instead of sbin --- pkgs/tools/networking/iodine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 33cc53d5511..f6be163bb83 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; + patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c''; installFlags = "prefix=\${out}"; From 60a6e6802f591cfb0c1b1c4868ef5c0956ca3edb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Aug 2013 10:19:57 +0200 Subject: [PATCH 087/332] haskell-git-annex: update to version 4.20130802 --- .../git-and-tools/git-annex/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 e53f60c9be0..f7b0129da90 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 @@ -1,7 +1,7 @@ { cabal, aeson, async, blazeBuilder, bloomfilter, bup , caseInsensitive, clientsession, cryptoApi, curl, dataDefault , dataenc, DAV, dbus, dlist, dns, editDistance -, extensibleExceptions, filepath, git, gnupg1, gnutls, hamlet +, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet , hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, HUnit , IfElse, json, lsof, MissingH, MonadCatchIOTransformers , monadControl, mtl, network, networkInfo, networkMulticast @@ -14,15 +14,15 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20130723"; - sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i"; + version = "4.20130802"; + sha256 = "12dvmz88sbcvhyf7aldhpkrf4aqs0x39hky0hikmfd9zcqs6vbih"; isLibrary = false; isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dlist dns editDistance - extensibleExceptions filepath gnutls hamlet hinotify hS3 hslogger - HTTP httpConduit httpTypes HUnit IfElse json MissingH + extensibleExceptions feed filepath gnutls hamlet hinotify hS3 + hslogger HTTP httpConduit httpTypes HUnit IfElse json MissingH MonadCatchIOTransformers monadControl mtl network networkInfo networkMulticast networkProtocolXmpp QuickCheck random regexTdfa SafeSemaphore SHA stm text time transformers unixCompat utf8String From d65b81b36bec9fb066c63ad5e0529864a2d9ccee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Aug 2013 10:19:57 +0200 Subject: [PATCH 088/332] haskell-MissingH: update to version 1.2.0.1 Don't run the check phase to avoid depending on the obsolete testpack package. --- .../libraries/haskell/MissingH/default.nix | 15 +++++++++------ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 659a1158d0f..b87c47f04be 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,16 +1,19 @@ -{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random -, regexCompat, time +{ cabal, filepath, hslogger, HUnit, mtl, network, parsec +, QuickCheck, random, regexCompat, testpack, time }: cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.2.0.0"; - sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1"; - isLibrary = true; - isExecutable = true; + version = "1.2.0.1"; + sha256 = "0hxyf82g2rz36ks6n136p6brgs0r9cnxfkh4xgl6iw11wbq2rb5m"; buildDepends = [ filepath hslogger HUnit mtl network parsec random regexCompat time ]; + testDepends = [ + filepath hslogger HUnit mtl network parsec QuickCheck random + regexCompat testpack time + ]; + doCheck = false; meta = { homepage = "http://software.complete.org/missingh"; description = "Large utility library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index adc86c6d00c..56997382054 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1390,7 +1390,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); misfortune = callPackage ../development/libraries/haskell/misfortune {}; - MissingH = callPackage ../development/libraries/haskell/MissingH {}; + MissingH = callPackage ../development/libraries/haskell/MissingH { + testpack = null; + }; mmap = callPackage ../development/libraries/haskell/mmap {}; From 0979e4a832557c360b50fe47199fa9ffaae25d4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Aug 2013 10:19:57 +0200 Subject: [PATCH 089/332] haskell-numeric-prelude: update to version 0.4.0.3 --- .../libraries/haskell/numeric-prelude/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index f6f4d420e2a..9fb5d334a4d 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "numeric-prelude"; - version = "0.4.0.1"; - sha256 = "1j361gj7cw31x31vnjhxmy7a62ldvyyqfm7irhff7sf5gv4kr5wh"; + version = "0.4.0.3"; + sha256 = "0lgjnkvbz14cqsm5fjafl8g5mkclcdvpwa3kpz9radmg2x09rsnl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude"; description = "An experimental alternative hierarchy of numeric type classes"; - license = "GPL"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; From 0b93f032305f3579cc46fe2139a75621710995e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Aug 2013 10:19:57 +0200 Subject: [PATCH 090/332] haskell-shakespeare: update to version 1.0.5.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 16ad7ffa44a..4864adfe83a 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.5"; - sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf"; + version = "1.0.5.1"; + sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time From d766bb6f32c1b2eac4ebc5b8b8ea81ddd952abe8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Aug 2013 10:19:57 +0200 Subject: [PATCH 091/332] haskell-stylish-haskell: update to version 0.5.7.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 1d2cea756ff..5c1059e634c 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.6.1"; - sha256 = "0fxncnl9bvb7qjha3r06qli9qlzfljism6k688hrr9y6l06jdc2c"; + version = "0.5.7.0"; + sha256 = "12ka5lyp28fy8gablhymxdldl792ycr8d51lsknhldb54pmklf73"; isLibrary = true; isExecutable = true; buildDepends = [ From a82fcea437387b0bbf6446c94a9d1e9651b530d9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 5 Aug 2013 12:47:57 +0200 Subject: [PATCH 092/332] Make iPhone simulator SDKs configurable --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 96f70ea3832..03ed90c40d5 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,5 +1,9 @@ {stdenv, xcodewrapper}: -{name, appName ? null, app, device ? "iPhone", baseDir ? ""}: +{ name, appName ? null, app +, device ? "iPhone", baseDir ? "" +, sdkRoot ? "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" +, sdkVersion ? "6.1" +}: let _appName = if appName == null then name else appName; @@ -12,7 +16,7 @@ stdenv.mkDerivation { #! ${stdenv.shell} -e cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot '${sdkRoot}/iPhoneSimulator${sdkVersion}.sdk' EOF chmod +x $out/bin/run-test-simulator ''; From 2a294a582b49816d1a7e3bc385226f37beb36a29 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Aug 2013 11:50:14 +0200 Subject: [PATCH 093/332] Statistics::Descriptive: Update to 3.0605 --- pkgs/top-level/perl-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c20f4efd9fc..3bc5865b922 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6040,11 +6040,16 @@ rec { }; }; - StatisticsDescriptive = buildPerlPackage rec { - name = "Statistics-Descriptive-3.0202"; + StatisticsDescriptive = buildPerlPackage { + name = "Statistics-Descriptive-3.0605"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Statistics/${name}.tar.gz"; - sha256 = "0y8l3dkhfc2gqwfigrg363ac7pxcyshdna66afpdvs8r1gd53a1i"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0605.tar.gz; + sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48"; + }; + meta = { + homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; + description = "Module of basic descriptive statistical functions"; + license = "perl"; }; }; From 7019b685de75b7cec5454d7901744cd92328d271 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 5 Aug 2013 19:08:58 +0200 Subject: [PATCH 094/332] Make the emulator flags configurable at runtime and unimportant messages should go the stderr --- .../mobile/androidenv/emulate-app.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index eb39d854d1f..ae8b7f8d1ef 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,5 +1,7 @@ {stdenv, androidsdk}: -{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}: +{name, app ? null, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package ? null, activity ? null}: + +assert app != null -> package != null && activity != null; let androidsdkComposition = androidsdk { @@ -28,7 +30,7 @@ stdenv.mkDerivation { # We have to look for a free TCP port - echo "Looking for a free TCP port in range 5554-5584" + echo "Looking for a free TCP port in range 5554-5584" >&2 for i in $(seq 5554 2 5584) do @@ -41,10 +43,10 @@ stdenv.mkDerivation { if [ -z "$port" ] then - echo "Unfortunately, the emulator port space is exhausted!" + echo "Unfortunately, the emulator port space is exhausted!" >&2 exit 1 else - echo "We have a free TCP port: $port" + echo "We have a free TCP port: $port" >&2 fi export ANDROID_SERIAL="emulator-$port" @@ -58,39 +60,40 @@ stdenv.mkDerivation { ''} # Launch the emulator - ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & + ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted - echo "Waiting until the emulator has booted the device and the package manager is ready..." + echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device - echo "Device state has been reached" + echo "Device state has been reached" >&2 while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] do sleep 5 done - echo "dev.bootcomplete property is 1" + echo "dev.bootcomplete property is 1" >&2 #while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] #do #sleep 5 #done - #echo "sys.boot_completed property is 1" + #echo "sys.boot_completed property is 1" >&2 - echo "ready" + echo "ready" >&2 - # Install the App through the debugger - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk + ${stdenv.lib.optionalString (app != null) '' + # Install the App through the debugger + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk - # Start the application - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + # Start the application + ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + ''} EOF - chmod +x $out/bin/run-test-emulator ''; } From 2208c360ac3ed2633b568520803d2887e18d9133 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 5 Aug 2013 02:29:04 +0000 Subject: [PATCH 095/332] linux: Update to 3.2.50 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 9b1d1bcf6c1..7597a9c695e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.49"; + version = "3.2.50"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; + sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68"; }; features.iwlwifi = true; From f5f5f69ef0de289b817e552311bad988c209c0f9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 5 Aug 2013 22:18:56 +0200 Subject: [PATCH 096/332] The emulator needs file in its PATH and alsaLib --- pkgs/development/mobile/androidenv/androidsdk.nix | 10 ++++++---- pkgs/development/mobile/androidenv/default.nix | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 1573de63e09..11e6b0c45a2 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,9 +1,9 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa -, freetype, fontconfig, gtk, atk +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib +, freetype, fontconfig, gtk, atk, file }: {platformVersions, abiVersions, useGoogleAPIs}: @@ -61,6 +61,7 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ + --prefix PATH : ${file}/bin \ --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done @@ -68,7 +69,8 @@ stdenv.mkDerivation { for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib + --prefix PATH : ${file}/bin \ + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib done ''} ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 6e410d4c5db..9fec70da940 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,7 +36,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk mesa; + inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; inherit platformTools buildTools support platforms sysimages addons; @@ -49,6 +49,7 @@ rec { libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXext_32bit = pkgs_i686.xorg.libXext; mesa_32bit = pkgs_i686.mesa; + alsaLib_32bit = pkgs_i686.alsaLib; }; androidsdk_4_1 = androidsdk { From 0237aa136fdc5d7805f0f87dced992dec5578f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Aug 2013 00:44:10 +0200 Subject: [PATCH 097/332] R: ensure that run-time dependencies can be found --- pkgs/applications/science/math/R/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index fd391b988c9..4c8204b37ee 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -36,9 +36,15 @@ stdenv.mkDerivation rec { --with-system-pcre --with-system-xz --with-ICU - R_SHELL="${stdenv.shell}" + AR=$(type -p ar) + AWK=$(type -p gawk) + CC=$(type -p gcc) + CXX=$(type -p g++) + FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" JAVA_HOME="${jdk}" LDFLAGS="-L${gfortran.gcc}/lib" + RANLIB=$(type -p ranlib) + R_SHELL="${stdenv.shell}" ) echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in ''; From f3aedccfd4c6dfcf8d01efe310f7f7a5416dc8c9 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 31 Jul 2013 14:11:31 +1000 Subject: [PATCH 098/332] grc: add expression --- pkgs/tools/misc/grc/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/grc/default.nix diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix new file mode 100644 index 00000000000..ea54ab4a543 --- /dev/null +++ b/pkgs/tools/misc/grc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + version = "1.4"; + name = "grc_${version}"; + + src = fetchurl { + url = "http://korpus.juls.savba.sk/~garabik/software/grc/${name}.tar.gz"; + sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv"; + }; + + installPhase = '' + sed -i s%/usr%% install.sh + sed -i "s% /usr/bin/python%${python}/bin/python%" grc + sed -i "s% /usr/bin/python%${python}/bin/python%" grc + ./install.sh "$out" + ''; + + meta = with stdenv.lib; { + description = "Yet another colouriser for beautifying your logfiles or output of commands."; + homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + Generic Colouriser is yet another colouriser (written in Python) for + beautifying your logfiles or output of commands. + ''; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c10e737ba97..310a9b9dd6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -446,6 +446,8 @@ let apg = callPackage ../tools/security/apg { }; + grc = callPackage ../tools/misc/grc { }; + otool = callPackage ../os-specific/darwin/otool { }; setfile = callPackage ../os-specific/darwin/setfile { }; From d4ba4769b6f6db42c01c5eb31b0f6ab27d13648e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 3 Aug 2013 19:25:13 +1000 Subject: [PATCH 099/332] password-store: add expression --- pkgs/tools/security/pass/default.nix | 48 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/security/pass/default.nix diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix new file mode 100644 index 00000000000..ba86b0b1d9c --- /dev/null +++ b/pkgs/tools/security/pass/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, getopt }: + +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "password-store-${version}"; + + src = fetchurl { + url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1"; + }; + + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely."; + homepage = http://zx2c4.com/projects/password-store/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. + ''; + }; + + propagatedBuildInputs = [ getopt ]; + + installPhase = '' + # link zsh and fish completions + sed -ie '22s/^#//' Makefile + sed -ie '25s/^#//' Makefile + sed -i 's/find /find -L /' contrib/pass.zsh-completion + mkdir -p "$out/share/zsh/site-functions" + mkdir -p "$out/share/fish/completions" + + # use gnused + sed -i 's/sed -i ""/sed -i /' Makefile + + SYSCONFDIR="$out/etc" PREFIX="$out" make install + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # use nix-supplied getopt + sed -ie '34c GETOPT="${getopt}/bin/getopt"' \ + "$out/lib/password-store.platform.sh" + ''; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fc37fc8790..5a84d3d5fbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -450,6 +450,8 @@ let otool = callPackage ../os-specific/darwin/otool { }; + pass = callPackage ../tools/security/pass { }; + setfile = callPackage ../os-specific/darwin/setfile { }; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; From db6155fa541d001b3d9c848bae8ac2c8a46a7d90 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 6 Aug 2013 03:56:21 +0300 Subject: [PATCH 100/332] xrestop: package 0.4 --- pkgs/tools/X11/xrestop/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/tools/X11/xrestop/default.nix diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix new file mode 100644 index 00000000000..5158963258c --- /dev/null +++ b/pkgs/tools/X11/xrestop/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }: +stdenv.mkDerivation rec { + + name = "xrestop-${version}"; + version = "0.4"; + + src = fetchurl { + url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz; + sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; + }; + + buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index effaf77680c..4eea44cfdf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8794,6 +8794,8 @@ let xpra = callPackage ../tools/X11/xpra { }; + xrestop = callPackage ../tools/X11/xrestop { }; + xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; }; From 02c67c3b017480f4207d44377733b47c36b16127 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 6 Aug 2013 04:13:33 +0300 Subject: [PATCH 101/332] Amarok: update to 2.7.1 --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 8a330800b9e..6e20acab523 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9"; + sha256 = "12dvqnx6jniykbi6sz94xxlnxzafjsaxlf0mppk9w5wn61jwc3cy"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; From 97056a0620f117d793e1a093ba36ec37456bf5e4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 5 Aug 2013 17:59:43 +0000 Subject: [PATCH 102/332] linux: properly parse config choice when it's new --- pkgs/os-specific/linux/kernel/generate-config.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 05b6867bc55..78663098fb3 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -54,8 +54,8 @@ sub runConfig { if ($s eq "\n") { print STDERR "GOT: $line" if $debug; - # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)"). - if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) { + # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)"). + if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) { $choices{$2} = $1; } From 36c2711f8b09ee76b58ed2e6067655776dc981d5 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 5 Aug 2013 18:08:48 +0000 Subject: [PATCH 103/332] linux: update grsecurity patch --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c77785167cc..561cdc8f957 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -131,11 +131,11 @@ rec { patch = ./mips-ext3-n32.patch; }; - grsecurity_2_9_1_3_2_48 = - { name = "grsecurity-2.9.1-3.2.48"; + grsecurity_2_9_1_3_2_50 = + { name = "grsecurity-2.9.1-3.2.50"; patch = fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; - sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch; + sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index effaf77680c..6701d2ba1b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6388,7 +6388,7 @@ let }; linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ]; })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); linux_3_2_apparmor = lowPrio (linux_3_2.override { From ed70cc9830fa4edbdbd223517896a2132e8c88dc Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 6 Aug 2013 10:41:13 +0200 Subject: [PATCH 104/332] We must also take Android's ABI version into account --- pkgs/development/mobile/titaniumenv/build-app.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 24bb1d2d93a..4dbf6c5e82e 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, appName ? null, src, target, androidPlatformVersions ? [ "8" ] +{ appId, name, appName ? null, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false }: @@ -10,6 +10,7 @@ assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateNa let androidsdkComposition = androidsdk { platformVersions = androidPlatformVersions; + abiVersions = androidAbiVersions; useGoogleAPIs = true; }; From dbcb178ef2619661d6f99cc6532cb353d6ec99c0 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 6 Aug 2013 11:16:51 +0200 Subject: [PATCH 105/332] Added extraAVDFiles parameter to support custom system images --- pkgs/development/mobile/androidenv/emulate-app.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index ae8b7f8d1ef..0ae934b572a 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,5 +1,8 @@ {stdenv, androidsdk}: -{name, app ? null, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package ? null, activity ? null}: +{ name, app ? null +, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false +, enableGPU ? false, extraAVDFiles ? [] +, package ? null, activity ? null}: assert app != null -> package != null && activity != null; @@ -54,11 +57,15 @@ stdenv.mkDerivation { # Create a virtual android device yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} - # Enable GPU acceleration ${stdenv.lib.optionalString enableGPU '' + # Enable GPU acceleration echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini ''} + ${stdenv.lib.concatMapStrings (extraAVDFile: '' + ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd + '') extraAVDFiles} + # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & From 3e8812d23b26a29aee7cd3db1c2f9ad4c168b040 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Aug 2013 12:32:10 +0200 Subject: [PATCH 106/332] Add Unix::Getrusage --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3bc5865b922..d74d734d2c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7400,6 +7400,14 @@ rec { buildInputs = [ pkgs.icu ]; }; + UnixGetrusage = buildPerlPackage { + name = "Unix-Getrusage-0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz; + sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12"; + }; + }; + URI = buildPerlPackage { name = "URI-1.60"; src = fetchurl { From 3a4ef263970c4032805d6963faa0c87755b00c75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Aug 2013 12:39:50 +0200 Subject: [PATCH 107/332] Remove Linux 3.8 (EOL) --- pkgs/os-specific/linux/kernel/linux-3.8.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 13 ------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.8.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix deleted file mode 100644 index f455f4ee7f8..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.8.13"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4eea44cfdf0..cf6afd79be2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6428,18 +6428,6 @@ let inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; }; - linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = @@ -6583,7 +6571,6 @@ let linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); # Update this when adding a new version! From 912146d7649891e5665fcee3a0f962f1fcff5878 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Aug 2013 12:40:48 +0200 Subject: [PATCH 108/332] linux: Update to 3.4.56, 3.10.5 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 4b5e4d001a6..ef36e63fa07 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.4"; + version = "3.10.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; + sha256 = "0p1nmk5mikvqi2b6wzlbb0fnrv30p5qazgnqlxgifsf4pmh1x279"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 2cb37987ff4..1300f74f216 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.55"; + version = "3.4.56"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; + sha256 = "1br23nmfrd8r13ad5n79qlndl8s0db89hjp8zrhdz8nzf9jabsjp"; }; features.iwlwifi = true; From d435b392014678f6d95951730a8db51203708486 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 6 Aug 2013 14:11:34 +0200 Subject: [PATCH 109/332] Make AVD creating configurable at runtime --- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 0ae934b572a..9c843fa8c37 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS ${stdenv.lib.optionalString enableGPU '' # Enable GPU acceleration From d0748afc5ea9f66b77563293f8cf31e25e8a53be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 6 Aug 2013 21:20:47 +0200 Subject: [PATCH 110/332] splint: improve meta attributes - don't repeat package name in description - prefer licenses.gpl2Plus over free form "GPLv2+" license name - add platform attribute so that splint will be available in the channel --- pkgs/development/tools/analysis/splint/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index cb804b9e6b0..e8a056bca5a 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://splint.org/; - description = "Splint, an annotation-assisted lightweight static analyzer for C"; + description = "Annotation-assisted lightweight static analyzer for C"; longDescription = '' Splint is a tool for statically checking C programs for security @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { checking than can be done by any standard lint. ''; - license = "GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; -} \ No newline at end of file +} From 61a1867c5dc715a73e5c4bfa933b182a7097e4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 6 Aug 2013 23:43:51 +0200 Subject: [PATCH 111/332] strace: 4.7 -> 4.8 Also, update meta.license and add meta.platforms. --- pkgs/development/tools/misc/strace/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index d5bb2b06e12..bdf3a7d0561 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.7"; + name = "strace-4.8"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764"; + sha256 = "1y6pw4aj4rw5470lqks1ml0n8jh5xbhwr5c3gb00bj570wgjk4pl"; }; nativeBuildInputs = [ perl ]; - meta = { + meta = with stdenv.lib; { homepage = http://strace.sourceforge.net/; description = "A system call tracer for Linux"; - license = "bsd"; + license = licenses.bsd3; + platforms = platforms.linux; }; } From 12cc79f8449f52eacc7f9be2e3ca41dc9ea3ef03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Aug 2013 14:08:05 +0200 Subject: [PATCH 112/332] dunst: upgrade to git version to fix 100% CPU problems --- pkgs/applications/misc/dunst/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 1eb0949aeb4..cb594e494db 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus +{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf }: stdenv.mkDerivation rec { - version = "1.0.0"; - name = "dunst-${version}"; + rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; + name = "dunst-${rev}"; - src = fetchurl { - url = "https://github.com/knopwob/dunst/archive/v${version}.zip"; - sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671"; + # 1.0.0 release doesn't include 100% CPU fix + # https://github.com/knopwob/dunst/issues/98 + src = fetchgit { + inherit rev; + url = "https://github.com/knopwob/dunst.git"; + sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj"; }; patchPhase = '' @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { libXScrnSaver xproto libXinerama perl]; buildPhase = '' - export VERSION=${version}; + export VERSION=${rev}; export PREFIX=$out; make dunst; ''; From d10d50132a1f456149d6585f044775cfc3b86752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Aug 2013 14:09:21 +0200 Subject: [PATCH 113/332] upower: 0.9.19 -> 0.9.21 --- pkgs/os-specific/linux/upower/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 8f244c3d645..049bd75aded 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.19"; + name = "upower-0.9.21"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; + sha256 = "1qmjvfdsm6fnmwmdz0mb8nc8i5fnvzz98j37w0ia7482f058xhhk"; }; buildInputs = @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { [ "--enable-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-udevrulesdir=$(out)/lib/udev/rules.d" ]; preConfigure = From d846e976564350b247600b87cd065b3e42440846 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 14:48:22 +0200 Subject: [PATCH 114/332] VM builds: Use Linux 3.10 3.4 apparently gives corrupt 9pfs data on x86. See e.g. http://hydra.nixos.org/build/5661036 where reading /nix/store/kfldnrrsq0lbbv13gjxdfb3vb1sbaz88-vm-run-stage2 gives garbage. Strangely it doesn't happen here: http://hydra.nixos.org/build/5658978 Ah well. --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5f9381cd00c..996770d2fcc 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,5 +1,5 @@ { pkgs -, kernel ? pkgs.linux +, kernel ? pkgs.linux_3_10 , img ? "bzImage" , rootModules ? [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] From d3d92c7b6df6bbae703d549edfa99d552afee0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 7 Aug 2013 16:31:04 +0200 Subject: [PATCH 115/332] supervisor: 3.0b2 -> 3.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2bc2ed7a6fb..53128c6bb2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4908,11 +4908,11 @@ pythonPackages = modules // rec { supervisor = buildPythonPackage rec { - name = "supervisor-3.0b2"; + name = "supervisor-3.0"; src = fetchurl { - url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz; - md5 = "e2557853239ee69955f993091b0eddc4"; + url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz"; + md5 = "94ff3cf09618c36889425a8e002cd51a"; }; buildInputs = [ mock ]; From 774634a248abe621e3d9687f9ef1b5ef0dde1a33 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 15:20:01 +0200 Subject: [PATCH 116/332] man-pages: Update to 3.53 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f1bc98c26cc..15b49a2a99e 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.50"; + name = "man-pages-3.53"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "04fn7zzi75y79rkg57nkync3hf14m8708iw33s03f0x8ays6fajz"; + sha256 = "0kzkjfrw65f7bv6laz3jism4yqajmfh3vdq2jb5d6gyp4n14sxnl"; }; preBuild = From d17f7d2fdf7f7c7e9822c1440d19f99abb8c42ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 16:17:58 +0200 Subject: [PATCH 117/332] nss: Update to 3.15.1 --- pkgs/development/libraries/nss/default.nix | 59 ++- .../libraries/nss/nix_secload_fixup.patch | 40 +- ...-r1.patch => nss-3.15-gentoo-fixups.patch} | 59 ++- ...ync-up-with-upstream-softokn-changes.patch | 406 ------------------ 4 files changed, 73 insertions(+), 491 deletions(-) rename pkgs/development/libraries/nss/{nss-3.14.1-gentoo-fixups-r1.patch => nss-3.15-gentoo-fixups.patch} (70%) delete mode 100644 pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d38fc19f40e..de980d718f3 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,68 +1,58 @@ -{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite +{ stdenv, fetchurl, nspr, perl, zlib, sqlite , includeTools ? false }: let - nssPEM = fetchgit { - url = "git://git.fedorahosted.org/git/nss-pem.git"; - rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; - sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8"; + nssPEM = fetchurl { + url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz; + sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201"; }; secLoadPatch = fetchurl { name = "security_load.patch"; - urls = [ - # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" - # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" - "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch" - ]; - sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; + urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch; + sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds"; }; in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.14.3"; + version = "3.15.1"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz"; - sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz"; + sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0"; }; buildInputs = [ nspr perl zlib sqlite ]; - postUnpack = '' - cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \ - "$sourceRoot/mozilla/security/nss/lib/ckfw/" - chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem" + prePatch = '' + xz -d < ${nssPEM} | patch -p1 ''; - patches = [ - ./nss-3.14.1-gentoo-fixups-r1.patch - secLoadPatch - ./nix_secload_fixup.patch - ./sync-up-with-upstream-softokn-changes.patch - ]; + patches = + [ ./nss-3.15-gentoo-fixups.patch + secLoadPatch + ./nix_secload_fixup.patch + ]; postPatch = '' - sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn - - # Fix up the patch from Gentoo + # Fix up the patch from Gentoo. sed -i \ -e "/^PREFIX =/s|= /usr|= $out|" \ -e '/@libdir@/s|gentoo/nss|lib|' \ -e '/ln -sf/d' \ - mozilla/security/nss/config/Makefile + nss/config/Makefile # Note for spacing/tab nazis: The TAB characters are intentional! - cat >> mozilla/security/nss/config/Makefile <> nss/config/Makefile < nss.pc + chmod 0644 nss.pc -+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig + + # Create the nss-config script + mkdir -p $(DIST)/bin @@ -36,15 +35,14 @@ diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/M + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ + nss-config.in > nss-config + chmod 0755 nss-config -+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin ++ ln -sf ../../../config/nss-config $(DIST)/bin + +libs: + +dummy: all export libs + -diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in ---- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600 +--- a/nss/config/nss-config.in ++++ b/nss/config/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -191,9 +189,8 @@ diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/con + echo $libdirs +fi + -diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in ---- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600 +--- a/nss/config/nss.pc.in ++++ b/nss/config/nss.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -207,37 +204,35 @@ diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/ +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} + -diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile ---- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600 -+++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600 +--- a/nss/Makefile ++++ b/nss/Makefile @@ -44,7 +44,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf build_dbm all +-nss_build_all: build_nspr all ++nss_build_all: all - nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + nss_clean_all: clobber_nspr clobber -@@ -106,12 +106,6 @@ +@@ -103,12 +103,6 @@ --with-dist-prefix='$(NSPR_PREFIX)' \ --with-dist-includedir='$(NSPR_PREFIX)/include' -build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) - -clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber - - build_dbm: - ifdef NSS_DISABLE_DBM - @echo "skipping the build of DBM" -diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn ---- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500 -+++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600 -@@ -10,6 +10,6 @@ + build_docs: + $(MAKE) -C $(CORE_DEPTH)/doc + +--- a/nss/manifest.mn ++++ b/nss/manifest.mn +@@ -10,4 +10,4 @@ RELEASE = nss --DIRS = lib cmd -+DIRS = lib cmd config +-DIRS = coreconf lib cmd ++DIRS = coreconf lib cmd config diff --git a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch b/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch deleted file mode 100644 index 4942debcd30..00000000000 --- a/pkgs/development/libraries/nss/sync-up-with-upstream-softokn-changes.patch +++ /dev/null @@ -1,406 +0,0 @@ -From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001 -From: Elio Maldonado -Date: Sat, 9 Feb 2013 17:11:00 -0500 -Subject: [PATCH] Sync up with upstream softokn changes - -- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and in a state of flux -- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13' vulnerability CVE-2013-0169 -- It now compiles with the NSS_3_14_3_BETA1 source ---- - mozilla/security/nss/lib/ckfw/pem/rsawrapr.c | 338 +++++++------------------- - 1 files changed, 82 insertions(+), 256 deletions(-) - -diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c -index 5ac4f39..3780d30 100644 ---- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c -+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c -@@ -46,6 +46,7 @@ - #include "sechash.h" - #include "base.h" - -+#include "lowkeyi.h" - #include "secerr.h" - - #define RSA_BLOCK_MIN_PAD_LEN 8 -@@ -54,9 +55,8 @@ - #define RSA_BLOCK_PRIVATE_PAD_OCTET 0xff - #define RSA_BLOCK_AFTER_PAD_OCTET 0x00 - --#define OAEP_SALT_LEN 8 --#define OAEP_PAD_LEN 8 --#define OAEP_PAD_OCTET 0x00 -+/* Needed for RSA-PSS functions */ -+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - - #define FLAT_BUFSIZE 512 /* bytes to hold flattened SHA1Context. */ - -@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk) - return 0; - } - --static SHA1Context *SHA1_CloneContext(SHA1Context * original) --{ -- SHA1Context *clone = NULL; -- unsigned char *pBuf; -- int sha1ContextSize = SHA1_FlattenSize(original); -- SECStatus frv; -- unsigned char buf[FLAT_BUFSIZE]; -- -- PORT_Assert(sizeof buf >= sha1ContextSize); -- if (sizeof buf >= sha1ContextSize) { -- pBuf = buf; -- } else { -- pBuf = nss_ZAlloc(NULL, sha1ContextSize); -- if (!pBuf) -- goto done; -- } -- -- frv = SHA1_Flatten(original, pBuf); -- if (frv == SECSuccess) { -- clone = SHA1_Resurrect(pBuf, NULL); -- memset(pBuf, 0, sha1ContextSize); -- } -- done: -- if (pBuf != buf) -- nss_ZFreeIf(pBuf); -- return clone; -+/* Constant time comparison of a single byte. -+ * Returns 1 iff a == b, otherwise returns 0. -+ * Note: For ranges of bytes, use constantTimeCompare. -+ */ -+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) { -+ unsigned char c = ~(a - b | b - a); -+ c >>= 7; -+ return c; - } - --/* -- * Modify data by XORing it with a special hash of salt. -+/* Constant time comparison of a range of bytes. -+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise -+ * returns 0. - */ --static SECStatus --oaep_xor_with_h1(unsigned char *data, unsigned int datalen, -- unsigned char *salt, unsigned int saltlen) --{ -- SHA1Context *sha1cx; -- unsigned char *dp, *dataend; -- unsigned char end_octet; -- -- sha1cx = SHA1_NewContext(); -- if (sha1cx == NULL) { -- return SECFailure; -- } -- -- /* -- * Get a hash of salt started; we will use it several times, -- * adding in a different end octet (x00, x01, x02, ...). -- */ -- SHA1_Begin(sha1cx); -- SHA1_Update(sha1cx, salt, saltlen); -- end_octet = 0; -- -- dp = data; -- dataend = data + datalen; -- -- while (dp < dataend) { -- SHA1Context *sha1cx_h1; -- unsigned int sha1len, sha1off; -- unsigned char sha1[SHA1_LENGTH]; -- -- /* -- * Create hash of (salt || end_octet) -- */ -- sha1cx_h1 = SHA1_CloneContext(sha1cx); -- SHA1_Update(sha1cx_h1, &end_octet, 1); -- SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1)); -- SHA1_DestroyContext(sha1cx_h1, PR_TRUE); -- PORT_Assert(sha1len == SHA1_LENGTH); -- -- /* -- * XOR that hash with the data. -- * When we have fewer than SHA1_LENGTH octets of data -- * left to xor, use just the low-order ones of the hash. -- */ -- sha1off = 0; -- if ((dataend - dp) < SHA1_LENGTH) -- sha1off = SHA1_LENGTH - (dataend - dp); -- while (sha1off < SHA1_LENGTH) -- *dp++ ^= sha1[sha1off++]; -- -- /* -- * Bump for next hash chunk. -- */ -- end_octet++; -- } -- -- SHA1_DestroyContext(sha1cx, PR_TRUE); -- return SECSuccess; -+static unsigned char constantTimeCompare(const unsigned char *a, -+ const unsigned char *b, -+ unsigned int len) { -+ unsigned char tmp = 0; -+ unsigned int i; -+ for (i = 0; i < len; ++i, ++a, ++b) -+ tmp |= *a ^ *b; -+ return constantTimeEQ8(0x00, tmp); - } - --/* -- * Modify salt by XORing it with a special hash of data. -+/* Constant time conditional. -+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is -+ * not 0 or 1. - */ --static SECStatus --oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen, -- unsigned char *data, unsigned int datalen) -+static unsigned int constantTimeCondition(unsigned int c, -+ unsigned int a, -+ unsigned int b) - { -- unsigned char sha1[SHA1_LENGTH]; -- unsigned char *psalt, *psha1, *saltend; -- SECStatus rv; -- -- /* -- * Create a hash of data. -- */ -- rv = SHA1_HashBuf(sha1, data, datalen); -- if (rv != SECSuccess) { -- return rv; -- } -- -- /* -- * XOR the low-order octets of that hash with salt. -- */ -- PORT_Assert(saltlen <= SHA1_LENGTH); -- saltend = salt + saltlen; -- psalt = salt; -- psha1 = sha1 + SHA1_LENGTH - saltlen; -- while (psalt < saltend) { -- *psalt++ ^= *psha1++; -- } -- -- return SECSuccess; -+ return (~(c - 1) & a) | ((c - 1) & b); - } - - /* -@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen, - unsigned char *block; - unsigned char *bp; - int padLen; -- int i; -+ int i, j; - SECStatus rv; - - block = (unsigned char *) nss_ZAlloc(NULL, modulusLen); -@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned modulusLen, - */ - case RSA_BlockPublic: - -- /* -- * 0x00 || BT || Pad || 0x00 || ActualData -- * 1 1 padLen 1 data->len -- * Pad is all non-zero random bytes. -- */ -- padLen = modulusLen - data->len - 3; -- PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN); -- if (padLen < RSA_BLOCK_MIN_PAD_LEN) { -- nss_ZFreeIf(block); -- return NULL; -- } -- for (i = 0; i < padLen; i++) { -- /* Pad with non-zero random data. */ -- do { -- rv = RNG_GenerateGlobalRandomBytes(bp + i, 1); -- } while (rv == SECSuccess -- && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET); -- if (rv != SECSuccess) { -- nss_ZFreeIf(block); -- return NULL; -- } -- } -- bp += padLen; -- *bp++ = RSA_BLOCK_AFTER_PAD_OCTET; -- nsslibc_memcpy(bp, data->data, data->len); -- -- break; -- -- /* -- * Blocks intended for public-key operation, using -- * Optimal Asymmetric Encryption Padding (OAEP). -- */ -- case RSA_BlockOAEP: -- /* -- * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData) -- * 1 1 OAEP_SALT_LEN OAEP_PAD_LEN + data->len [+ N] -- * -- * where: -- * PaddedData is "Pad1 || ActualData [|| Pad2]" -- * Salt is random data. -- * Pad1 is all zeros. -- * Pad2, if present, is random data. -- * (The "modified" fields are all the same length as the original -- * unmodified values; they are just xor'd with other values.) -- * -- * Modified1 is an XOR of PaddedData with a special octet -- * string constructed of iterated hashing of Salt (see below). -- * Modified2 is an XOR of Salt with the low-order octets of -- * the hash of Modified1 (see farther below ;-). -- * -- * Whew! -- */ -- -- -- /* -- * Salt -- */ -- rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN); -- if (rv != SECSuccess) { -- nss_ZFreeIf(block); -- return NULL; -- } -- bp += OAEP_SALT_LEN; -- -- /* -- * Pad1 -- */ -- nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN); -- bp += OAEP_PAD_LEN; -- -- /* -- * Data -- */ -- nsslibc_memcpy(bp, data->data, data->len); -- bp += data->len; -- -- /* -- * Pad2 -- */ -- if (bp < (block + modulusLen)) { -- rv = RNG_GenerateGlobalRandomBytes(bp, -- block - bp + modulusLen); -- if (rv != SECSuccess) { -- nss_ZFreeIf(block); -- return NULL; -- } -- } -- -- /* -- * Now we have the following: -- * 0x00 || BT || Salt || PaddedData -- * (From this point on, "Pad1 || Data [|| Pad2]" is treated -- * as the one entity PaddedData.) -- * -- * We need to turn PaddedData into Modified1. -- */ -- if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN, -- modulusLen - 2 - OAEP_SALT_LEN, -- block + 2, OAEP_SALT_LEN) != SECSuccess) { -- nss_ZFreeIf(block); -- return NULL; -- } -- -- /* -- * Now we have: -- * 0x00 || BT || Salt || Modified1(PaddedData) -- * -- * The remaining task is to turn Salt into Modified2. -- */ -- if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN, -- block + 2 + OAEP_SALT_LEN, -- modulusLen - 2 - OAEP_SALT_LEN) != -- SECSuccess) { -- nss_ZFreeIf(block); -- return NULL; -- } -- -- break; -+ /* -+ * 0x00 || BT || Pad || 0x00 || ActualData -+ * 1 1 padLen 1 data->len -+ * Pad is all non-zero random bytes. -+ * -+ * Build the block left to right. -+ * Fill the entire block from Pad to the end with random bytes. -+ * Use the bytes after Pad as a supply of extra random bytes from -+ * which to find replacements for the zero bytes in Pad. -+ * If we need more than that, refill the bytes after Pad with -+ * new random bytes as necessary. -+ */ -+ padLen = modulusLen - (data->len + 3); -+ PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN); -+ if (padLen < RSA_BLOCK_MIN_PAD_LEN) { -+ nss_ZFreeIf (block); -+ return NULL; -+ } -+ j = modulusLen - 2; -+ rv = RNG_GenerateGlobalRandomBytes(bp, j); -+ if (rv == SECSuccess) { -+ for (i = 0; i < padLen; ) { -+ unsigned char repl; -+ /* Pad with non-zero random data. */ -+ if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) { -+ ++i; -+ continue; -+ } -+ if (j <= padLen) { -+ rv = RNG_GenerateGlobalRandomBytes(bp + padLen, -+ modulusLen - (2 + padLen)); -+ if (rv != SECSuccess) -+ break; -+ j = modulusLen - 2; -+ } -+ do { -+ repl = bp[--j]; -+ } while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen); -+ if (repl != RSA_BLOCK_AFTER_PAD_OCTET) { -+ bp[i++] = repl; -+ } -+ } -+ } -+ if (rv != SECSuccess) { -+ /*sftk_fatalError = PR_TRUE;*/ -+ nss_ZFreeIf (block); -+ return NULL; -+ } -+ bp += padLen; -+ *bp++ = RSA_BLOCK_AFTER_PAD_OCTET; -+ nsslibc_memcpy(bp, data->data, data->len); -+ break; - - default: - PORT_Assert(0); -@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen, - - break; - -- case RSA_BlockOAEP: -- /* -- * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2]) -- * -- * The "2" below is the first octet + the second octet. -- * (The other fields do not contain the clear values, but are -- * the same length as the clear values.) -- */ -- PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN -- + OAEP_PAD_LEN))); -- -- result->data = rsa_FormatOneBlock(modulusLen, blockType, data); -- if (result->data == NULL) { -- result->len = 0; -- return SECFailure; -- } -- result->len = modulusLen; -- -- break; -- - case RSA_BlockRaw: - /* - * Pad || ActualData --- -1.7.1 - From 09fc99710762c5b32b89acd63334263cda83cae3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 16:36:36 +0200 Subject: [PATCH 118/332] subversion: Update to 1.7.11 CVE-2013-4131 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index c5a74042590..95b244e7d91 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.10"; + version = "1.7.11"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5"; + sha1 = "d82e187803043b74c072cd5a861ac02e4a027684"; }; buildInputs = [ zlib apr aprutil sqlite ] From 288811f5e147f9c4da9028ed49e9542c9f96174b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 16:59:11 +0200 Subject: [PATCH 119/332] firefox: Update to 23.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 912a193eec9..b780152905d 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null; let optional = stdenv.lib.optional; in rec { - firefoxVersion = "22.0"; + firefoxVersion = "23.0"; - xulVersion = "22.0"; # this attribute is used by other packages + xulVersion = "23.0"; # this attribute is used by other packages src = fetchurl { @@ -31,7 +31,7 @@ in 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 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80"; + sha1 = "31936d2ddb727640c96a3ae697bf145c42a2a20e"; }; commonConfigureFlags = From e7e4551baad3bc3877a04258cdefc2c021a1201b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 17:02:00 +0200 Subject: [PATCH 120/332] flashplayer: Update to 11.2.202.297 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 10faa983cc1..0363176257f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,9 +44,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.273"; + version = "11.2.202.297"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "0c15nszgg7zsv00n2qxha5zf8hmyf8i6byvhalnh5x46mr0rkbv9"; + sha256 = "0jfigq56p6zp61pmc4jl12p8gv2jhfmim18j1b30iikw3iv26lh8"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +55,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.273"; + version = "11.2.202.297"; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1gb14xv7gbq57qg1hxmrnryaw6xgmkg54ql5hr7q6szplj65wvmd"; + sha256 = "0mpj25b2ar7gccqmw5lffdzlr3yyfalphpgwnl18s05wy1fx484y"; } else throw "Flash Player is not supported on this platform"; From a9b4851b7476e92acb82b22c5bb57f03e672db41 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 7 Aug 2013 22:12:44 +0200 Subject: [PATCH 121/332] The android utility's GUI should work and wrapper scripts in bin/ are replaced by symlinks --- .../mobile/androidenv/androidsdk.nix | 26 +++++++++---------- .../development/mobile/androidenv/default.nix | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 11e6b0c45a2..d6c751049d4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -2,8 +2,8 @@ , platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa, alsaLib -, freetype, fontconfig, gtk, atk, file +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib +, freetype, fontconfig, glib, gtk, atk, file }: {platformVersions, abiVersions, useGoogleAPIs}: @@ -56,7 +56,15 @@ stdenv.mkDerivation { patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i done - # The emulators need additional libraries, which are not in the RPATH => let's wrap them + # The android script has a hardcoded reference to /bin/ls that must be patched + sed -i -e "s|/bin/ls|ls|" android + + # The android script used SWT and wants to dynamically load some GTK+ stuff. + # The following wrapper ensures that they can be found: + wrapProgram `pwd`/android \ + --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + + # The emulators need additional libraries, which are dynamically loaded => let's wrap them for i in emulator emulator-arm emulator-mips emulator-x86 do @@ -174,11 +182,7 @@ stdenv.mkDerivation { do if [ ! -d $i ] && [ -x $i ] then - ( echo '#! ${stdenv.shell} -e' - echo "cd $out/libexec/android-sdk-*/tools" - echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i) - - chmod +x $out/bin/$(basename $i) + ln -sf $i $out/bin/$(basename $i) fi done @@ -186,11 +190,7 @@ stdenv.mkDerivation { do if [ ! -d $i ] && [ -x $i ] then - ( echo '#! ${stdenv.shell} -e' - echo "cd $out/libexec/android-sdk-*/platform-tools" - echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i) - - chmod +x $out/bin/$(basename $i) + ln -sf $i $out/bin/$(basename $i) fi done ''; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 9fec70da940..e12f9096994 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,8 +36,8 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk mesa file alsaLib; - inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; + inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib; + inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst; inherit platformTools buildTools support platforms sysimages addons; From 4c77c6e2323dec41cab49e2a9662e9bd748c423b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Aug 2013 22:41:51 +0200 Subject: [PATCH 122/332] makeModulesClosure: Use kmod instead of module-init-tools --- pkgs/build-support/kernel/modules-closure.nix | 4 ++-- pkgs/build-support/kernel/modules-closure.sh | 12 ++++-------- pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index cc197edbef1..cad0c7a21f9 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -4,12 +4,12 @@ # Also generate an appropriate modules.dep. { stdenv, kernel, nukeReferences, rootModules -, module_init_tools, allowMissing ? false }: +, kmod, allowMissing ? false }: stdenv.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; buildInputs = [nukeReferences]; - inherit kernel rootModules module_init_tools allowMissing; + inherit kernel rootModules kmod allowMissing; allowedReferences = ["out"]; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index aa2615eb578..d0ac88f6924 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -2,24 +2,20 @@ source $stdenv/setup set -o pipefail -PATH=$module_init_tools/sbin:$PATH +PATH=$kmod/sbin:$PATH version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" -export MODULE_DIR=$(readlink -f $kernel/lib/modules/) - # Determine the dependencies of each root module. closure= for module in $rootModules; do echo "root module: $module" - deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \ + deps=$(modprobe --config no-config -d $kernel --set-version "$version" --show-depends "$module" \ | sed 's/^insmod //') \ || if test -z "$allowMissing"; then exit 1; fi - #for i in $deps; do echo $i; done - if [[ "$deps" != builtin* ]] - then + if [[ "$deps" != builtin* ]]; then closure="$closure $deps" fi done @@ -41,4 +37,4 @@ for module in $closure; do echo $target >> $out/insmod-list done -MODULE_DIR=$out/lib/modules/ depmod -a $version +depmod -b $out -a $version diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2565ef2d87d..8b36b2f1595 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -348,10 +348,9 @@ let makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; - makeModulesClosure = {kernel, rootModules, allowMissing ? false}: + makeModulesClosure = { kernel, rootModules, allowMissing ? false }: import ../build-support/kernel/modules-closure.nix { - inherit stdenv module_init_tools kernel nukeReferences - rootModules allowMissing; + inherit stdenv kmod kernel nukeReferences rootModules allowMissing; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; From 9040af06e3fdd6dd8a4d3833ff8b04e6752b4060 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Aug 2013 10:36:38 +0200 Subject: [PATCH 123/332] nixpart: Add an alias called nixpart0. The reason behind this is to avoid breaking NixOps while releasing version 1.0 of nixpart. We could also use nixpart and nixpart1, but the goal is to have nixpart as a generic part of NixOS instead of being only used specifically for the Hetzner backend of NixOps. Which essentially means: The partition syntax will change to be based on attribute sets and we no longer need to use Kickstart syntax. And that's the main reason why it will break in version 1.0. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53128c6bb2a..3dd07824c15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -68,6 +68,10 @@ pythonPackages = modules // rec { nixpart = callPackage ../tools/filesystems/nixpart { }; + # This is used for NixOps to make sure we won't break it with the next major + # version of nixpart. + nixpart0 = nixpart; + pil = import ../development/python-modules/pil { inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; inherit python buildPythonPackage; From a1b384783e3d20689a0328fce4f7ae69a35b1090 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 8 Aug 2013 03:14:00 +0200 Subject: [PATCH 124/332] chromium: Fix build for version 28 and NSS 3.15. Build failure details: http://hydra.nixos.org/build/5663358 Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8188d5279a7..d2c48bc5c7c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -135,6 +135,9 @@ in stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") '' + sed -i -e '/struct SECItemArray/,/^};/d' \ + net/third_party/nss/ssl/bodge/secitem_array.c ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { From bccba58c3263248ef2d2289fb102c8d492fecaa6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 7 Aug 2013 12:32:59 +0200 Subject: [PATCH 125/332] chromium: Update beta channel to v29.0.1547.41. Builds fine on my machine and tested with a bunch of web sites. 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 c2a5518c6ca..d99d131def4 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,9 +6,9 @@ sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r"; }; beta = { - version = "29.0.1547.32"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz"; - sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w"; + version = "29.0.1547.41"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.41.tar.xz"; + sha256 = "0xb2y7n3qyakg08606zdaw6wf60ypx9p61g56sqhxamgd5byfsg1"; }; stable = { version = "28.0.1500.95"; From 0e91a58bbe54970eb1b825deaa9de99103405c30 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 8 Aug 2013 10:40:09 +0200 Subject: [PATCH 126/332] The android GUI does not work if Oracle's JDK is installed. This patch forces it to use OpenJDK --- pkgs/development/mobile/androidenv/androidsdk.nix | 3 ++- pkgs/development/mobile/androidenv/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index d6c751049d4..38377cf8bbb 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -3,7 +3,7 @@ , zlib_32bit , libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file +, freetype, fontconfig, glib, gtk, atk, file, jdk }: {platformVersions, abiVersions, useGoogleAPIs}: @@ -62,6 +62,7 @@ stdenv.mkDerivation { # The android script used SWT and wants to dynamically load some GTK+ stuff. # The following wrapper ensures that they can be found: wrapProgram `pwd`/android \ + --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib # The emulators need additional libraries, which are dynamically loaded => let's wrap them diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index e12f9096994..3339a065e2a 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -36,7 +36,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib; + inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst; inherit platformTools buildTools support platforms sysimages addons; From 6ad9ad616094132de978cccd79fa9163f5f93ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 8 Aug 2013 16:49:26 +0200 Subject: [PATCH 127/332] pgadmin: 1.10.0 -> 1.16.1, add to channel --- pkgs/applications/misc/pgadmin/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 6d4fa97c8cb..aac15789a2d 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,18 +1,25 @@ { stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }: stdenv.mkDerivation rec { - name = "pgadmin3-1.10.0"; + name = "pgadmin3-${version}"; + version = "1.16.1"; src = fetchurl { - url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz"; - sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16"; + url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; + sha256 = "13n2nyjnbmjbz9n0xp6627n3pavkqfp4n45l1mnqxhjdq8yj9fnl"; }; buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; - meta = { + preConfigure = '' + substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" + ''; + + meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; homepage = http://www.pgadmin.org; - license = "GPL2"; + license = licenses.gpl2; + maintainers = [ maintainers.iElectric ]; + platforms = platforms.unix; }; } From 4be1055c40d77a87ebc052b1670c3f15772e5a16 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 9 Aug 2013 13:37:27 +0200 Subject: [PATCH 128/332] Upgraded nodejs packages --- pkgs/top-level/node-packages-generated.nix | 444 +++++++++++---------- 1 file changed, 226 insertions(+), 218 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 3751aa6c4d3..bab2d932a12 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -47,24 +47,24 @@ { name = "amdefine"; spec = "*"; - version = "0.0.5"; + version = "0.0.8"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db"; - tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz"; + sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0"; + tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz"; } { name = "amdefine"; spec = ">=0.0.4"; - version = "0.0.5"; + version = "0.0.8"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db"; - tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz"; + sha1 = "34dc8c981e6acb3be1853bef8f0ec94a39d55ba0"; + tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.8.tgz"; } { name = "ansi"; @@ -447,7 +447,7 @@ { name = "browserchannel"; spec = "*"; - version = "1.0.4"; + version = "1.0.5"; topLevel = true; dependencies = [ { name = "hat"; spec = "*"; } @@ -455,8 +455,8 @@ { name = "request"; spec = "~2"; } ]; patchLatest = false; - sha1 = "077c1d59d7872d84932172d373c5f8f45698e975"; - tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz"; + sha1 = "e36bc8536cf5a16873087867622cb5028ba33957"; + tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.5.tgz"; } { name = "bson"; @@ -471,14 +471,14 @@ } { name = "bson"; - spec = "0.1.9"; - version = "0.1.9"; + spec = "0.2.2"; + version = "0.2.2"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14"; - tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz"; + sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60"; + tarball = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz"; } { name = "buffer-crc32"; @@ -653,14 +653,14 @@ { name = "cli"; spec = "0.4.x"; - version = "0.4.4"; + version = "0.4.5"; topLevel = false; dependencies = [ { name = "glob"; spec = ">= 3.1.4"; } ]; patchLatest = false; - sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43"; - tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz"; + sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61"; + tarball = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz"; } { name = "cliff"; @@ -1109,14 +1109,26 @@ { name = "couch-login"; spec = "~0.1.15"; - version = "0.1.17"; + version = "0.1.18"; topLevel = false; dependencies = [ - { name = "request"; spec = "2 >=2.14"; } + { name = "request"; spec = "2 >=2.25.0"; } ]; patchLatest = false; - sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed"; - tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz"; + sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056"; + tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz"; + } + { + name = "couch-login"; + spec = "~0.1.18"; + version = "0.1.18"; + topLevel = false; + dependencies = [ + { name = "request"; spec = "2 >=2.25.0"; } + ]; + patchLatest = false; + sha1 = "a69fa40dd43d1f98d97e560f18187a578a116056"; + tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.18.tgz"; } { name = "cryptiles"; @@ -1232,6 +1244,17 @@ sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; } + { + name = "debug"; + spec = "0.7.0"; + version = "0.7.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; + tarball = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; + } { name = "debug"; spec = "~0.7.0"; @@ -1757,20 +1780,6 @@ sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684"; tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz"; } - { - name = "form-data"; - spec = "0.0.8"; - version = "0.0.8"; - topLevel = false; - dependencies = [ - { name = "combined-stream"; spec = "~0.0.4"; } - { name = "mime"; spec = "~1.2.2"; } - { name = "async"; spec = "~0.2.7"; } - ]; - patchLatest = false; - sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; - tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; - } { name = "form-data"; spec = "~0.0.3"; @@ -2019,7 +2028,7 @@ } { name = "glob"; - spec = "~3.2.3"; + spec = "~3.2.6"; version = "3.2.6"; topLevel = false; dependencies = [ @@ -2161,21 +2170,6 @@ sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; tarball = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; } - { - name = "hawk"; - spec = "~0.13.0"; - version = "0.13.1"; - topLevel = false; - dependencies = [ - { name = "hoek"; spec = "0.8.x"; } - { name = "boom"; spec = "0.4.x"; } - { name = "cryptiles"; spec = "0.2.x"; } - { name = "sntp"; spec = "0.2.x"; } - ]; - patchLatest = false; - sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; - tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; - } { name = "hawk"; spec = "~1.0.0"; @@ -2214,17 +2208,6 @@ sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; tarball = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; } - { - name = "hoek"; - spec = "0.8.x"; - version = "0.8.5"; - topLevel = false; - dependencies = [ - ]; - patchLatest = false; - sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; - tarball = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; - } { name = "hoek"; spec = "0.9.x"; @@ -2313,20 +2296,6 @@ sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; } - { - name = "http-signature"; - spec = "~0.9.11"; - version = "0.9.11"; - topLevel = false; - dependencies = [ - { name = "assert-plus"; spec = "0.1.2"; } - { name = "asn1"; spec = "0.1.11"; } - { name = "ctype"; spec = "0.5.2"; } - ]; - patchLatest = false; - sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; - tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; - } { name = "i"; spec = "0.3.x"; @@ -2462,8 +2431,8 @@ } { name = "init-package-json"; - spec = "0.0.10"; - version = "0.0.10"; + spec = "0.0.11"; + version = "0.0.11"; topLevel = false; dependencies = [ { name = "promzard"; spec = "~0.2.0"; } @@ -2472,22 +2441,34 @@ { name = "semver"; spec = "2.x"; } ]; patchLatest = false; - sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; - tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; + sha1 = "71914631d091bb1f73a4bddbe6d7985e929859ce"; + tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.11.tgz"; } { name = "ironhorse"; spec = "*"; - version = "0.0.5"; + version = "0.0.6"; topLevel = true; dependencies = [ { name = "winston"; spec = "*"; } { name = "nconf"; spec = "*"; } { name = "fs-walk"; spec = "*"; } + { name = "async"; spec = "*"; } + { name = "express"; spec = "*"; } + { name = "jade"; spec = "*"; } + { name = "passport"; spec = "*"; } + { name = "passport-http"; spec = "*"; } + { name = "libyaml"; spec = "*"; } + { name = "mongoose"; spec = "*"; } + { name = "gridfs-stream"; spec = "*"; } + { name = "temp"; spec = "*"; } + { name = "kue"; spec = "*"; } + { name = "redis"; spec = "*"; } + { name = "hiredis"; spec = "*"; } ]; patchLatest = false; - sha1 = "d7b15b73e7da814b272e580243cc2239e7b021e6"; - tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.5.tgz"; + sha1 = "de774f72022630a258158acdcb590e1542a09b58"; + tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.6.tgz"; } { name = "is-promise"; @@ -2588,7 +2569,7 @@ { name = "jshint"; spec = "*"; - version = "2.1.7"; + version = "2.1.9"; topLevel = true; dependencies = [ { name = "shelljs"; spec = "0.1.x"; } @@ -2598,8 +2579,8 @@ { name = "console-browserify"; spec = "0.1.x"; } ]; patchLatest = false; - sha1 = "11f4214333a0cd2df88057b88c4d751d0c0658a0"; - tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.7.tgz"; + sha1 = "65cdbb2302cbf27e45db0066669b5d5e74f66465"; + tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.9.tgz"; } { name = "json-schema"; @@ -2623,17 +2604,6 @@ sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; } - { - name = "json-stringify-safe"; - spec = "~4.0.0"; - version = "4.0.0"; - topLevel = false; - dependencies = [ - ]; - patchLatest = false; - sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; - tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; - } { name = "json-stringify-safe"; spec = "~5.0.0"; @@ -2642,7 +2612,7 @@ dependencies = [ ]; patchLatest = false; - sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; } { @@ -2706,7 +2676,7 @@ { name = "knox"; spec = "*"; - version = "0.8.5"; + version = "0.8.6"; topLevel = true; dependencies = [ { name = "mime"; spec = "*"; } @@ -2715,8 +2685,8 @@ { name = "stream-counter"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "86f227fcd22db2b7699106b9b6e5ce29fcbf78de"; - tarball = "http://registry.npmjs.org/knox/-/knox-0.8.5.tgz"; + sha1 = "244e7c643c4c9ea2eb37e215dd02b07c8e138e3a"; + tarball = "http://registry.npmjs.org/knox/-/knox-0.8.6.tgz"; } { name = "kue"; @@ -3204,35 +3174,36 @@ } { name = "mongodb"; - spec = "1.3.11"; - version = "1.3.11"; + spec = "1.3.15"; + version = "1.3.15"; topLevel = false; dependencies = [ - { name = "bson"; spec = "0.1.9"; } + { name = "bson"; spec = "0.2.2"; } { name = "kerberos"; spec = "0.0.3"; } ]; patchLatest = false; - sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2"; - tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz"; + sha1 = "d612597344b6a1b6d07375698fd7ee06cbaea009"; + tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.15.tgz"; } { name = "mongoose"; spec = "*"; - version = "3.6.15"; + version = "3.7.0"; topLevel = true; dependencies = [ { name = "hooks"; spec = "0.2.1"; } - { name = "mongodb"; spec = "1.3.11"; } + { name = "mongodb"; spec = "1.3.15"; } { name = "ms"; spec = "0.1.0"; } - { name = "sliced"; spec = "0.0.3"; } + { name = "sliced"; spec = "0.0.5"; } { name = "muri"; spec = "0.3.1"; } - { name = "mpromise"; spec = "0.2.1"; } + { name = "mpromise"; spec = "0.3.0"; } { name = "mpath"; spec = "0.1.1"; } { name = "regexp-clone"; spec = "0.0.1"; } + { name = "mquery"; spec = "0.2.4"; } ]; patchLatest = false; - sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1"; - tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz"; + sha1 = "ffad3ac81293bffe5b02f886592685675c7a0d99"; + tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.7.0.tgz"; } { name = "mongoose"; @@ -3310,6 +3281,32 @@ sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; } + { + name = "mpromise"; + spec = "0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + { name = "sliced"; spec = "0.0.5"; } + ]; + patchLatest = false; + sha1 = "cb864c2f642eb2192765087e3692e1dc152afe4b"; + tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.3.0.tgz"; + } + { + name = "mquery"; + spec = "0.2.4"; + version = "0.2.4"; + topLevel = false; + dependencies = [ + { name = "sliced"; spec = "0.0.5"; } + { name = "debug"; spec = "0.7.0"; } + { name = "regexp-clone"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "5d6e7f7f5129aa334e7e754d3f6a93cf304b7778"; + tarball = "http://registry.npmjs.org/mquery/-/mquery-0.2.4.tgz"; + } { name = "ms"; spec = "0.1.0"; @@ -3492,7 +3489,7 @@ { name = "node-gyp"; spec = "*"; - version = "0.10.6"; + version = "0.10.9"; topLevel = true; dependencies = [ { name = "glob"; spec = "3"; } @@ -3505,18 +3502,18 @@ { name = "osenv"; spec = "0"; } { name = "request"; spec = "2"; } { name = "rimraf"; spec = "2"; } - { name = "semver"; spec = "~2.0.7"; } + { name = "semver"; spec = "~2.1"; } { name = "tar"; spec = "0"; } { name = "which"; spec = "1"; } ]; patchLatest = false; - sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427"; - tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz"; + sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; } { name = "node-gyp"; - spec = "~0.10.6"; - version = "0.10.6"; + spec = "~0.10.9"; + version = "0.10.9"; topLevel = false; dependencies = [ { name = "glob"; spec = "3"; } @@ -3529,13 +3526,13 @@ { name = "osenv"; spec = "0"; } { name = "request"; spec = "2"; } { name = "rimraf"; spec = "2"; } - { name = "semver"; spec = "~2.0.7"; } + { name = "semver"; spec = "~2.1"; } { name = "tar"; spec = "0"; } { name = "which"; spec = "1"; } ]; patchLatest = false; - sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427"; - tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz"; + sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; } { name = "node-uptime"; @@ -3634,13 +3631,13 @@ { name = "nodemon"; spec = "*"; - version = "0.7.8"; + version = "0.7.10"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590"; - tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz"; + sha1 = "695a01b9458b115b03bbe01696d361bd50b4fb9b"; + tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.10.tgz"; } { name = "nodeunit"; @@ -3718,10 +3715,10 @@ { name = "npm"; spec = "*"; - version = "1.3.6"; + version = "1.3.7"; topLevel = true; dependencies = [ - { name = "semver"; spec = "~2.0.8"; } + { name = "semver"; spec = "~2.1.0"; } { name = "ini"; spec = "~1.1.0"; } { name = "slide"; spec = "~1.1.4"; } { name = "abbrev"; spec = "~1.0.4"; } @@ -3729,7 +3726,7 @@ { name = "minimatch"; spec = "~0.2.12"; } { name = "nopt"; spec = "~2.1.2"; } { name = "rimraf"; spec = "~2.2.0"; } - { name = "request"; spec = "~2.21.0"; } + { name = "request"; spec = "~2.25.0"; } { name = "which"; spec = "1"; } { name = "tar"; spec = "~0.1.18"; } { name = "fstream"; spec = "~0.1.23"; } @@ -3737,18 +3734,18 @@ { name = "mkdirp"; spec = "~0.3.3"; } { name = "read"; spec = "~1.0.4"; } { name = "lru-cache"; spec = "~2.3.0"; } - { name = "node-gyp"; spec = "~0.10.6"; } + { name = "node-gyp"; spec = "~0.10.9"; } { name = "fstream-npm"; spec = "~0.1.3"; } { name = "uid-number"; spec = "0"; } { name = "archy"; spec = "0"; } { name = "chownr"; spec = "0"; } { name = "npmlog"; spec = "0.0.4"; } { name = "ansi"; spec = "~0.1.2"; } - { name = "npm-registry-client"; spec = "~0.2.27"; } + { name = "npm-registry-client"; spec = "~0.2.28"; } { name = "read-package-json"; spec = "~1.1.0"; } { name = "read-installed"; spec = "~0.2.2"; } - { name = "glob"; spec = "~3.2.3"; } - { name = "init-package-json"; spec = "0.0.10"; } + { name = "glob"; spec = "~3.2.6"; } + { name = "init-package-json"; spec = "0.0.11"; } { name = "osenv"; spec = "0"; } { name = "lockfile"; spec = "~0.4.0"; } { name = "retry"; spec = "~0.6.0"; } @@ -3763,8 +3760,8 @@ { name = "npm-user-validate"; spec = "0.0.3"; } ]; patchLatest = false; - sha1 = "7c317871955f8427529c78e9b1ec21239dcd222a"; - tarball = "http://registry.npmjs.org/npm/-/npm-1.3.6.tgz"; + sha1 = "689bb2093521369ce80ec229fcbbefc32c4bc668"; + tarball = "http://registry.npmjs.org/npm/-/npm-1.3.7.tgz"; } { name = "npm-registry-client"; @@ -3789,24 +3786,24 @@ } { name = "npm-registry-client"; - spec = "~0.2.27"; - version = "0.2.27"; + spec = "~0.2.28"; + version = "0.2.28"; topLevel = false; dependencies = [ - { name = "request"; spec = "2 >=2.20.0"; } + { name = "request"; spec = "2 >=2.25.0"; } { name = "graceful-fs"; spec = "~2.0.0"; } - { name = "semver"; spec = "~2.0.5"; } + { name = "semver"; spec = "~2.1.0"; } { name = "slide"; spec = "~1.1.3"; } { name = "chownr"; spec = "0"; } { name = "mkdirp"; spec = "~0.3.3"; } { name = "rimraf"; spec = "~2"; } { name = "retry"; spec = "0.6.0"; } - { name = "couch-login"; spec = "~0.1.15"; } + { name = "couch-login"; spec = "~0.1.18"; } { name = "npmlog"; spec = ""; } ]; patchLatest = false; - sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; - tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + sha1 = "959141fc0180d7b1ad089e87015a8a2142a8bffc"; + tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.28.tgz"; } { name = "npm-user-validate"; @@ -4543,24 +4540,24 @@ { name = "readable-stream"; spec = "1.0"; - version = "1.0.2"; + version = "1.0.15"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; - tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + sha1 = "a2c160237235951da985a1572d0a3af585e4be95"; + tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz"; } { name = "readable-stream"; spec = "~1.0.2"; - version = "1.0.2"; + version = "1.0.15"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; - tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + sha1 = "a2c160237235951da985a1572d0a3af585e4be95"; + tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.15.tgz"; } { name = "readdirp"; @@ -4646,7 +4643,7 @@ { name = "request"; spec = "2"; - version = "2.25.0"; + version = "2.26.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4663,36 +4660,13 @@ { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; - tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; - } - { - name = "request"; - spec = "2 >=2.14"; - version = "2.25.0"; - topLevel = false; - dependencies = [ - { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~5.0.0"; } - { name = "forever-agent"; spec = "~0.5.0"; } - { name = "tunnel-agent"; spec = "~0.3.0"; } - { name = "http-signature"; spec = "~0.10.0"; } - { name = "hawk"; spec = "~1.0.0"; } - { name = "aws-sign"; spec = "~0.3.0"; } - { name = "oauth-sign"; spec = "~0.3.0"; } - { name = "cookie-jar"; spec = "~0.3.0"; } - { name = "node-uuid"; spec = "~1.4.0"; } - { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "~0.1.0"; } - ]; - patchLatest = false; - sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; - tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; + sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212"; + tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz"; } { name = "request"; spec = "2 >=2.20.0"; - version = "2.25.0"; + version = "2.26.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4709,8 +4683,31 @@ { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; - tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; + sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212"; + tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz"; + } + { + name = "request"; + spec = "2 >=2.25.0"; + version = "2.26.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~1.0.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "~0.1.0"; } + ]; + patchLatest = false; + sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212"; + tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz"; } { name = "request"; @@ -4748,6 +4745,29 @@ { name = "request"; spec = "~2"; + version = "2.26.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~1.0.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "~0.1.0"; } + ]; + patchLatest = false; + sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212"; + tarball = "http://registry.npmjs.org/request/-/request-2.26.0.tgz"; + } + { + name = "request"; + spec = "~2.25.0"; version = "2.25.0"; topLevel = false; dependencies = [ @@ -4768,29 +4788,6 @@ sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; } - { - name = "request"; - spec = "~2.21.0"; - version = "2.21.0"; - topLevel = false; - dependencies = [ - { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~4.0.0"; } - { name = "forever-agent"; spec = "~0.5.0"; } - { name = "tunnel-agent"; spec = "~0.3.0"; } - { name = "http-signature"; spec = "~0.9.11"; } - { name = "hawk"; spec = "~0.13.0"; } - { name = "aws-sign"; spec = "~0.3.0"; } - { name = "oauth-sign"; spec = "~0.3.0"; } - { name = "cookie-jar"; spec = "~0.3.0"; } - { name = "node-uuid"; spec = "~1.4.0"; } - { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "0.0.8"; } - ]; - patchLatest = false; - sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; - tarball = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; - } { name = "restify"; spec = "2.4.1"; @@ -4979,7 +4976,7 @@ dependencies = [ ]; patchLatest = false; - sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { @@ -5012,7 +5009,7 @@ dependencies = [ ]; patchLatest = false; - sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { @@ -5023,7 +5020,7 @@ dependencies = [ ]; patchLatest = false; - sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { @@ -5034,7 +5031,7 @@ dependencies = [ ]; patchLatest = false; - sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { @@ -5050,25 +5047,25 @@ } { name = "semver"; - spec = "~2.0.7"; - version = "2.0.11"; + spec = "~2.1"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; - spec = "~2.0.8"; - version = "2.0.11"; + spec = "~2.1.0"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "356294a90690b698774d62cf35d7c91f983e728a"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "send"; @@ -5175,15 +5172,15 @@ { name = "simplesmtp"; spec = ">= 0.1.22"; - version = "0.3.5"; + version = "0.3.6"; topLevel = false; dependencies = [ { name = "rai"; spec = "~0.1"; } { name = "xoauth2"; spec = "~0.1"; } ]; patchLatest = false; - sha1 = "3f8d43e7885c926037ab3aa5026b563543a67e5b"; - tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.5.tgz"; + sha1 = "a6921eb3d38f31f2abd442d0d612ec2d8a1ed08d"; + tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.6.tgz"; } { name = "sliced"; @@ -5207,6 +5204,17 @@ sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; } + { + name = "sliced"; + spec = "0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f"; + tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"; + } { name = "slide"; spec = "*"; @@ -5427,7 +5435,7 @@ { name = "stylus"; spec = "*"; - version = "0.35.1"; + version = "0.36.1"; topLevel = true; dependencies = [ { name = "cssom"; spec = "0.2.x"; } @@ -5436,8 +5444,8 @@ { name = "sax"; spec = "0.5.x"; } ]; patchLatest = false; - sha1 = "ed4f4cf378c2f883b04633f01e5c76ffe976084f"; - tarball = "http://registry.npmjs.org/stylus/-/stylus-0.35.1.tgz"; + sha1 = "64e493933eb5f7347e941b37046f5ba533d3d262"; + tarball = "http://registry.npmjs.org/stylus/-/stylus-0.36.1.tgz"; } { name = "stylus"; @@ -5621,13 +5629,13 @@ { name = "timezone"; spec = "*"; - version = "0.0.22"; + version = "0.0.23"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "933c3d1950224957a349183e124147dd99e182f5"; - tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz"; + sha1 = "5e89359e0c01c92b495c725e81ecce6ddbdb9bac"; + tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.23.tgz"; } { name = "tinycolor"; From e32b26c222f05b1d28f38ba3057973a5454e2df2 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 7 Aug 2013 15:38:51 +0200 Subject: [PATCH 129/332] Add erlang R16B1 Signed-off-by: Moritz Ulrich --- .../interpreters/erlang/R16B01.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/erlang/R16B01.nix diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/R16B01.nix new file mode 100644 index 00000000000..7f41a225859 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R16B01.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 = "16B01"; in + +stdenv.mkDerivation { + name = "erlang-" + version; + + src = fetchurl { + url = "http://www.erlang.org/download/otp_src_R16B01.tar.gz"; + sha256 = "1h5b2mil79z307mc7ammi38qnd8f50n3sv5vyl4d1gcfgg08nf6s"; + }; + + 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 8b36b2f1595..4b7162866e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3032,7 +3032,8 @@ let erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { }; - erlang = erlangR15B03; + erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { }; + erlang = erlangR16B01; groovy = callPackage ../development/interpreters/groovy { }; From ceb96b73124ddd996066525c5133b4ceb60e4fa0 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 7 Aug 2013 16:06:11 +0200 Subject: [PATCH 130/332] Package elixir and rebar. Signed-off-by: Moritz Ulrich --- .../interpreters/elixir/default.nix | 20 +++++++++++++++++++ .../tools/build-managers/rebar/default.nix | 18 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/development/interpreters/elixir/default.nix create mode 100644 pkgs/development/tools/build-managers/rebar/default.nix diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix new file mode 100644 index 00000000000..a368e99ff38 --- /dev/null +++ b/pkgs/development/interpreters/elixir/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, erlang, rebar }: + +stdenv.mkDerivation { + name = "elixir-0.10.1"; + + src = fetchurl { + url = "https://github.com/elixir-lang/elixir/archive/v0.10.1.tar.gz"; + sha256 = "0gfr2bz3mw7ag9z2wb2g22n2vlyrp8dwy78fj9zi52kzl5w3vc3w"; + }; + + buildInputs = [ erlang rebar ]; + + preBuild = '' + substituteInPlace rebar \ + --replace "/usr/bin/env escript" ${erlang}/bin/escript + substituteInPlace Makefile \ + --replace '$(shell echo `pwd`/rebar)' ${rebar}/bin/rebar \ + --replace "/usr/local" $out + ''; +} diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix new file mode 100644 index 00000000000..9f9e73a03d8 --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, erlang }: + +stdenv.mkDerivation { + name = "rebar-2.1.0-pre"; + + src = fetchurl { + url = "https://github.com/basho/rebar/archive/2.1.0-pre.tar.gz"; + sha256 = "0dsbk9ssvk1hx9275900dg4bz79kpwcid4gsz09ziiwzv0jjbrjn"; + }; + + buildInputs = [ erlang ]; + + buildPhase = "escript bootstrap"; + installPhase = '' + mkdir -p $out/bin + cp rebar $out/bin/rebar + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b7162866e7..530b49f35a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3035,6 +3035,10 @@ let erlangR16B01 = callPackage ../development/interpreters/erlang/R16B01.nix { }; erlang = erlangR16B01; + rebar = callPackage ../development/tools/build-managers/rebar { }; + + elixir = callPackage ../development/interpreters/elixir { }; + groovy = callPackage ../development/interpreters/groovy { }; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; From dbfcdc9066df81257097985ec7eff318dc6c803f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 7 Aug 2013 16:09:08 +0200 Subject: [PATCH 131/332] Add meta for elixir & rebar. Signed-off-by: Moritz Ulrich --- .../development/interpreters/elixir/default.nix | 15 +++++++++++++++ .../tools/build-managers/rebar/default.nix | 17 +++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index a368e99ff38..760182406d5 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -17,4 +17,19 @@ stdenv.mkDerivation { --replace '$(shell echo `pwd`/rebar)' ${rebar}/bin/rebar \ --replace "/usr/local" $out ''; + + meta = { + homepage = "http://elixir-lang.org/"; + description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM."; + + longDescription = '' + Elixir is a functional, meta-programming + aware language built on top of the Erlang VM. It is a dynamic + language with flexible syntax and macro support that leverages + Erlang's abilities to build concurrent, distributed and + fault-tolerant applications with hot code upgrades.p + ''; + + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 9f9e73a03d8..bb230304496 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -15,4 +15,21 @@ stdenv.mkDerivation { mkdir -p $out/bin cp rebar $out/bin/rebar ''; + + meta = { + homepage = "https://github.com/rebar/rebar"; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases."; + + longDescription = '' + rebar is a self-contained Erlang script, so it's easy to + distribute or even embed directly in a project. Where possible, + rebar uses standard Erlang/OTP conventions for project + structures, thus minimizing the amount of build configuration + work. rebar also provides dependency management, enabling + application writers to easily re-use common libraries from a + variety of locations (git, hg, etc). + ''; + + platforms = stdenv.lib.platforms.linux; + }; } From 31083cd226cb4663983858fc773d67ef30637372 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 9 Aug 2013 16:31:13 +0200 Subject: [PATCH 132/332] Add myself as a maintainer to erlang R16B1 and elixir. Signed-off-by: Moritz Ulrich --- pkgs/development/interpreters/elixir/default.nix | 2 ++ pkgs/development/interpreters/erlang/R16B01.nix | 4 +++- pkgs/development/tools/build-managers/rebar/default.nix | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 760182406d5..ffa4402a72a 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -31,5 +31,7 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; + + maintainers = [ stdenv.lib.maintainers.the-kenny ]; }; } diff --git a/pkgs/development/interpreters/erlang/R16B01.nix b/pkgs/development/interpreters/erlang/R16B01.nix index 7f41a225859..902af75d494 100644 --- a/pkgs/development/interpreters/erlang/R16B01.nix +++ b/pkgs/development/interpreters/erlang/R16B01.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + # Note: Maintainer of prev. erlang version was simons. If he wants + # to continue maintaining erlang I'm totally ok with that. + maintainers = [ stdenv.lib.maintainers.the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index bb230304496..68eacf8d2ea 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.the-kenny ]; }; } From 02707296e88a1548155d34a2ff240dfe15f804d7 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 9 Aug 2013 17:30:10 +0200 Subject: [PATCH 133/332] Update leiningen to 2.3.0. Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it. Signed-off-by: Moritz Ulrich --- .../tools/build-managers/leiningen/builder.sh | 4 ---- .../tools/build-managers/leiningen/default.nix | 14 +++++++------- .../{lein_2.1.2.patch => lein_2.3.0.patch} | 0 3 files changed, 7 insertions(+), 11 deletions(-) rename pkgs/development/tools/build-managers/leiningen/{lein_2.1.2.patch => lein_2.3.0.patch} (100%) diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index c4b7002a718..f5489a4a76f 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -21,7 +21,3 @@ chmod -v 755 $out_bin patchShebangs $out wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin - -echo "Testing out \"lein version\"..." -$out_bin version -echo "Success." diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index bf1a275046e..d7f819c45f6 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }: +{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }: stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.1.2"; + version = "2.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy"; + sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb"; }; jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa"; + sha256 = "1higd309b43lly7fv1pd5lfd3lyrij95nrzklqmk8vf9llw6974p"; }; - patches = ./lein_2.1.2.patch; + patches = ./lein_2.3.0.patch; inherit rlwrap clojure; @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ openjdk clojure ]; + propagatedBuildInputs = [ jdk clojure ]; meta = { homepage = https://github.com/technomancy/leiningen; description = "Project automation for Clojure"; license = "EPL"; platforms = stdenv.lib.platforms.unix; - maintainer = with stdenv.lib.maintainers; [the-kenny]; + maintainer = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch similarity index 100% rename from pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch rename to pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch From d9a4706f73430169bf1d49ea76ea0c15a1bb909b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Aug 2013 17:39:23 +0200 Subject: [PATCH 134/332] linux: Use kmod instead of module-init-tools --- pkgs/os-specific/linux/kernel/builder.sh | 11 ++--------- pkgs/os-specific/linux/kernel/generic.nix | 4 ++-- pkgs/top-level/all-packages.nix | 12 ++++++------ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 621237fa9a3..8fb5e9f91eb 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -23,8 +23,6 @@ configurePhase() { export INSTALL_PATH=$out export INSTALL_MOD_PATH=$out - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - # Set our own localversion, if specified. rm -f localversion* if test -n "$localVersion"; then @@ -70,14 +68,9 @@ installPhase() { cp vmlinux $out if grep -q "CONFIG_MODULES=y" .config; then - # Install the modules in $out/lib/modules with matching paths - # in modules.dep (i.e., refererring to $out/lib/modules, not - # /lib/modules). The depmod_opts= is to prevent the kernel - # from passing `-b PATH' to depmod. - export MODULE_DIR=$out/lib/modules/ - substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' '' + # Install the modules in $out/lib/modules. make modules_install \ - DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \ + DEPMOD=$kmod/sbin/depmod \ $makeFlags "${makeFlagsArray[@]}" \ $installFlags "${installFlagsArray[@]}" diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ad243ae5b7c..1ade2473627 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc +{ stdenv, fetchurl, perl, mktemp, kmod, bc , # The kernel source tarball. src @@ -78,7 +78,7 @@ stdenv.mkDerivation { generateConfig = ./generate-config.pl; - inherit preConfigure src module_init_tools localVersion postInstall postBuild; + inherit preConfigure src kmod localVersion postInstall postBuild; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b36b2f1595..cdd240d89b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6377,7 +6377,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_0 @@ -6385,7 +6385,7 @@ let }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 @@ -6411,7 +6411,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_4 @@ -6430,11 +6430,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; }; linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 @@ -6446,7 +6446,7 @@ let }; linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { - inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 From 9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Aug 2013 17:55:45 +0200 Subject: [PATCH 135/332] Kernel module aggregator: Use kmod instead of module-init-tools --- .../linux/{module-init-tools => kmod}/aggregator.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/os-specific/linux/{module-init-tools => kmod}/aggregator.nix (80%) diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix similarity index 80% rename from pkgs/os-specific/linux/module-init-tools/aggregator.nix rename to pkgs/os-specific/linux/kmod/aggregator.nix index cc4e6ab3552..161af38ff60 100644 --- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -1,4 +1,4 @@ -{stdenv, module_init_tools, modules, buildEnv}: +{ stdenv, kmod, modules, buildEnv }: buildEnv { name = "kernel-modules"; @@ -8,20 +8,20 @@ buildEnv { postBuild = '' source ${stdenv}/setup - + kernelVersion=$(cd $out/lib/modules && ls -d *) if test "$(echo $kernelVersion | wc -w)" != 1; then echo "inconsistent kernel versions: $kernelVersion" exit 1 fi - + echo "kernel version is $kernelVersion" # Regenerate the depmod map files. Be sure to pass an explicit # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then rm -f $out/lib/modules/$kernelVersion/modules.* - MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion + ${kmod}/sbin/depmod -b $out -a $kernelVersion fi ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdd240d89b8..9c747079670 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6647,8 +6647,8 @@ let mountall = callPackage ../os-specific/linux/mountall { }; aggregateModules = modules: - import ../os-specific/linux/module-init-tools/aggregator.nix { - inherit stdenv module_init_tools modules buildEnv; + callPackage ../os-specific/linux/kmod/aggregator.nix { + inherit modules; }; multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; From f4681d8e08092353a58c36e6ae79509719b1e25c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Aug 2013 18:47:09 +0200 Subject: [PATCH 136/332] virtualbox: Update to 4.2.16 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 264f1259fe5..724dc6ca16e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.2.14"; # changes ./guest-additions as well + version = "4.2.16"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,11 +31,11 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "86644"; + extpackRevision = "86992"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e"; + sha256 = "03gsl0548hrcspl5mi7snng08phwd3vfn6qmx41h2xwvwvmv324g"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -54,7 +54,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq"; + sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e7843b07fc3..cca133685f6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a"; + sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg"; }; KERN_DIR = "${kernelDev}/lib/modules/*/build"; From 67a46ce928c9190c9b11982120000df711ef1945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 9 Aug 2013 21:52:58 +0200 Subject: [PATCH 137/332] Add taskjuggler ruby gem Unfortunately, this changes lots of unrelated gems. --- .../interpreters/ruby/generated.nix | 195 +++++++++--------- 1 file changed, 97 insertions(+), 98 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 7446e52704c..ff0bcf235ae 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -12,10 +12,10 @@ g: # Get dependencies from patched gems activesupport = g.activesupport_4_0_0; addressable = g.addressable_2_3_5; arel = g.arel_4_0_0; - atomic = g.atomic_1_1_10; + atomic = g.atomic_1_1_12; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_12_0; + aws_sdk = g.aws_sdk_1_14_1; bitbucket_backup = g.bitbucket_backup_0_2_2; builder = g.builder_3_2_2; buildr = g.buildr_1_4_12; @@ -31,9 +31,8 @@ g: # Get dependencies from patched gems erubis = g.erubis_2_7_0; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - execjs = g.execjs_1_4_0; fakes3 = g.fakes3_0_1_5; - faraday = g.faraday_0_8_7; + faraday = g.faraday_0_8_8; faraday_middleware = g.faraday_middleware_0_8_8; ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; @@ -46,10 +45,9 @@ g: # Get dependencies from patched gems i18n = g.i18n_0_6_4; iconv = g.iconv_1_0_3; jruby_pageant = g.jruby_pageant_1_1_1; - jsduck = g.jsduck_4_10_4; + jsduck = g.jsduck_5_0_1; json = g.json_1_8_0; json_pure = g.json_pure_1_8_0; - libv8 = g.libv8_3_11_8_17_x86_64_linux; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; @@ -59,10 +57,10 @@ g: # Get dependencies from patched gems mini_portile = g.mini_portile_0_5_1; minitar = g.minitar_0_5_3; minitest = g.minitest_4_7_5; - multi_json = g.multi_json_1_7_7; + multi_json = g.multi_json_1_7_8; multipart_post = g.multipart_post_1_2_0; - net_http_digest_auth = g.net_http_digest_auth_1_3; - net_http_persistent = g.net_http_persistent_2_8; + net_http_digest_auth = g.net_http_digest_auth_1_4; + net_http_persistent = g.net_http_persistent_2_9; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_8; nix = g.nix_0_1_1; @@ -80,11 +78,11 @@ g: # Get dependencies from patched gems rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_1_6; - ref = g.ref_1_0_5; remote_syslog = g.remote_syslog_1_6_14; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; + rkelly_remix = g.rkelly_remix_0_0_4; rmail = g.rmail_1_0_0; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; @@ -92,19 +90,20 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_9; - selenium_webdriver = g.selenium_webdriver_2_33_0; + sass = g.sass_3_2_10; + selenium_webdriver = g.selenium_webdriver_2_34_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_10_0; sprockets_rails = g.sprockets_rails_2_0_0; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; + taskjuggler = g.taskjuggler_3_5_0; + term_ansicolor = g.term_ansicolor_1_2_2; text = g.text_1_2_1; - therubyracer = g.therubyracer_0_11_4; thin = g.thin_1_5_1; thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_0; + thread_safe = g.thread_safe_0_1_2; tilt = g.tilt_1_4_1; tins = g.tins_0_8_3; treetop = g.treetop_1_4_14; @@ -121,7 +120,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { ZenTest_4_9_2 = { basename = ''ZenTest''; @@ -217,7 +216,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-4.0.0''; - requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ]; + requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_8 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ]; sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids''; }; addressable_2_3_5 = { @@ -252,16 +251,16 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick''; }; - atomic_1_1_10 = { + atomic_1_1_12 = { basename = ''atomic''; meta = { description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; homepage = ''http://github.com/headius/ruby-atomic''; longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; }; - name = ''atomic-1.1.10''; + name = ''atomic-1.1.12''; requiredGems = [ ]; - sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh''; + sha256 = ''038kihswmzlzsc96r3qg5g0khdg5lywjk2nz32i7l6j85lpg233v''; }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; @@ -297,16 +296,16 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_9_2 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - aws_sdk_1_12_0 = { + aws_sdk_1_14_1 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.12.0''; + name = ''aws-sdk-1.14.1''; requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ]; - sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n''; + sha256 = ''18lvxnkb7xb2q7z5ifz9j2b9v17r6fd04s83pac7598s3zj6k4na''; }; bitbucket_backup_0_2_2 = { basename = ''bitbucket_backup''; @@ -553,17 +552,6 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - execjs_1_4_0 = { - basename = ''execjs''; - meta = { - description = ''Run JavaScript code from Ruby''; - homepage = ''https://github.com/sstephenson/execjs''; - longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; - }; - name = ''execjs-1.4.0''; - requiredGems = [ g.multi_json_1_7_7 ]; - sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs''; - }; fakes3_0_1_5 = { basename = ''fakes3''; meta = { @@ -574,15 +562,15 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; - faraday_0_8_7 = { + faraday_0_8_8 = { basename = ''faraday''; meta = { description = ''HTTP/REST API client library.''; homepage = ''https://github.com/lostisland/faraday''; }; - name = ''faraday-0.8.7''; + name = ''faraday-0.8.8''; requiredGems = [ g.multipart_post_1_2_0 ]; - sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi''; + sha256 = ''no hash''; }; faraday_middleware_0_8_8 = { basename = ''faraday_middleware''; @@ -592,7 +580,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Various middleware for Faraday''; }; name = ''faraday_middleware-0.8.8''; - requiredGems = [ g.faraday_0_8_7 ]; + requiredGems = [ g.faraday_0_8_8 ]; sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; }; ffi_1_9_0 = { @@ -747,16 +735,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; }; - jsduck_4_10_4 = { + jsduck_5_0_1 = { basename = ''jsduck''; meta = { description = ''Simple JavaScript Duckumentation generator''; homepage = ''https://github.com/senchalabs/jsduck''; longDescription = ''Documentation generator for Sencha JS frameworks''; }; - name = ''jsduck-4.10.4''; - requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ]; - sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih''; + name = ''jsduck-5.0.1''; + requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ]; + sha256 = ''0py1ik9jri5f230ifqxv0y0p4w0dp5jp8a9hfzgzaz4xvpzqyf7h''; }; json_1_8_0 = { basename = ''json''; @@ -791,17 +779,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - libv8_3_11_8_17_x86_64_linux = { - basename = ''libv8''; - meta = { - description = ''Distribution of the V8 JavaScript engine''; - homepage = ''http://github.com/cowboyd/libv8''; - longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer''; - }; - name = ''libv8-3.11.8.17-x86_64-linux''; - requiredGems = [ ]; - sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9''; - }; locale_2_0_8 = { basename = ''locale''; meta = { @@ -859,7 +836,7 @@ submitted. Mechanize also keeps track of the sites that you have visited as a history.''; }; name = ''mechanize-2.7.1''; - requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ]; + requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ]; sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh''; }; mime_types_1_23 = { @@ -979,16 +956,16 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; }; - multi_json_1_7_7 = { + multi_json_1_7_8 = { basename = ''multi_json''; meta = { description = ''A common interface to multiple JSON libraries.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; }; - name = ''multi_json-1.7.7''; + name = ''multi_json-1.7.8''; requiredGems = [ ]; - sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr''; + sha256 = ''no hash''; }; multipart_post_1_2_0 = { basename = ''multipart_post''; @@ -1001,7 +978,7 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; }; - net_http_digest_auth_1_3 = { + net_http_digest_auth_1_4 = { basename = ''net_http_digest_auth''; meta = { description = ''An implementation of RFC 2617 - Digest Access Authentication''; @@ -1014,11 +991,11 @@ In order to use net-http-digest_auth you'll need to perform some request wrangling on your own. See the class documentation at Net::HTTP::DigestAuth for an example.''; }; - name = ''net-http-digest_auth-1.3''; + name = ''net-http-digest_auth-1.4''; requiredGems = [ ]; - sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy''; + sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi''; }; - net_http_persistent_2_8 = { + net_http_persistent_2_9 = { basename = ''net_http_persistent''; meta = { description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8''; @@ -1034,9 +1011,9 @@ Net::HTTP supports persistent connections with some API methods but does not handle reconnection gracefully. Net::HTTP::Persistent supports reconnection and retry according to RFC 2616.''; }; - name = ''net-http-persistent-2.8''; + name = ''net-http-persistent-2.9''; requiredGems = [ ]; - sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l''; + sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -1110,7 +1087,7 @@ enough of it.''; }; name = ''nokogiri-1.6.0''; requiredGems = [ g.mini_portile_0_5_1 ]; - sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb''; + sha256 = ''no hash''; }; ntlm_http_0_1_1 = { basename = ''ntlm_http''; @@ -1131,7 +1108,7 @@ enough of it.''; longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).''; }; name = ''papertrail-0.9.7''; - requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ]; + requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ]; sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; }; papertrail_cli_0_9_3 = { @@ -1288,17 +1265,6 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; - ref_1_0_5 = { - basename = ''ref''; - meta = { - description = ''Library that implements weak, soft, and strong references in Ruby.''; - homepage = ''http://github.com/bdurand/ref''; - longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.''; - }; - name = ''ref-1.0.5''; - requiredGems = [ ]; - sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la''; - }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { @@ -1401,6 +1367,19 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; + rkelly_remix_0_0_4 = { + basename = ''rkelly_remix''; + meta = { + description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck''; + longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser +in JSDuck. + +* http://rkelly.rubyforge.org/''; + }; + name = ''rkelly-remix-0.0.4''; + requiredGems = [ ]; + sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; + }; rmail_1_0_0 = { basename = ''rmail''; meta = { @@ -1484,7 +1463,7 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_2_9 = { + sass_3_2_10 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1495,20 +1474,20 @@ algorithm for low-level network errors. command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.9''; + name = ''sass-3.2.10''; requiredGems = [ ]; - sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q''; + sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; }; - selenium_webdriver_2_33_0 = { + selenium_webdriver_2_34_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.33.0''; - requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; - sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d''; + name = ''selenium-webdriver-2.34.0''; + requiredGems = [ g.multi_json_1_7_8 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; + sha256 = ''02wh008b03ixhpp853rmviq6xfk8100ka1g66wb2vsghajs6l1hx''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -1543,7 +1522,7 @@ interpreters.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.10.0''; - requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ]; + requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_8 g.rack_1_5_2 g.tilt_1_4_1 ]; sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s''; }; sprockets_rails_2_0_0 = { @@ -1578,6 +1557,37 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; + taskjuggler_3_5_0 = { + basename = ''taskjuggler''; + meta = { + description = ''A Project Management Software''; + homepage = ''http://www.taskjuggler.org''; + longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project +management tool. Its new approach to project planing and tracking is more +flexible and superior to the commonly used Gantt chart editing tools. + +TaskJuggler is project management software for serious project managers. It +covers the complete spectrum of project management tasks from the first idea +to the completion of the project. It assists you during project scoping, +resource assignment, cost and revenue planing, risk and communication +management. +''; + }; + name = ''taskjuggler-3.5.0''; + requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ]; + sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2''; + }; + term_ansicolor_1_2_2 = { + basename = ''term_ansicolor''; + meta = { + description = ''Ruby library that colors strings using ANSI escape sequences''; + homepage = ''http://flori.github.com/term-ansicolor''; + longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output''; + }; + name = ''term-ansicolor-1.2.2''; + requiredGems = [ g.tins_0_8_3 ]; + sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr''; + }; text_1_2_1 = { basename = ''text''; meta = { @@ -1589,17 +1599,6 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z''; }; - therubyracer_0_11_4 = { - basename = ''therubyracer''; - meta = { - description = ''Embed the V8 JavaScript interpreter into Ruby''; - homepage = ''http://github.com/cowboyd/therubyracer''; - longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.''; - }; - name = ''therubyracer-0.11.4''; - requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ]; - sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq''; - }; thin_1_5_1 = { basename = ''thin''; meta = { @@ -1622,16 +1621,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3''; }; - thread_safe_0_1_0 = { + thread_safe_0_1_2 = { basename = ''thread_safe''; meta = { description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; homepage = ''https://github.com/headius/thread_safe''; longDescription = ''Thread-safe collections and utilities for Ruby''; }; - name = ''thread_safe-0.1.0''; - requiredGems = [ g.atomic_1_1_10 ]; - sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf''; + name = ''thread_safe-0.1.2''; + requiredGems = [ g.atomic_1_1_12 ]; + sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; }; tilt_1_4_1 = { basename = ''tilt''; From 14c5f6bd746440b3dedbc778463f6d0c8260e0d4 Mon Sep 17 00:00:00 2001 From: Bodil Stokke Date: Sat, 10 Aug 2013 01:21:25 +0200 Subject: [PATCH 138/332] Adding ponysay. --- pkgs/tools/misc/ponysay/default.nix | 30 +++++++++++++++++++++++++++ pkgs/tools/misc/ponysay/pathfix.patch | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/tools/misc/ponysay/default.nix create mode 100644 pkgs/tools/misc/ponysay/pathfix.patch diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix new file mode 100644 index 00000000000..1f281a71301 --- /dev/null +++ b/pkgs/tools/misc/ponysay/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, python3, texinfo, makeWrapper }: + +stdenv.mkDerivation rec { + name = "ponysay-3.0.1"; + + src = fetchurl { + url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz"; + sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee"; + }; + + buildInputs = [ python3 texinfo makeWrapper ]; + + phases = "unpackPhase patchPhase installPhase"; + + patches = [ ./pathfix.patch ]; + + installPhase = '' + python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" + done + ''; + + meta = { + description = "cowsay reimplemention for ponies."; + homepage = http://terse.tk/ponysay/; + license = "GPLv3"; + }; +} diff --git a/pkgs/tools/misc/ponysay/pathfix.patch b/pkgs/tools/misc/ponysay/pathfix.patch new file mode 100644 index 00000000000..ad50f653024 --- /dev/null +++ b/pkgs/tools/misc/ponysay/pathfix.patch @@ -0,0 +1,24 @@ +diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py +--- ponysay-3.0.1/setup.py 2013-04-05 14:28:18.000000000 +0200 ++++ ponysay.p/setup.py 2013-08-10 01:09:30.181043877 +0200 +@@ -514,7 +514,7 @@ + for command in commands: + sourceed = 'completion/ponysay.%s' % (command) + generated = 'completion/%s-completion.%s' % (shell, command) +- generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed) ++ generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed) + Popen(generatorcmd.split(' ')).communicate() + if conf[command] is not None: + dest = generated + '.install' +@@ -559,9 +559,9 @@ + for toolcommand in ('--dimensions', '--metadata'): + if not self.free: + print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir)) +- Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() ++ Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate() + else: +- params = ['./src/ponysaytool.py', toolcommand, sharedir, '--'] ++ params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--'] + for sharefile in os.listdir(sharedir): + if sharefile.endswith('.pony') and (sharefile != '.pony'): + if not Setup.validateFreedom(sharedir + '/' + sharefile): diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c747079670..249be7cb90d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1526,6 +1526,8 @@ let polkit_gnome = callPackage ../tools/security/polkit-gnome { }; + ponysay = callPackage ../tools/misc/ponysay { }; + povray = callPackage ../tools/graphics/povray { }; ppl = callPackage ../development/libraries/ppl { }; From 3c6b2f7501529603b0e9588e1292208154711eb2 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Aug 2013 02:32:21 +0200 Subject: [PATCH 139/332] vifm: update to 0.7.5 and enabling new options --- pkgs/applications/misc/vifm/default.nix | 53 +++++++++---------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 21 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 6f270f5c7cf..7230e84601e 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,48 +1,31 @@ -x@{builderDefsPackage - , ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="vifm"; - version="0.6.3"; - name="${baseName}-${version}"; - url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2"; - hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +let + name = "vifm-${version}"; + version = "0.7.5"; + +in stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2"; + sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + #phaseNames = ["doConfigure" "doMakeInstall"]; + buildInputs = [ utillinux ncurses file libX11 ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { description = "A vi-like file manager"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; + maintainers = with pkgs.lib.maintainers; [ raskin garbas ]; + platforms = pkgs.lib.platforms.linux; + license = pkgs.lib.licenses.gpl2; }; + passthru = { updateInfo = { downloadPage = "http://vifm.sf.net"; }; }; -}) x +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 249be7cb90d..f13b150bd17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1830,7 +1830,9 @@ let vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - vifm = callPackage ../applications/misc/vifm {}; + vifm = callPackage ../applications/misc/vifm { + inherit (xlibs) libX11; + }; viking = callPackage ../applications/misc/viking { inherit (gnome) scrollkeeper; From 3cd37b550b80adee64e68065c835743651407ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sat, 8 Dec 2012 11:52:54 +0100 Subject: [PATCH 140/332] Steam: first attempt at adding the beta client. The script installed with this expression only copies a boostrapper and another script to the user's home folder. Those also need to be patched to get on with the installation. --- pkgs/games/steam/default.nix | 37 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/games/steam/default.nix diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix new file mode 100644 index 00000000000..3dbeed83885 --- /dev/null +++ b/pkgs/games/steam/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, dpkg, makeWrapper, xz }: + +assert stdenv.system == "i686-linux"; + +let version = "1.0.0.16"; in + +stdenv.mkDerivation rec { + name = "steam-${version}"; + + src = fetchurl { + url = "http://media.steampowered.com/client/installer/steam.deb"; + sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m"; + }; + + buildInputs = [ dpkg makeWrapper xz ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out + dpkg-deb -x $src $out + mv $out/usr/* $out/ + rmdir $out/usr + substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh" + substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" + substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam" + sed -i '/jockey-common/d' $out/bin/steam + wrapProgram "$out/bin/steam" --prefix PATH ":" \ + "${xz}/bin" + ''; + + meta = { + description = "A digital distribution platform"; + homepage = http://store.steampowered.com/; + license = "unfree"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 249be7cb90d..5c1eaf6e4f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9032,6 +9032,8 @@ let stardust = callPackage ../games/stardust {}; + steam = callPackage_i686 ../games/steam {}; + stuntrally = callPackage ../games/stuntrally { }; superTux = callPackage ../games/super-tux { }; From 12a0d83855bdc7129163d6926da245141c4d9866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 9 Dec 2012 10:24:50 +0100 Subject: [PATCH 141/332] Steam: add patch for user stuff and lib paths to wrapProgram. The binaries that get copied to $HOME need patchelf to run, and after that I need all the runtime libs in the library path. Still not working as I need glibc2.15. --- pkgs/games/steam/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 3dbeed83885..08bd9a14896 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, xz }: +{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc +,patchelf }: assert stdenv.system == "i686-linux"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m"; }; - buildInputs = [ dpkg makeWrapper xz ]; + buildInputs = [ dpkg makeWrapper ]; phases = "installPhase"; @@ -25,8 +26,22 @@ stdenv.mkDerivation rec { substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam" sed -i '/jockey-common/d' $out/bin/steam - wrapProgram "$out/bin/steam" --prefix PATH ":" \ - "${xz}/bin" + wrapProgram "$out/bin/steam" \ + --prefix PATH ":" "${xz}/bin" \ + --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib + + mkdir -p $out/patches + cat > $out/patches/post-install.sh << EOF + #!${stdenv.shell} + + # post-install script to patch stuff at \$HOME + PATH=\$PATH:${patchelf}/bin + sed -i 's/bash/sh/' \$HOME/.local/share/Steam/steam.sh + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + \$HOME/.local/share/Steam/ubuntu12_32/steam + EOF + + chmod +x $out/patches/post-install.sh ''; meta = { From ee6129350e2b16caa3ba514b7f1b941886dd296f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 10 Dec 2012 23:31:57 +0100 Subject: [PATCH 142/332] steam: add glibc215 to the wrapper. --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 08bd9a14896..2a54d2d53ff 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc +{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215 ,patchelf }: assert stdenv.system == "i686-linux"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sed -i '/jockey-common/d' $out/bin/steam wrapProgram "$out/bin/steam" \ --prefix PATH ":" "${xz}/bin" \ - --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib + --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib mkdir -p $out/patches cat > $out/patches/post-install.sh << EOF From dad0ed4eaaac01a0d374a3b854c99145d9815e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Wed, 12 Dec 2012 18:12:13 +0100 Subject: [PATCH 143/332] steam: add all the missing dependancies. Calling their steam script still segfaults, but I managed to run it from the shell with all these deps in the lib path. --- pkgs/games/steam/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 2a54d2d53ff..63f820bbe00 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215 -,patchelf }: +, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk +, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib +, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio +, patchelf }: assert stdenv.system == "i686-linux"; @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { sed -i '/jockey-common/d' $out/bin/steam wrapProgram "$out/bin/steam" \ --prefix PATH ":" "${xz}/bin" \ - --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib + --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib mkdir -p $out/patches cat > $out/patches/post-install.sh << EOF From b07300f2ef3cee6b8718fa2fd0360a60d32e5924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 27 Dec 2012 12:01:07 +0100 Subject: [PATCH 144/332] steam: bypass valve's bootstrapper. Since there is no way to modify either steam.sh or the steam binary as they are hash checked, I took the approach of bypassing steam.sh and create a script that does its job. For now it segfaults, but when I try to run under strace, it works perfectly. Need to check this. --- pkgs/games/steam/default.nix | 42 +++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 63f820bbe00..b003fc8eb47 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -2,6 +2,9 @@ , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio +, SDL # World of Goo +, libvorbis # Osmos +, curl # Superbrothers: S&S EP , patchelf }: assert stdenv.system == "i686-linux"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m"; + sha256 = "1gzfyh3wfdb4h7cxibx61c31l8pjz5zcp5d9d5w9jyja463lv49c"; }; buildInputs = [ dpkg makeWrapper ]; @@ -29,22 +32,37 @@ stdenv.mkDerivation rec { substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam" sed -i '/jockey-common/d' $out/bin/steam - wrapProgram "$out/bin/steam" \ - --prefix PATH ":" "${xz}/bin" \ - --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib - mkdir -p $out/patches - cat > $out/patches/post-install.sh << EOF + mv $out/bin/steam $out/bin/.steam-wrapped + cat > $out/bin/steam << EOF #!${stdenv.shell} - # post-install script to patch stuff at \$HOME - PATH=\$PATH:${patchelf}/bin - sed -i 's/bash/sh/' \$HOME/.local/share/Steam/steam.sh - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - \$HOME/.local/share/Steam/ubuntu12_32/steam + export PATH=${xz}/bin:\$PATH + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib + STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh + if [ -f \$STEAMBOOTSTRAP ]; then + STEAMCONFIG=~/.steam + STEAMROOT="\$STEAMCONFIG/steam" + STEAMBINDIR="\$STEAMROOT/ubuntu12_32" + PIDFILE="\$STEAMCONFIG/steam.pid" + STEAMRUNCMD="\$STEAMCONFIG/runcmd" + STEAMBIN32LINK="\$STEAMCONFIG/bin32" + STEAMBIN64LINK="\$STEAMCONFIG/bin64" + STEAMROOTLINK="\$STEAMCONFIG/root" + STEAMSTARTING="\$STEAMCONFIG/starting" + export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH" + export SDL_VIDEO_X11_DGAMOUSE=0 + cd "\$STEAMROOT" + cp ${glibc215}/lib/ld-linux.so.2 "\$STEAMBINDIR" + chmod u+w "\$STEAMBINDIR/ld-linux.so.2" + echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam + exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam" + else + exec $out/bin/.steam-wrapped + fi EOF - chmod +x $out/patches/post-install.sh + chmod +x $out/bin/steam ''; meta = { From c75cccc469173da08d7b8f9d4993bc3cc22d6d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 27 Dec 2012 12:10:28 +0100 Subject: [PATCH 145/332] steam: update to 1.0.0.18. I forgot in the previous commit to update the version as I had changed the tarball hash. I also modified a bit the launcher script, since xz should only be needed by the installer. --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index b003fc8eb47..7e7cc2d8f6d 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -9,7 +9,7 @@ assert stdenv.system == "i686-linux"; -let version = "1.0.0.16"; in +let version = "1.0.0.18"; in stdenv.mkDerivation rec { name = "steam-${version}"; @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { cat > $out/bin/steam << EOF #!${stdenv.shell} - export PATH=${xz}/bin:\$PATH export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then @@ -58,6 +57,7 @@ stdenv.mkDerivation rec { echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam" else + export PATH=${xz}/bin:\$PATH exec $out/bin/.steam-wrapped fi EOF From 10f722dc04ac572ae28538a9db09e472e0cc0f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 27 Dec 2012 12:53:02 +0100 Subject: [PATCH 146/332] steam: workaround segfault at startup. I don't know why, if I call ld-linux.so.2 to launch the game, it segfaults, so I renamed it to ld.so. --- pkgs/games/steam/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 7e7cc2d8f6d..e0d337bd7c0 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -52,10 +52,11 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" - cp ${glibc215}/lib/ld-linux.so.2 "\$STEAMBINDIR" - chmod u+w "\$STEAMBINDIR/ld-linux.so.2" + LDSO="\$STEAMBINDIR\ld.so" + cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO" + chmod u+w "\$LDSO" echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam - exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam" + exec "\$LDSO" "\$STEAMBINDIR/steam" else export PATH=${xz}/bin:\$PATH exec $out/bin/.steam-wrapped From 094c0662e879157656b6cfb73268e1041d791af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 27 Dec 2012 12:57:48 +0100 Subject: [PATCH 147/332] steam: add mesa to library path. Mesa is needed for Superbrothers: S&S EP, which links to libGLU. --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index e0d337bd7c0..f00dd29a234 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -4,7 +4,7 @@ , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio , SDL # World of Goo , libvorbis # Osmos -, curl # Superbrothers: S&S EP +, curl, mesa # Superbrothers: S&S EP , patchelf }: assert stdenv.system == "i686-linux"; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { STEAMBIN64LINK="\$STEAMCONFIG/bin64" STEAMROOTLINK="\$STEAMCONFIG/root" STEAMSTARTING="\$STEAMCONFIG/starting" - export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" LDSO="\$STEAMBINDIR\ld.so" From f42cece8f52e8624994bcb68df01308594dbc039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Wed, 16 Jan 2013 23:53:45 +0100 Subject: [PATCH 148/332] steam: update to 1.0.0.21. I also updated the patches for the bootsrapper script and fixed a typo, but didn't test anything. --- pkgs/games/steam/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index f00dd29a234..48466ef1663 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -9,14 +9,14 @@ assert stdenv.system == "i686-linux"; -let version = "1.0.0.18"; in +let version = "1.0.0.21"; in stdenv.mkDerivation rec { name = "steam-${version}"; src = fetchurl { url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "1gzfyh3wfdb4h7cxibx61c31l8pjz5zcp5d9d5w9jyja463lv49c"; + sha256 = "03p3mvrdkkq9x7ssi9wl5zzyi4xvw5zvap7w72rpjsz8145l3vsj"; }; buildInputs = [ dpkg makeWrapper ]; @@ -30,8 +30,6 @@ stdenv.mkDerivation rec { rmdir $out/usr substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh" substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" - substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam" - sed -i '/jockey-common/d' $out/bin/steam mv $out/bin/steam $out/bin/.steam-wrapped cat > $out/bin/steam << EOF @@ -52,7 +50,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" - LDSO="\$STEAMBINDIR\ld.so" + LDSO="\$STEAMBINDIR/ld.so" cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO" chmod u+w "\$LDSO" echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam From dc10fabb2f7a41e79747c4c6597f1930950e7aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 15 Feb 2013 19:27:37 +0100 Subject: [PATCH 149/332] steam: update to 1.0.0.27 It needed some more sed'ing and more deps. It's still not working as I seem to need libXdmcp which is not in nixpkgs. --- pkgs/games/steam/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 48466ef1663..18da72c05a7 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -2,6 +2,7 @@ , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio +, libxcb, libXau , SDL # World of Goo , libvorbis # Osmos , curl, mesa # Superbrothers: S&S EP @@ -9,14 +10,14 @@ assert stdenv.system == "i686-linux"; -let version = "1.0.0.21"; in +let version = "1.0.0.27"; in stdenv.mkDerivation rec { name = "steam-${version}"; src = fetchurl { url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "03p3mvrdkkq9x7ssi9wl5zzyi4xvw5zvap7w72rpjsz8145l3vsj"; + sha256 = "1hlmqxd0yv92aag3wbykwvri54lbmq9s6krrxfnrp1rbpli9r2jx"; }; buildInputs = [ dpkg makeWrapper ]; @@ -30,12 +31,14 @@ stdenv.mkDerivation rec { rmdir $out/usr substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh" substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" + sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam + sed -i '/STEAMSCRIPT/d' $out/bin/steam mv $out/bin/steam $out/bin/.steam-wrapped cat > $out/bin/steam << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then STEAMCONFIG=~/.steam From a249fa67d95fae8f57917fa71bafad8dcc259f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 15 Feb 2013 19:42:13 +0100 Subject: [PATCH 150/332] steam: add libXdmcp to dependencies. I must have been blind. libXdmcp is in nixpkgs, contrary to what I said. --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 18da72c05a7..ab98c099d9f 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -2,7 +2,7 @@ , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio -, libxcb, libXau +, libxcb, libXau, libXdmcp , SDL # World of Goo , libvorbis # Osmos , curl, mesa # Superbrothers: S&S EP @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cat > $out/bin/steam << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then STEAMCONFIG=~/.steam From 87c5a418ec7debed28cc4766ac730b9a13bdfb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Fri, 15 Feb 2013 23:16:01 +0100 Subject: [PATCH 151/332] steam: create proper symlinks in $HOME/.steam --- pkgs/games/steam/default.nix | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index ab98c099d9f..46031063e08 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -41,23 +41,40 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then + PLATFORM32=ubuntu12_32 STEAMCONFIG=~/.steam - STEAMROOT="\$STEAMCONFIG/steam" - STEAMBINDIR="\$STEAMROOT/ubuntu12_32" + STEAMROOT=~/.local/share/Steam + STEAMDATA="\$STEAMROOT" PIDFILE="\$STEAMCONFIG/steam.pid" - STEAMRUNCMD="\$STEAMCONFIG/runcmd" STEAMBIN32LINK="\$STEAMCONFIG/bin32" STEAMBIN64LINK="\$STEAMCONFIG/bin64" + STEAMSDK32LINK="\$STEAMCONFIG/sdk32" + STEAMSDK64LINK="\$STEAMCONFIG/sdk64" STEAMROOTLINK="\$STEAMCONFIG/root" + STEAMDATALINK="\$STEAMCONFIG/steam" STEAMSTARTING="\$STEAMCONFIG/starting" - export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib" + # Create symbolic links for the Steam API + if [ ! -e "\$STEAMCONFIG" ]; then + mkdir "\$STEAMCONFIG" + fi + #if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then + rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK" + rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK" + rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK" + rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK" + rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK" + if [ "\$STEAMDATALINK" ]; then + rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK" + fi + #fi + export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" - LDSO="\$STEAMBINDIR/ld.so" + LDSO="\$STEAMBIN32LINK/ld.so" cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO" chmod u+w "\$LDSO" echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam - exec "\$LDSO" "\$STEAMBINDIR/steam" + exec "\$LDSO" "\$STEAMBIN32LINK/steam" else export PATH=${xz}/bin:\$PATH exec $out/bin/.steam-wrapped From 2725cbef42329025dacab6ceddc9ab8ae33fa4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 13 Dec 2012 10:57:52 +0100 Subject: [PATCH 152/332] Add libtxc_dxtn-1.0.1. I thought this was needed by Steam, but it only applies when not using propietary drivers, and even then it doesn't look like well supported. --- .../libraries/libtxc_dxtn/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libtxc_dxtn/default.nix diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix new file mode 100644 index 00000000000..9cf8decf4c8 --- /dev/null +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, mesa }: + +let version = "1.0.1"; in + +stdenv.mkDerivation rec { + name = "libtxc_dxtn-${version}"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz"; + sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv"; + }; + + buildInputs = [ autoconf automake libtool mesa ]; + + preConfigure = "autoreconf -vfi"; + + meta = { + homepage = http://dri.freedesktop.org/wiki/S3TC; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1eaf6e4f0..179bba1ce76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4846,6 +4846,8 @@ let libtunepimp = callPackage ../development/libraries/libtunepimp { }; + libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libunistring = callPackage ../development/libraries/libunistring { }; From bd44348bafe991f7ddb11ce96968903e702b9be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 18 Feb 2013 23:46:00 +0100 Subject: [PATCH 153/332] steam: create some missing symlinks in the script. In the original script it says they are temporary, but without those simlinks Osmos and others fail to start with SteamAPI_Init() failed. --- pkgs/games/steam/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 46031063e08..1d087fa8f31 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { #!${stdenv.shell} export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib - STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh + STEAMBOOTSTRAP=~/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then PLATFORM32=ubuntu12_32 STEAMCONFIG=~/.steam @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { if [ ! -e "\$STEAMCONFIG" ]; then mkdir "\$STEAMCONFIG" fi - #if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then + if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK" rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK" rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK" @@ -66,7 +66,11 @@ stdenv.mkDerivation rec { if [ "\$STEAMDATALINK" ]; then rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK" fi - #fi + fi + # Temporary bandaid until everyone has the new libsteam_api.so + rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath + rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid + rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" From 3f4557b0ebd3254cdf274fc24ad9e7e234805231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 19 Feb 2013 00:01:11 +0100 Subject: [PATCH 154/332] steam: update to 1.0.0.28 --- pkgs/games/steam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 1d087fa8f31..95fcdc0252a 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -10,14 +10,14 @@ assert stdenv.system == "i686-linux"; -let version = "1.0.0.27"; in +let version = "1.0.0.28"; in stdenv.mkDerivation rec { name = "steam-${version}"; src = fetchurl { url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "1hlmqxd0yv92aag3wbykwvri54lbmq9s6krrxfnrp1rbpli9r2jx"; + sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; }; buildInputs = [ dpkg makeWrapper ]; From 97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 19 Feb 2013 20:34:54 +0100 Subject: [PATCH 155/332] steam: add amd64 version and point url to fix version (as suggested by aristid). Valve has a repository with fixed version packages, so use that instead of the steam.deb I was using. They also have amd64 packages there. --- pkgs/games/steam/default.nix | 18 +++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 95fcdc0252a..dd8c5e883a5 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -8,17 +8,25 @@ , curl, mesa # Superbrothers: S&S EP , patchelf }: -assert stdenv.system == "i686-linux"; +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = "1.0.0.28"; in stdenv.mkDerivation rec { name = "steam-${version}"; - src = fetchurl { - url = "http://media.steampowered.com/client/installer/steam.deb"; - sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; - }; + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://repo.steampowered.com/steam/archive/precise/steam_${version}_i386.deb"; + sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://repo.steampowered.com/steam/archive/precise/steam64_${version}_amd64.deb"; + sha256 = "1dr2b9s036w8r46az1f9cjddrjaf8a9k564g65j288y6w9pcdb2w"; + } + else throw "Steam not supported on this platform."; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 179bba1ce76..aabb57b2db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9034,7 +9034,7 @@ let stardust = callPackage ../games/stardust {}; - steam = callPackage_i686 ../games/steam {}; + steam = callPackage ../games/steam {}; stuntrally = callPackage ../games/stuntrally { }; From 4d853ae94fe74437b54eb1146c228c9a55175f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 19 Feb 2013 20:52:19 +0100 Subject: [PATCH 156/332] steam: revert adding amd64 version. It turns out that the .deb only contains the changelog and some other docs. Revert back to using the i686 version, but keep the double url for the future. --- pkgs/games/steam/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index dd8c5e883a5..122d301e5ba 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -8,7 +8,7 @@ , curl, mesa # Superbrothers: S&S EP , patchelf }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert stdenv.system == "i686-linux"; let version = "1.0.0.28"; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aabb57b2db0..179bba1ce76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9034,7 +9034,7 @@ let stardust = callPackage ../games/stardust {}; - steam = callPackage ../games/steam {}; + steam = callPackage_i686 ../games/steam {}; stuntrally = callPackage ../games/stuntrally { }; From 5885cf1286fc2cfdf2b24811be872a00d421e183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Wed, 20 Feb 2013 19:30:31 +0100 Subject: [PATCH 157/332] steam: add flashplayer plugin support. The videos work, but there is a problem with sound: ALSA lib dlmisc.c:236:(snd1_dlobj_cache_get) Cannot open shared library /nix/store/9z51hr9l19vdhgmqd60jwwrg6ny5md2d-alsa-plugins-1.0.26/lib/alsa-lib/libasound_module_pcm_pulse.so It tries to open a 64bit plugin, which obviously fails. I think this depends on /etc/asound.conf, but I'm not sure how to fix it. Regardless of the problem, in one computer I tried the sound works but other apps cannot output sound. In another, the sound doesn't work and other apps continue working as normal. --- pkgs/games/steam/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 122d301e5ba..0bb73d5f6c9 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -2,7 +2,7 @@ , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio -, libxcb, libXau, libXdmcp +, libxcb, libXau, libXdmcp, flashplayer , SDL # World of Goo , libvorbis # Osmos , curl, mesa # Superbrothers: S&S EP @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib" export SDL_VIDEO_X11_DGAMOUSE=0 cd "\$STEAMROOT" + FLASHLINK="\$STEAMCONFIG/bin32/plugins" + rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK" LDSO="\$STEAMBIN32LINK/ld.so" cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO" chmod u+w "\$LDSO" From 37996253e6492003c4ec23c833461e44f2fc1f23 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 10 Aug 2013 05:46:34 +0300 Subject: [PATCH 158/332] Steam: fix and update to 1.0.0.39 --- pkgs/games/steam/default.nix | 37 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 0bb73d5f6c9..1e8c0db9045 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,32 +1,25 @@ -{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215 +{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio -, libxcb, libXau, libXdmcp, flashplayer +, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext +, dbus_glib, libusb1, networkmanager , SDL # World of Goo , libvorbis # Osmos , curl, mesa # Superbrothers: S&S EP , patchelf }: -assert stdenv.system == "i686-linux"; +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -let version = "1.0.0.28"; in +let version = "1.0.0.39"; in stdenv.mkDerivation rec { name = "steam-${version}"; - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://repo.steampowered.com/steam/archive/precise/steam_${version}_i386.deb"; - sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://repo.steampowered.com/steam/archive/precise/steam64_${version}_amd64.deb"; - sha256 = "1dr2b9s036w8r46az1f9cjddrjaf8a9k564g65j288y6w9pcdb2w"; - } - else throw "Steam not supported on this platform."; + src = fetchurl { + url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb"; + sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk"; + }; buildInputs = [ dpkg makeWrapper ]; @@ -35,18 +28,17 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out dpkg-deb -x $src $out - mv $out/usr/* $out/ - rmdir $out/usr - substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh" + cp -r $out/usr/* $out/ + rm -rf $out/usr + substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh" substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/" sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam sed -i '/STEAMSCRIPT/d' $out/bin/steam mv $out/bin/steam $out/bin/.steam-wrapped cat > $out/bin/steam << EOF - #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib STEAMBOOTSTRAP=~/.steam/steam/steam.sh if [ -f \$STEAMBOOTSTRAP ]; then PLATFORM32=ubuntu12_32 @@ -85,9 +77,10 @@ stdenv.mkDerivation rec { FLASHLINK="\$STEAMCONFIG/bin32/plugins" rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK" LDSO="\$STEAMBIN32LINK/ld.so" - cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO" + cp ${glibc}/lib/ld-linux.so.2 "\$LDSO" chmod u+w "\$LDSO" echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib exec "\$LDSO" "\$STEAMBIN32LINK/steam" else export PATH=${xz}/bin:\$PATH From 24a0e6ad5fe16d525f06fd6045fcc3f5da8e4ed3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Aug 2013 13:00:43 +0200 Subject: [PATCH 159/332] callPackage automatically inherits from xlibs --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13b150bd17..0268790832e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1830,9 +1830,7 @@ let vfdecrypt = callPackage ../tools/misc/vfdecrypt { }; - vifm = callPackage ../applications/misc/vifm { - inherit (xlibs) libX11; - }; + vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { inherit (gnome) scrollkeeper; From 31648f889dd9685e4a6268c49fc6aefc37405fe0 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 7 Aug 2013 06:24:44 +0200 Subject: [PATCH 160/332] btrfsprogs: upgrade to current git master --- pkgs/tools/filesystems/btrfsprogs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a091142db24..9c8d18231f0 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }: -let version = "0.20pre20130509"; in +let version = "0.20pre20130705"; in stdenv.mkDerivation { name = "btrfs-progs-${version}"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; - rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69"; - sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21"; + rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"; + sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2"; }; buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ]; From 59025453e71f88196eaff142ff3443f99cda8f44 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 7 Aug 2013 06:30:54 +0200 Subject: [PATCH 161/332] linux-3.10: backport a fix for "btrfs send" It has been submitted for inclusion in mainline, so it will probably make it into 3.11 (or 3.12 as 3.11 is fairly close to release). It is very local, only affecting people who use the "send" feature. Without it, send is unstable/unsafe to use incrementally. It can probably be applied to 3.9 and 3.8 as well, but as I only tested it against 3.10, so I didn't bother. --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c77785167cc..e1ec4a55718 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -139,4 +139,15 @@ rec { }; }; + # this patch will probably make it into 3.11 or 3.12 + # it only touches 1 file (fs/btrfs/send.c) so it only affects people that use + # the btrfs send feature. + btrfs_send_backport = + { name = "btrfs-send-check-parent-dir-when-doing-a-compare-send"; + patch = fetchurl { + url = https://patchwork.kernel.org/patch/2839612/mbox; + sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a366b24193..53c3ba9ec73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6454,6 +6454,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 + kernelPatches.btrfs_send_backport ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From 5a1593ed22dc6f0c451a9a37870be66aad601032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 10 Aug 2013 14:15:20 +0200 Subject: [PATCH 162/332] Revert "Add taskjuggler ruby gem" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 67a46ce928c9190c9b11982120000df711ef1945. It seems this commit is the reason for this hydra breakage: building /nix/store/hwdyx4mf5638mxkka64cxjcj75vw3hmz-nixpkgs-tarball-1.0pre28245_67a46ce unpacking sources [...snip lots of stuff...] 'manual.pdf' successfully built make: Leaving directory `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/doc' running tests checking pkgs/top-level/all-packages.nix on i686-linux error: while evaluating the attribute `drvPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:19:9': while evaluating the builtin function `derivationStrict': while instantiating the derivation named `ruby-actionmailer-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5': while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17': while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9': while evaluating the builtin function `getAttr': while evaluating the builtin function `derivationStrict': while instantiating the derivation named `ruby-actionpack-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5': while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17': while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9': while evaluating the builtin function `getAttr': while evaluating the builtin function `derivationStrict': while instantiating the derivation named `ruby-activesupport-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5': while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17': while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9': while evaluating the builtin function `getAttr': while evaluating the builtin function `derivationStrict': while instantiating the derivation named `ruby-multi_json-1.7.8' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5': while evaluating the derivation attribute `src' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:11:5': while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9': while evaluating the builtin function `getAttr': while evaluating the builtin function `derivationStrict': hash `no hash' has wrong length for hash type `sha256' build time elapsed: 0m0.038s 0m0.023s 0m20.586s 0m2.004s builder for `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed with exit code 1 error: build of `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed --- .../interpreters/ruby/generated.nix | 195 +++++++++--------- 1 file changed, 98 insertions(+), 97 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index ff0bcf235ae..7446e52704c 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -12,10 +12,10 @@ g: # Get dependencies from patched gems activesupport = g.activesupport_4_0_0; addressable = g.addressable_2_3_5; arel = g.arel_4_0_0; - atomic = g.atomic_1_1_12; + atomic = g.atomic_1_1_10; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_14_1; + aws_sdk = g.aws_sdk_1_12_0; bitbucket_backup = g.bitbucket_backup_0_2_2; builder = g.builder_3_2_2; buildr = g.buildr_1_4_12; @@ -31,8 +31,9 @@ g: # Get dependencies from patched gems erubis = g.erubis_2_7_0; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; + execjs = g.execjs_1_4_0; fakes3 = g.fakes3_0_1_5; - faraday = g.faraday_0_8_8; + faraday = g.faraday_0_8_7; faraday_middleware = g.faraday_middleware_0_8_8; ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; @@ -45,9 +46,10 @@ g: # Get dependencies from patched gems i18n = g.i18n_0_6_4; iconv = g.iconv_1_0_3; jruby_pageant = g.jruby_pageant_1_1_1; - jsduck = g.jsduck_5_0_1; + jsduck = g.jsduck_4_10_4; json = g.json_1_8_0; json_pure = g.json_pure_1_8_0; + libv8 = g.libv8_3_11_8_17_x86_64_linux; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; @@ -57,10 +59,10 @@ g: # Get dependencies from patched gems mini_portile = g.mini_portile_0_5_1; minitar = g.minitar_0_5_3; minitest = g.minitest_4_7_5; - multi_json = g.multi_json_1_7_8; + multi_json = g.multi_json_1_7_7; multipart_post = g.multipart_post_1_2_0; - net_http_digest_auth = g.net_http_digest_auth_1_4; - net_http_persistent = g.net_http_persistent_2_9; + net_http_digest_auth = g.net_http_digest_auth_1_3; + net_http_persistent = g.net_http_persistent_2_8; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_8; nix = g.nix_0_1_1; @@ -78,11 +80,11 @@ g: # Get dependencies from patched gems rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_1_6; + ref = g.ref_1_0_5; remote_syslog = g.remote_syslog_1_6_14; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; - rkelly_remix = g.rkelly_remix_0_0_4; rmail = g.rmail_1_0_0; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; @@ -90,20 +92,19 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_10; - selenium_webdriver = g.selenium_webdriver_2_34_0; + sass = g.sass_3_2_9; + selenium_webdriver = g.selenium_webdriver_2_33_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_10_0; sprockets_rails = g.sprockets_rails_2_0_0; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; - taskjuggler = g.taskjuggler_3_5_0; - term_ansicolor = g.term_ansicolor_1_2_2; text = g.text_1_2_1; + therubyracer = g.therubyracer_0_11_4; thin = g.thin_1_5_1; thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_2; + thread_safe = g.thread_safe_0_1_0; tilt = g.tilt_1_4_1; tins = g.tins_0_8_3; treetop = g.treetop_1_4_14; @@ -120,7 +121,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { ZenTest_4_9_2 = { basename = ''ZenTest''; @@ -216,7 +217,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-4.0.0''; - requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_8 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ]; + requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ]; sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids''; }; addressable_2_3_5 = { @@ -251,16 +252,16 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick''; }; - atomic_1_1_12 = { + atomic_1_1_10 = { basename = ''atomic''; meta = { description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; homepage = ''http://github.com/headius/ruby-atomic''; longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; }; - name = ''atomic-1.1.12''; + name = ''atomic-1.1.10''; requiredGems = [ ]; - sha256 = ''038kihswmzlzsc96r3qg5g0khdg5lywjk2nz32i7l6j85lpg233v''; + sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh''; }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; @@ -296,16 +297,16 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_9_2 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - aws_sdk_1_14_1 = { + aws_sdk_1_12_0 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.14.1''; + name = ''aws-sdk-1.12.0''; requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ]; - sha256 = ''18lvxnkb7xb2q7z5ifz9j2b9v17r6fd04s83pac7598s3zj6k4na''; + sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n''; }; bitbucket_backup_0_2_2 = { basename = ''bitbucket_backup''; @@ -552,6 +553,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; + execjs_1_4_0 = { + basename = ''execjs''; + meta = { + description = ''Run JavaScript code from Ruby''; + homepage = ''https://github.com/sstephenson/execjs''; + longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; + }; + name = ''execjs-1.4.0''; + requiredGems = [ g.multi_json_1_7_7 ]; + sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs''; + }; fakes3_0_1_5 = { basename = ''fakes3''; meta = { @@ -562,15 +574,15 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; - faraday_0_8_8 = { + faraday_0_8_7 = { basename = ''faraday''; meta = { description = ''HTTP/REST API client library.''; homepage = ''https://github.com/lostisland/faraday''; }; - name = ''faraday-0.8.8''; + name = ''faraday-0.8.7''; requiredGems = [ g.multipart_post_1_2_0 ]; - sha256 = ''no hash''; + sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi''; }; faraday_middleware_0_8_8 = { basename = ''faraday_middleware''; @@ -580,7 +592,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Various middleware for Faraday''; }; name = ''faraday_middleware-0.8.8''; - requiredGems = [ g.faraday_0_8_8 ]; + requiredGems = [ g.faraday_0_8_7 ]; sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; }; ffi_1_9_0 = { @@ -735,16 +747,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; }; - jsduck_5_0_1 = { + jsduck_4_10_4 = { basename = ''jsduck''; meta = { description = ''Simple JavaScript Duckumentation generator''; homepage = ''https://github.com/senchalabs/jsduck''; longDescription = ''Documentation generator for Sencha JS frameworks''; }; - name = ''jsduck-5.0.1''; - requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ]; - sha256 = ''0py1ik9jri5f230ifqxv0y0p4w0dp5jp8a9hfzgzaz4xvpzqyf7h''; + name = ''jsduck-4.10.4''; + requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ]; + sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih''; }; json_1_8_0 = { basename = ''json''; @@ -779,6 +791,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; + libv8_3_11_8_17_x86_64_linux = { + basename = ''libv8''; + meta = { + description = ''Distribution of the V8 JavaScript engine''; + homepage = ''http://github.com/cowboyd/libv8''; + longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer''; + }; + name = ''libv8-3.11.8.17-x86_64-linux''; + requiredGems = [ ]; + sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9''; + }; locale_2_0_8 = { basename = ''locale''; meta = { @@ -836,7 +859,7 @@ submitted. Mechanize also keeps track of the sites that you have visited as a history.''; }; name = ''mechanize-2.7.1''; - requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ]; + requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ]; sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh''; }; mime_types_1_23 = { @@ -956,16 +979,16 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; }; - multi_json_1_7_8 = { + multi_json_1_7_7 = { basename = ''multi_json''; meta = { description = ''A common interface to multiple JSON libraries.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; }; - name = ''multi_json-1.7.8''; + name = ''multi_json-1.7.7''; requiredGems = [ ]; - sha256 = ''no hash''; + sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr''; }; multipart_post_1_2_0 = { basename = ''multipart_post''; @@ -978,7 +1001,7 @@ extract-method refactorings still apply.''; requiredGems = [ ]; sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; }; - net_http_digest_auth_1_4 = { + net_http_digest_auth_1_3 = { basename = ''net_http_digest_auth''; meta = { description = ''An implementation of RFC 2617 - Digest Access Authentication''; @@ -991,11 +1014,11 @@ In order to use net-http-digest_auth you'll need to perform some request wrangling on your own. See the class documentation at Net::HTTP::DigestAuth for an example.''; }; - name = ''net-http-digest_auth-1.4''; + name = ''net-http-digest_auth-1.3''; requiredGems = [ ]; - sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi''; + sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy''; }; - net_http_persistent_2_9 = { + net_http_persistent_2_8 = { basename = ''net_http_persistent''; meta = { description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8''; @@ -1011,9 +1034,9 @@ Net::HTTP supports persistent connections with some API methods but does not handle reconnection gracefully. Net::HTTP::Persistent supports reconnection and retry according to RFC 2616.''; }; - name = ''net-http-persistent-2.9''; + name = ''net-http-persistent-2.8''; requiredGems = [ ]; - sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb''; + sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -1087,7 +1110,7 @@ enough of it.''; }; name = ''nokogiri-1.6.0''; requiredGems = [ g.mini_portile_0_5_1 ]; - sha256 = ''no hash''; + sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb''; }; ntlm_http_0_1_1 = { basename = ''ntlm_http''; @@ -1108,7 +1131,7 @@ enough of it.''; longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).''; }; name = ''papertrail-0.9.7''; - requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ]; + requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ]; sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; }; papertrail_cli_0_9_3 = { @@ -1265,6 +1288,17 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; + ref_1_0_5 = { + basename = ''ref''; + meta = { + description = ''Library that implements weak, soft, and strong references in Ruby.''; + homepage = ''http://github.com/bdurand/ref''; + longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.''; + }; + name = ''ref-1.0.5''; + requiredGems = [ ]; + sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la''; + }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { @@ -1367,19 +1401,6 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; - rkelly_remix_0_0_4 = { - basename = ''rkelly_remix''; - meta = { - description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck''; - longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser -in JSDuck. - -* http://rkelly.rubyforge.org/''; - }; - name = ''rkelly-remix-0.0.4''; - requiredGems = [ ]; - sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; - }; rmail_1_0_0 = { basename = ''rmail''; meta = { @@ -1463,7 +1484,7 @@ in JSDuck. requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_2_10 = { + sass_3_2_9 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1474,20 +1495,20 @@ in JSDuck. command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.10''; + name = ''sass-3.2.9''; requiredGems = [ ]; - sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; + sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q''; }; - selenium_webdriver_2_34_0 = { + selenium_webdriver_2_33_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.34.0''; - requiredGems = [ g.multi_json_1_7_8 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; - sha256 = ''02wh008b03ixhpp853rmviq6xfk8100ka1g66wb2vsghajs6l1hx''; + name = ''selenium-webdriver-2.33.0''; + requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; + sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -1522,7 +1543,7 @@ interpreters.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.10.0''; - requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_8 g.rack_1_5_2 g.tilt_1_4_1 ]; + requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ]; sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s''; }; sprockets_rails_2_0_0 = { @@ -1557,37 +1578,6 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; - taskjuggler_3_5_0 = { - basename = ''taskjuggler''; - meta = { - description = ''A Project Management Software''; - homepage = ''http://www.taskjuggler.org''; - longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project -management tool. Its new approach to project planing and tracking is more -flexible and superior to the commonly used Gantt chart editing tools. - -TaskJuggler is project management software for serious project managers. It -covers the complete spectrum of project management tasks from the first idea -to the completion of the project. It assists you during project scoping, -resource assignment, cost and revenue planing, risk and communication -management. -''; - }; - name = ''taskjuggler-3.5.0''; - requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ]; - sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2''; - }; - term_ansicolor_1_2_2 = { - basename = ''term_ansicolor''; - meta = { - description = ''Ruby library that colors strings using ANSI escape sequences''; - homepage = ''http://flori.github.com/term-ansicolor''; - longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output''; - }; - name = ''term-ansicolor-1.2.2''; - requiredGems = [ g.tins_0_8_3 ]; - sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr''; - }; text_1_2_1 = { basename = ''text''; meta = { @@ -1599,6 +1589,17 @@ management. requiredGems = [ ]; sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z''; }; + therubyracer_0_11_4 = { + basename = ''therubyracer''; + meta = { + description = ''Embed the V8 JavaScript interpreter into Ruby''; + homepage = ''http://github.com/cowboyd/therubyracer''; + longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.''; + }; + name = ''therubyracer-0.11.4''; + requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ]; + sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq''; + }; thin_1_5_1 = { basename = ''thin''; meta = { @@ -1621,16 +1622,16 @@ management. requiredGems = [ ]; sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3''; }; - thread_safe_0_1_2 = { + thread_safe_0_1_0 = { basename = ''thread_safe''; meta = { description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; homepage = ''https://github.com/headius/thread_safe''; longDescription = ''Thread-safe collections and utilities for Ruby''; }; - name = ''thread_safe-0.1.2''; - requiredGems = [ g.atomic_1_1_12 ]; - sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; + name = ''thread_safe-0.1.0''; + requiredGems = [ g.atomic_1_1_10 ]; + sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf''; }; tilt_1_4_1 = { basename = ''tilt''; From e242ae058d88fedc8be8873d6070e8ca4cbf6e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 10 Aug 2013 14:30:53 +0200 Subject: [PATCH 163/332] virtualbox: fix extension pack hash (must be base16) --- pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 724dc6ca16e..09b6e015a93 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -34,8 +34,10 @@ let extpackRevision = "86992"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; - # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "03gsl0548hrcspl5mi7snng08phwd3vfn6qmx41h2xwvwvmv324g"; + # IMPORTANT: Hash must be base16 encoded because it's used as an input to + # VBoxExtPackHelperApp! + # Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url" + sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: From 4e8dfe71d3830ff79619b0e9096dc7202de1190d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Jul 2013 21:19:25 +0200 Subject: [PATCH 164/332] liburcu: new package liburcu is a userspace RCU (read-copy-update) library that is used by LTTng - Linux Trace Toolkit (next generation). --- .../development/libraries/liburcu/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/liburcu/default.nix diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix new file mode 100644 index 00000000000..74c6b8fa615 --- /dev/null +++ b/pkgs/development/libraries/liburcu/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.7.7"; + name = "liburcu-${version}"; + + src = fetchurl { + url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a"; + }; + + meta = with stdenv.lib; { + description = "Userspace RCU (read-copy-update) library"; + homepage = http://lttng.org/urcu; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53c3ba9ec73..bc9e0ccbc98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4860,6 +4860,8 @@ let libunique = callPackage ../development/libraries/libunique/default.nix { }; + liburcu = callPackage ../development/libraries/liburcu { }; + libusb = callPackage ../development/libraries/libusb { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple From 33d78777a3a9fb3802e4c7d5332519f921d182db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Jul 2013 21:32:12 +0200 Subject: [PATCH 165/332] lttng-ust: new package This is the user space library for LTTng. It is needed to do user space tracing, as opposed to kernel space tracing. --- .../tools/misc/lttng-ust/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/misc/lttng-ust/default.nix diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix new file mode 100644 index 00000000000..d234a7b74f8 --- /dev/null +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, liburcu }: + +# NOTE: +# ./configure ... +# [...] +# LTTng-UST will be built with the following options: +# +# Java support (JNI): Disabled +# sdt.h integration: Disabled +# [...] +# +# Debian builds with std.h (systemtap). + +stdenv.mkDerivation rec { + name = "lttng-ust-2.2.1"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; + sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla"; + }; + + buildInputs = [ liburcu ]; + + meta = with stdenv.lib; { + description = "LTTng Userspace Tracer libraries"; + homepage = http://lttng.org/; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc9e0ccbc98..d4e467267c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3542,6 +3542,8 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; + lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + mk = callPackage ../development/tools/build-managers/mk { }; neoload = callPackage ../development/tools/neoload { From 6a4f068b9eb4928ab6ae131153a3cdc98c788730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Jul 2013 21:38:23 +0200 Subject: [PATCH 166/332] lttng-tools: new package This is the Linux Trace Toolkit. Included in this package: Command-line client: lttng Tracing daemons: lttng-sessiond (automatically started by lttng) lttng-relayd (remote trace collection daemon) Userspace tracing can be done by using liblttng-ust. To do kernel tracing we also need the LTTng kernel modules. I've added a patch that changes "/sbin/modprobe" to just "modprobe". --- .../tools/misc/lttng-tools/default.nix | 23 ++++++++ ...-path-from-sbin-modprobe-to-modprobe.patch | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 78 insertions(+) create mode 100644 pkgs/development/tools/misc/lttng-tools/default.nix create mode 100644 pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix new file mode 100644 index 00000000000..9bc24b9387b --- /dev/null +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }: + +stdenv.mkDerivation rec { + name = "lttng-tools-2.2.3"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; + sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv"; + }; + + buildInputs = [ popt libuuid liburcu lttngUst ]; + + patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ]; + + meta = with stdenv.lib; { + description = "Tracing tools (kernel + user space) for Linux"; + homepage = http://lttng.org/; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch new file mode 100644 index 00000000000..7d9edbda97a --- /dev/null +++ b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch @@ -0,0 +1,53 @@ +From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= +Date: Tue, 9 Jul 2013 23:47:47 +0200 +Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe" + (rely on PATH lookup) + +--- + src/bin/lttng-sessiond/modprobe.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c +index 7e06dad..4075efe 100644 +--- a/src/bin/lttng-sessiond/modprobe.c ++++ b/src/bin/lttng-sessiond/modprobe.c +@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void) + + for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) { + ret = snprintf(modprobe, sizeof(modprobe), +- "/sbin/modprobe -r -q %s", ++ "modprobe -r -q %s", + kern_modules_control[i].name); + if (ret < 0) { + PERROR("snprintf modprobe -r"); +@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void) + + for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) { + ret = snprintf(modprobe, sizeof(modprobe), +- "/sbin/modprobe -r -q %s", ++ "modprobe -r -q %s", + kern_modules_list[i].name); + if (ret < 0) { + PERROR("snprintf modprobe -r"); +@@ -169,7 +169,7 @@ int modprobe_lttng_control(void) + + for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) { + ret = snprintf(modprobe, sizeof(modprobe), +- "/sbin/modprobe %s%s", ++ "modprobe %s%s", + kern_modules_control[i].required ? "" : "-q ", + kern_modules_control[i].name); + if (ret < 0) { +@@ -205,7 +205,7 @@ int modprobe_lttng_data(void) + + for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) { + ret = snprintf(modprobe, sizeof(modprobe), +- "/sbin/modprobe %s%s", ++ "modprobe %s%s", + kern_modules_list[i].required ? "" : "-q ", + kern_modules_list[i].name); + if (ret < 0) { +-- +1.8.2.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4e467267c6..f47dcb40886 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3542,6 +3542,8 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; + lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + lttngUst = callPackage ../development/tools/misc/lttng-ust { }; mk = callPackage ../development/tools/build-managers/mk { }; From 1eb38f2ccb02f9a92d7206e1218d113415239244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Jul 2013 21:41:34 +0200 Subject: [PATCH 167/332] babeltrace: new package Babeltrace is a command-line tool and library to read and convert LTTng tracefiles. Give it a (binary) trace file/dir path and it will print a human readable event log to standard out. --- .../tools/misc/babeltrace/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/misc/babeltrace/default.nix diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix new file mode 100644 index 00000000000..d19bb24eb37 --- /dev/null +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }: + +stdenv.mkDerivation rec { + name = "babeltrace-1.1.1"; + + src = fetchurl { + url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; + sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz"; + }; + + buildInputs = [ pkgconfig glib libuuid popt ]; + + meta = with stdenv.lib; { + description = "Command-line tool and library to read and convert LTTng tracefiles"; + homepage = http://www.efficios.com/babeltrace; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f47dcb40886..d7f7a9b467b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3302,6 +3302,8 @@ let avarice = callPackage ../development/tools/misc/avarice { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; + bam = callPackage ../development/tools/build-managers/bam {}; binutils = callPackage ../development/tools/misc/binutils { From 5a3a82d81c6447eb25210adbc145ecf01edf54ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 6 Jul 2013 10:56:42 +0200 Subject: [PATCH 168/332] lttv: new package Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace files. (An alternative to this program is the LTTng plugin for the Eclipse IDE.) --- pkgs/development/tools/misc/lttv/default.nix | 23 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/lttv/default.nix diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix new file mode 100644 index 00000000000..df9f81d02e6 --- /dev/null +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }: + +stdenv.mkDerivation rec { + name = "lttv-1.5-beta1"; + + src = fetchurl { + url = "http://lttng.org/files/packages/${name}.tar.bz2"; + sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc"; + }; + + buildInputs = [ pkgconfig glib gtk2 popt babeltrace ]; + + meta = with stdenv.lib; { + description = "Graphical trace viewer for LTTng trace files"; + homepage = http://lttng.org/; + # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. + # The rest of the LTTV package is distributed under the GNU GPL v2. + license = with licenses; [ gpl2 lgpl21 ]; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7f7a9b467b..d2f6a3b5211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3548,6 +3548,8 @@ let lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + lttv = callPackage ../development/tools/misc/lttv { }; + mk = callPackage ../development/tools/build-managers/mk { }; neoload = callPackage ../development/tools/neoload { From 70ea99cfa8e75ae2efa2a4cbc37ee8c20ea6fa72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 4 Jul 2013 22:34:32 +0200 Subject: [PATCH 169/332] lttng-modules: new package Add linux kernel modules needed to do kernel tracing with LTTng. To make them available to lttng in NixOS, add this to configuration.nix: boot.extraModulePackages = [ pkgs.linuxPackages.lttngModules ]; --- .../linux/lttng-modules/default.nix | 31 +++++++++++++++++ .../lttng-fix-build-error-on-linux-3.2.patch | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/os-specific/linux/lttng-modules/default.nix create mode 100644 pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix new file mode 100644 index 00000000000..ee80b7632ba --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, kernelDev }: + +stdenv.mkDerivation rec { + pname = "lttng-modules-2.2.1"; + name = "${pname}-${kernelDev.version}"; + + src = fetchurl { + url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2"; + sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2"; + }; + + patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ]; + + preConfigure = '' + export KERNELDIR="${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build" + export INSTALL_MOD_PATH="$out" + ''; + + installPhase = '' + make modules_install + ''; + + meta = with stdenv.lib; { + description = "Linux kernel modules for LTTng tracing"; + homepage = http://lttng.org/; + license = with licenses; [ lgpl21 gpl2 mit ]; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + +} diff --git a/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch new file mode 100644 index 00000000000..dfe6d21be84 --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch @@ -0,0 +1,33 @@ +When building against linux 3.2, we get this build error: + + building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o + CC [M] /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o + In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0, + from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148, + from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868, + from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48: + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op': + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage': + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type + /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type + +because a check for existing ext3/*h files in the kernel build tree is skipped +for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run +when building against linux >= 3.2 (not only linux >= 3.4). + +diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile +--- lttng-modules-2.2.0.orig/probes/Makefile 2013-06-19 03:22:44.000000000 +0200 ++++ lttng-modules-2.2.0/probes/Makefile 2013-07-06 13:22:15.902957717 +0200 +@@ -59,7 +59,7 @@ + ext3_dep_check = $(wildcard $(ext3_dep)) + ext3 = $(shell \ + if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \ +- if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \ ++ if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \ + -z "$(ext3_dep_check)" ] ; then \ + echo "warn" ; \ + exit ; \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2f6a3b5211..7c2e3647816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6521,6 +6521,8 @@ let iwlwifi4965ucode = iwlwifi4965ucodeV2; + lttngModules = callPackage ../os-specific/linux/lttng-modules { }; + atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; From cf4e29b916bd8b597ff6748cc6f057e5cf43d86f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 10 Aug 2013 15:06:01 +0200 Subject: [PATCH 170/332] Add pycurl2, a Python interface to libcurl --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53128c6bb2a..ac68c66546e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3818,6 +3818,26 @@ pythonPackages = modules // rec { }; }); + + pycurl2 = buildPythonPackage (rec { + name = "pycurl2-7.20.0"; + + src = fetchgit { + url = "https://github.com/Lispython/pycurl.git"; + rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13"; + sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld"; + }; + + buildInputs = [ pkgs.curl simplejson unittest2 nose ]; + + meta = { + homepage = https://pypi.python.org/pypi/pycurl2; + description = "A fork from original PycURL library that no maintained from 7.19.0"; + platforms = stdenv.lib.platforms.linux; + }; + }); + + pydot = buildPythonPackage rec { name = "pydot-1.0.2"; From 46d887aca90f7054e254badcb99060c5b6d08cd5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 10 Aug 2013 15:26:07 +0200 Subject: [PATCH 171/332] pythonPackages: fix carbon, move dependecies to propagated build inputs --- pkgs/top-level/python-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53128c6bb2a..d90df47bb6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6395,8 +6395,7 @@ pythonPackages = modules // rec { sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg"; }; - buildInputs = [ txamqp zope_interface twisted ]; - propagatedBuildInputs = [ whisper ]; + propagatedBuildInputs = [ whisper txamqp zope_interface twisted ]; # error: invalid command 'test' doCheck = false; From 15637cf207bf8fe693e4de1f4c8ee73a6d664898 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 10 Aug 2013 21:00:14 +0400 Subject: [PATCH 172/332] Add HTTPS support to Midori --- pkgs/applications/networking/browsers/midori/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index b15c05c7b49..4d561737d27 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -12,6 +12,7 @@ let gtksourceview pkgconfig which gettext makeWrapper file libidn sqlite docutils libnotify libsoup vala kbproto xproto scrnsaverproto libXScrnSaver dbus_glib + glib_networking ]; in rec { @@ -34,7 +35,11 @@ rec { shebangsHere = (doPatchShebangs "."); shebangsInstalled = (doPatchShebangs "$out/bin"); - wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); + wrapWK = (makeManyWrappers "$out/bin/*" + '' + --set WEBKIT_IGNORE_SSL_ERRORS 1 \ + --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" + ''); name = "midori-${version}.${release}"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c2e3647816..4c573ceebf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8015,7 +8015,7 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify - vala dbus_glib; + vala dbus_glib glib_networking; inherit gtk3 glib; inherit (gnome) gtksourceview; inherit (webkit.passthru.args) libsoup; From 3065a7686bfb247b0ddca9967a38ffdb6ed57b32 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 10 Aug 2013 20:07:36 +0300 Subject: [PATCH 173/332] torbutton: package version 1.6.1 --- pkgs/tools/security/torbutton/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/security/torbutton/default.nix diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix new file mode 100644 index 00000000000..348d96b0024 --- /dev/null +++ b/pkgs/tools/security/torbutton/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, zip }: +stdenv.mkDerivation rec { + + name = "torbutton-${version}.xpi"; + version = "1.6.1"; + + src = fetchgit { + url = https://git.torproject.org/torbutton.git; + rev = "refs/tags/${version}"; + sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv"; + }; + + buildInputs = [ zip ]; + + buildPhase = '' + mkdir pkg + ./makexpi.sh + ''; + + installPhase = "cat pkg/*.xpi > $out"; + + meta = with stdenv.lib; { + homepage = https://www.torproject.org/torbutton/; + description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content."; + license = licenses.mit; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c573ceebf9..2488f3339f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1788,6 +1788,8 @@ let tor = callPackage ../tools/security/tor { }; + torbutton = callPackage ../tools/security/torbutton { }; + torsocks = callPackage ../tools/security/tor/torsocks.nix { }; trickle = callPackage ../tools/networking/trickle {}; From f3cae400e04c7432188bc69a36c8cd652d022b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 10 Aug 2013 20:26:35 +0200 Subject: [PATCH 174/332] unclutter: add to channel --- pkgs/tools/misc/unclutter/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 8cf31ff7208..b267074e77f 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man ''; - meta = { + meta = with stdenv.lib; { description = "Hides mouse pointer while not in use."; longDescription = '' Unclutter hides your X mouse cursor when you do not need it, to prevent @@ -28,5 +28,7 @@ stdenv.mkDerivation { unclutter -idle 1 & ''; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.unix; }; } From 094ffb2b08d20f1b20aa62dd87921dc3ed7cbb4e Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 11:00:45 +0800 Subject: [PATCH 175/332] add orc 0.4.17 --- pkgs/development/compilers/orc/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/compilers/orc/default.nix diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix new file mode 100644 index 00000000000..25abd8f3e85 --- /dev/null +++ b/pkgs/development/compilers/orc/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "orc-0.4.17"; + + src = fetchurl { + url = "http://code.entropywave.com/download/orc/${name}.tar.gz"; + sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg"; + }; + + meta = { + description = "The Oil Runtime Compiler"; + homepage = "http://code.entropywave.com/orc/"; + platform = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2488f3339f5..0080661c1d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2763,6 +2763,8 @@ let ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; + orc = callPackage ../development/compilers/orc { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; From 4705462a2ff49fd4434be68c5054dd837b55d3a0 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 11:15:07 +0800 Subject: [PATCH 176/332] add libvisual 0.4.0 --- .../libraries/libvisual/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libvisual/default.nix diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix new file mode 100644 index 00000000000..b831fd9bdd3 --- /dev/null +++ b/pkgs/development/libraries/libvisual/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "libvisual-0.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/libvisual/${name}.tar.gz"; + sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; + }; + + buildInputs = [ pkgconfig glib ]; + + meta = { + description = "An abstraction library for audio visualisations"; + homepage = "http://sourceforge.net/projects/libvisual/"; + license = stdenv.lib.licenses.lgpl21Plus; + platform = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2488f3339f5..f4b5a7149e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4898,6 +4898,8 @@ let libvisio = callPackage ../development/libraries/libvisio { }; + libvisual = callPackage ../development/libraries/libvisual { }; + libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; inherit (xlibs) xproto libX11 damageproto libXdamage From 8e023d078cb2071edf2f5fd9fa5f9308ad05e5e3 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 12:07:57 +0800 Subject: [PATCH 177/332] orc: add missing license (bsd3) --- pkgs/development/compilers/orc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 25abd8f3e85..fbb25effdec 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "The Oil Runtime Compiler"; homepage = "http://code.entropywave.com/orc/"; + license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; }; } From d068505b2f2c00f9a2491f2d648b302e30f025e3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 11 Aug 2013 07:59:30 +0300 Subject: [PATCH 178/332] leiningen: fix hash --- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index d7f819c45f6..d041dbb5861 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "1higd309b43lly7fv1pd5lfd3lyrij95nrzklqmk8vf9llw6974p"; + sha256 = "04xmnw80f39qs2vfm5ic8bmhks1fvasiwg4snckg2zhfjkhzms05"; }; patches = ./lein_2.3.0.patch; From 5f4fc730b12aba77bf02abeb494e45640192804b Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 11 Aug 2013 15:14:12 +0800 Subject: [PATCH 179/332] add myself to maintainers list, keep it sorted orc: add myself as a maintainer --- pkgs/development/compilers/orc/default.nix | 1 + pkgs/lib/maintainers.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index fbb25effdec..c7582d0a90d 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { homepage = "http://code.entropywave.com/orc/"; license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iyzsong ]; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index ab76e2018c0..354bf39aea5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -24,9 +24,10 @@ goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; iElectric = "Domen Kozar "; - lovek323 = "Jason O'Conal "; + iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; + lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; From 50021ebb0a94d4dec5752dfea3e58b02c55f16af Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 11 Aug 2013 12:05:02 +0200 Subject: [PATCH 180/332] pythonPackages: fix graphite_web, make it usable --- pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7c686addb9..95a7b4195e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1627,6 +1627,26 @@ pythonPackages = modules // rec { }; + django_tagging = buildPythonPackage rec { + name = "django-tagging-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz"; + md5 = "a0855f2b044db15f3f8a025fa1016ddf"; + }; + + # error: invalid command 'test' + doCheck = false; + + propagatedBuildInputs = [ django_1_3 ]; + + meta = { + description = "A generic tagging application for Django projects"; + homepage = http://code.google.com/p/django-tagging/; + }; + }; + + djblets = buildPythonPackage rec { name = "Djblets-0.6.28"; @@ -6475,7 +6495,19 @@ pythonPackages = modules // rec { sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag"; }; - buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ]; + propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; + + postInstall = '' + wrapProgram $out/bin/run-graphite-devel-server.py \ + --prefix PATH : ${pkgs.which}/bin + ''; + + preConfigure = '' + substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo' + substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')" + cp webapp/graphite/manage.py bin/manage-graphite.py + substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings' + ''; # error: invalid command 'test' doCheck = false; From 1866619acc6bb163e4cc60b37333e9119a30a226 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 11 Aug 2013 10:47:09 +0000 Subject: [PATCH 181/332] Fix a few typos --- doc/stdenv.xml | 2 +- maintainers/docs/cross.txt | 6 +++--- pkgs/build-support/fetchmtn/builder.sh | 2 +- pkgs/development/libraries/libxml2/setup-hook.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 7bcbadd8ea9..f0cabe425a3 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -6,7 +6,7 @@ The standard build environment in the Nix Packages collection -provides a environment for building Unix packages that does a lot of +provides an environment for building Unix packages that does a lot of common build tasks automatically. In fact, for Unix packages that use the standard ./configure; make; make install build interface, you don’t need to write a build script at all; the standard diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt index 32e09086b87..9c117774fc4 100644 --- a/maintainers/docs/cross.txt +++ b/maintainers/docs/cross.txt @@ -41,7 +41,7 @@ NB: Keep in mind that many programs are not very well suited for cross compilation. Either they are not intended to run on other platforms, -because the code is highly platform specific, or the configuration proces +because the code is highly platform specific, or the configuration process is not written with cross compilation in mind. Nix will not solve these problems for you! @@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux are "patch", "make" and "wget". If we want to build C++ programs it gets a lot more difficult. GCC has a -three step compilation proces. In the first step a simple compiler, called +three step compilation process. In the first step a simple compiler, called xgcc, that can compile only C programs is built. With that compiler it compiles itself two more times: one time to build a full compiler, and another time to build a full compiler once again with the freshly built compiler from @@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix. --- -After succesfully completing the whole toolchain you can start building +After successfully completing the whole toolchain you can start building packages with the newly built tools. To make everything build correctly you will need a stdenv for your target platform. Setting up this platform will take some effort. Right now there is a very experimental setup for diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh index 4e34aad052b..c1b0db895bc 100644 --- a/pkgs/build-support/fetchmtn/builder.sh +++ b/pkgs/build-support/fetchmtn/builder.sh @@ -24,7 +24,7 @@ for source in $dbs; do echo "selector $selector does not match any revision"; fi else - echo "pulling branch $branch wasn't succesfull"; + echo "pulling branch $branch wasn't successful"; fi; if test -n "$done"; then break; diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index f8e4f5e0fd6..112dbe0c513 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -11,7 +11,7 @@ addXMLCatalogs () { if test -z "$libxmlHookDone"; then libxmlHookDone=1 - # Set http_proxy and ftp_proxy to a invalid host to prevent + # Set http_proxy and ftp_proxy to an invalid host to prevent # xmllint and xsltproc from trying to download DTDs from the # network even when --nonet is not given. That would be impure. # (Note that .invalid is a reserved domain guaranteed not to From 1cdc07296da25beb824991db2b5801b96e6877ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Aug 2013 14:29:40 +0200 Subject: [PATCH 182/332] update deform,colander,translationstring python modules --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95a7b4195e4..5cfa7b94353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -808,11 +808,11 @@ pythonPackages = modules // rec { colander = buildPythonPackage rec { - name = "colander-0.9.6"; + name = "colander-1.0a5"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; - md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6"; + md5 = "569dea523561f5d94338ef9d9a98d249"; }; propagatedBuildInputs = [ pythonPackages.translationstring ]; @@ -1005,11 +1005,11 @@ pythonPackages = modules // rec { deform = buildPythonPackage rec { - name = "deform-0.9.4"; + name = "deform-0.9.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; - md5 = "2ed7b69644a6d8f4e1404e1892329240"; + md5 = "d450eef05432d473257da5621c72c8b7"; }; buildInputs = [] ++ optional isPy26 unittest2; @@ -1020,6 +1020,9 @@ pythonPackages = modules // rec { pythonPackages.colander pythonPackages.translationstring pythonPackages.chameleon + pythonPackages.zope_deprecation + pythonPackages.coverage + pythonPackages.nose ]; meta = { @@ -1394,6 +1397,8 @@ pythonPackages = modules // rec { }; + + zope_deprecation = buildPythonPackage rec { name = "zope.deprecation-3.5.0"; @@ -6328,11 +6333,11 @@ pythonPackages = modules // rec { }; translationstring = buildPythonPackage rec { - name = "translationstring-0.4"; + name = "translationstring-1.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz"; - md5 = "392287923c475b660b7549b2c2f03dbc"; + md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; }; meta = { From 078213e892bc1bfbcc47815b7e598d0047de8ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 11 Aug 2013 14:50:55 +0200 Subject: [PATCH 183/332] orc: add a comment about the license --- pkgs/development/compilers/orc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index c7582d0a90d..c5fe46f02c6 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { meta = { description = "The Oil Runtime Compiler"; homepage = "http://code.entropywave.com/orc/"; + # The source code implementing the Marsenne Twister algorithm is licensed + # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.license.bsd3; platform = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iyzsong ]; From 12f7c0666a8e2736ad894c6124ef8d8fb812f841 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 11 Aug 2013 10:21:46 +0000 Subject: [PATCH 184/332] qgit version bump from 2.3 to 2.5 --- .../version-management/git-and-tools/qgit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 963f4dd295b..d92b49b9ef6 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, qt, libXext, libX11}: stdenv.mkDerivation rec { - name = "qgit-2.3"; + name = "qgit-2.5"; meta = { license = "GPLv2"; - homepage = "http://digilander.libero.it/mcostalba/"; + homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; inherit (qt.meta) platforms; }; src = fetchurl { - url = "mirror://sourceforge/qgit/${name}.tar.bz2"; - sha256 = "a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64"; + url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz"; + sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499"; }; buildInputs = [qt libXext libX11]; configurePhase = "qmake PREFIX=$out"; From 94105045b4882f2c20bc4328e93144bb550c5252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 11 Aug 2013 17:12:12 +0200 Subject: [PATCH 185/332] typo --- pkgs/development/compilers/orc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index c5fe46f02c6..10945934d00 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = "http://code.entropywave.com/orc/"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. - license = stdenv.lib.license.bsd3; + license = stdenv.lib.licenses.bsd3; platform = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iyzsong ]; }; From 81db5cfe0afacda09843ccae3e0eebe072688699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 11 Aug 2013 20:35:44 +0200 Subject: [PATCH 186/332] lttng-modules: don't use licenses.mit because it breaks hydra evaluation Hydra has these evaluation errors: at `nixpkgs.linuxPackages.lttngModules.i686-linux' [nixosSrc = ..., nixpkgs = ..., officialRelease = false]: value is an attribute set while a string was expected because licenses.mit is an attribute set and not a string. TODO: Licenses in pkgs/lib/licenses.nix are a mix of attr sets and strings, this needs to be standardized. --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index ee80b7632ba..7495deb231d 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; homepage = http://lttng.org/; - license = with licenses; [ lgpl21 gpl2 mit ]; + # TODO: Add "mit" to the license list once the license attr set vs string + # decision has been made. (Having "mit" there breaks hydra evaluation.) + license = with licenses; [ lgpl21 gpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From b5b53e250bd138bbd929284cd83e3408b35d9036 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:13 +0200 Subject: [PATCH 187/332] haskell-elm-server: update to version 0.9 --- pkgs/development/compilers/elm/elm-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index f86c6688eb8..5f33b49173e 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "elm-server"; - version = "0.8"; - sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald"; + version = "0.9"; + sha256 = "1mk2ligv8has1ssmpild2dq23ld84cdayr6bm3ycg11jab0hrbsx"; isLibrary = false; isExecutable = true; buildDepends = [ From 8a093803834666f6a213c29ab7ac7a24eb79ac6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:13 +0200 Subject: [PATCH 188/332] haskell-Elm: update to version 0.9.0.1 --- pkgs/development/compilers/elm/elm.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 8196458c70d..95b4b1cd4ec 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -1,17 +1,16 @@ -{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin -, indents, json, mtl, pandoc, parsec, shakespeare, text -, transformers +{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin +, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate }: cabal.mkDerivation (self: { pname = "Elm"; - version = "0.8.0.3"; - sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb"; + version = "0.9.0.1"; + sha256 = "0p6sqfrf11xpgj7y81hsjbvsyyyfvc4nzcg6gmfwyqkg3qc3yg6v"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json - mtl pandoc parsec shakespeare text transformers + binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl + pandoc parsec transformers unionFind uniplate ]; meta = { homepage = "http://elm-lang.org"; From 0a77a99c577fdbe9ab9587d6b869950ba3de1c43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:13 +0200 Subject: [PATCH 189/332] haskell-bindings-posix: update to version 1.2.6 --- pkgs/development/libraries/haskell/bindings-posix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 23994140d6c..8bdf30e36d1 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bindings-posix"; - version = "1.2.3"; - sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; + version = "1.2.6"; + sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff"; buildDepends = [ bindingsDSL ]; meta = { description = "Low level bindings to posix"; From 668c691afb1bd578a1ca7a987c9c2eb9e89eb151 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 190/332] haskell-diagrams-cairo: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index bc2abf5c16d..a73b6d9fba8 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "0.6"; - sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil"; + version = "0.7"; + sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy"; buildDepends = [ cairo cmdargs colour diagramsCore diagramsLib filepath mtl split time From e472833ceece52b91a11c542c6ff94523a33d793 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 191/332] haskell-diagrams-contrib: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 141a820b5d1..023ac090681 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6.1"; - sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi"; + version = "0.7"; + sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac"; buildDepends = [ arithmoi circlePacking colour dataDefault diagramsCore diagramsLib forceLayout lens MonadRandom mtl split vectorSpace From 1a48ac3b50838a1f4f9bc7b39711cd9895dc3f61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 192/332] haskell-diagrams-core: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index ed23b092b02..c2dbb27aebd 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.6.0.2"; - sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85"; + version = "0.7"; + sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq"; buildDepends = [ dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From 255abace30dae49e7526d2a84e1ea5c772072c65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 193/332] haskell-diagrams: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 6f201e7cd85..84d3d9bbf48 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "diagrams"; - version = "0.6"; - sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh"; + version = "0.7"; + sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c"; buildDepends = [ diagramsContrib diagramsCore diagramsLib diagramsSvg ]; From cfe56579e5ef81c50f4ba35b5eca66ba7470666e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 194/332] haskell-diagrams-lib: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 73c7ff8f8c4..50afb16f282 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,14 +1,15 @@ -{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras -, newtype, NumInstances, semigroups, vectorSpace +{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree +, intervals, monoidExtras, newtype, NumInstances, semigroups +, vectorSpace }: cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.6.0.3"; - sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1"; + version = "0.7"; + sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j"; buildDepends = [ - active colour dataDefault diagramsCore monoidExtras newtype - NumInstances semigroups vectorSpace + active colour dataDefaultClass diagramsCore fingertree intervals + monoidExtras newtype NumInstances semigroups vectorSpace ]; meta = { homepage = "http://projects.haskell.org/diagrams"; From bb05fc78ab7dfc556f9907fbb0250050a66c544f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 195/332] haskell-diagrams-svg: update to version 0.7 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 561f32118c2..644037e946e 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "0.6.0.1"; - sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk"; + version = "0.7"; + sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x"; buildDepends = [ blazeSvg cmdargs colour diagramsCore diagramsLib filepath monoidExtras mtl split time vectorSpace From bd40d4aa2ca1a1985166aa9c01a065402ed487fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 196/332] haskell-github: update to version 0.7.1 --- pkgs/development/libraries/haskell/github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 78711cc7c44..511b1b70f28 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.7.0"; - sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p"; + version = "0.7.1"; + sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure HTTP httpConduit httpTypes network text time unorderedContainers vector From af90db8e24c8159f60603e3c6f901f5f97460a6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 197/332] haskell-hakyll: update to version 4.3.3.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 766f56ee8e3..f3f2562a073 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.3.1.0"; - sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5"; + version = "4.3.3.0"; + sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n"; isLibrary = true; isExecutable = true; buildDepends = [ From a0cb696441d9085228db42cda765a39675e8217e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 198/332] haskell-hastache: update to version 0.5.1 --- pkgs/development/libraries/haskell/hastache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index 15d32de346d..c864c7e0a5f 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hastache"; - version = "0.5.0"; - sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8"; + version = "0.5.1"; + sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3"; buildDepends = [ blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; From aab1fed9181b0332bd9bc78618f48ee2a238f6ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 199/332] haskell-postgresql-simple: update to version 0.3.5.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 1ae1737e4b2..2b99bb2eb6c 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.3.4.0"; - sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs"; + version = "0.3.5.0"; + sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From a2ec6565d43bdae8748a9709a0d950c45e442cfb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 200/332] haskell-stm-conduit: update to version 2.1.2 --- 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 24af3f8b734..a2da329121b 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 = "2.1.1"; - sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr"; + version = "2.1.2"; + sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k"; buildDepends = [ async conduit monadControl resourcet stm stmChans transformers ]; From 669cb32bae61fa5218dce21f656d1e9a66f29061 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 201/332] haskell-texmath: update to version 0.6.3 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 8082e77d282..ec8ccd01054 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.5"; - sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348"; + version = "0.6.3"; + sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 173d4aac67321b59aa59e5038f08698ddac8512c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:14 +0200 Subject: [PATCH 202/332] haskell-cabal-ghci: update to version 0.3 --- pkgs/development/tools/haskell/cabal-ghci/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index 4676850fd93..dee25727384 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "cabal-ghci"; - version = "0.2.1"; - sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r"; + version = "0.3"; + sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal filepath ]; meta = { - homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki"; + homepage = "http://github.com/atnnn/cabal-ghci"; description = "Set up ghci with options taken from a .cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 30cb6ebdd1b82aa4ae5f964d073ab48006f76640 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:37:41 +0200 Subject: [PATCH 203/332] haskell-monoid-extras: update to version 0.3.0.0 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index a0ba1fd9856..969ab8bd0b8 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.2.2.3"; - sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax"; + version = "0.3.0.0"; + sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087"; buildDepends = [ semigroups ]; meta = { description = "Various extra monoid-related definitions and utilities"; From 60a58dda25d35b4de7f35179bd7fde2e2724504d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:52:01 +0200 Subject: [PATCH 204/332] haskell-crypto-cipher-tests: add version 0.0.1 --- .../haskell/crypto-cipher-tests/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix new file mode 100644 index 00000000000..60b4d3bad8f --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -0,0 +1,20 @@ +{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck +, securemem, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "crypto-cipher-tests"; + version = "0.0.1"; + sha256 = "1g5rxx07s23pr0vam0bjlp3qwxzqa3m6x6gbv88fhkmbqwxiq2fh"; + buildDepends = [ + byteable cryptoCipherTypes HUnit mtl QuickCheck securemem + testFramework testFrameworkHunit testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; + description = "Generic cryptography cipher tests"; + 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 56997382054..11e48aaeade 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -756,6 +756,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {}; + cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {}; + cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {}; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; From 070020947896684a3d974a3c8eb06b4cc6c887ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:52:22 +0200 Subject: [PATCH 205/332] haskell-crypto-cipher-types: add version 0.0.1 --- .../haskell/crypto-cipher-types/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-cipher-types/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix new file mode 100644 index 00000000000..14edcbc99cb --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -0,0 +1,20 @@ +{ cabal, byteable, HUnit, mtl, QuickCheck, securemem, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "crypto-cipher-types"; + version = "0.0.1"; + sha256 = "0brwb6awni3jm152vi68saz6gla7kgwf2pfjalzqsi8qjpjbzgpj"; + buildDepends = [ byteable securemem ]; + testDepends = [ + byteable HUnit mtl QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; + description = "Generic cryptography cipher types"; + 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 11e48aaeade..4e159d6a6e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -758,6 +758,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {}; + cryptoCipherTypes = callPackage ../development/libraries/haskell/crypto-cipher-types {}; + cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {}; cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; From ea27769a6138d39473743440e1bff60f33db135c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:52:33 +0200 Subject: [PATCH 206/332] haskell-securemem: add version 0.1.2 --- .../libraries/haskell/securemem/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/securemem/default.nix diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix new file mode 100644 index 00000000000..cc031470593 --- /dev/null +++ b/pkgs/development/libraries/haskell/securemem/default.nix @@ -0,0 +1,14 @@ +{ cabal, byteable }: + +cabal.mkDerivation (self: { + pname = "securemem"; + version = "0.1.2"; + sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh"; + buildDepends = [ byteable ]; + meta = { + homepage = "http://github.com/vincenthz/hs-securemem"; + description = "abstraction to an auto scrubbing and const time eq, memory chunk"; + 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 4e159d6a6e1..aa43c45cfa5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1755,6 +1755,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); scotty = callPackage ../development/libraries/haskell/scotty {}; + securemem = callPackage ../development/libraries/haskell/securemem {}; + sendfile = callPackage ../development/libraries/haskell/sendfile {}; semigroups = callPackage ../development/libraries/haskell/semigroups {}; From 185439ca5f283245f8f524bd85340de634a501ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 18:55:50 +0200 Subject: [PATCH 207/332] haskell-crypto-cipher-types: disable test suite https://github.com/vincenthz/hs-crypto-cipher/issues/29 --- .../libraries/haskell/crypto-cipher-types/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index 14edcbc99cb..daa75817673 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { byteable HUnit mtl QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Generic cryptography cipher types"; From de35a6dbb9f1c91f9738078746434bf56eb06535 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Thu, 8 Aug 2013 15:43:45 +0200 Subject: [PATCH 208/332] Export ghci config files for ghc-vis and ghc-heap-view --- pkgs/development/compilers/ghc/with-packages.nix | 5 +++++ pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 4 ++++ pkgs/development/libraries/haskell/ghc-vis/default.nix | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 99e91901d00..e3cc71bbccf 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -76,6 +76,11 @@ stdenv.mkDerivation rec { ln -s $f $out/share/emacs/site-lisp/ echo -n . done + for f in "$currentPath/share/ghci/"*; do + mkdir -p $out/share/ghci + ln -s $f $out/share/ghci/ + echo -n . + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 62b07030a46..24520869551 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -5,6 +5,10 @@ cabal.mkDerivation (self: { version = "0.5.1"; sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; buildDepends = [ binary transformers ]; + postInstall = '' + ensureDir "$out/share/ghci" + ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" + ''; meta = { description = "Extract the heap representation of Haskell values and thunks"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 856ec810463..91715894971 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -10,6 +10,10 @@ cabal.mkDerivation (self: { cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot ]; + postInstall = '' + ensureDir "$out/share/ghci" + ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" + ''; meta = { homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; From e8002fadf04244306c3c3e0b469263f4785fdf36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 19:18:43 +0200 Subject: [PATCH 209/332] haskell-c2hs: update to version 0.16.5 --- pkgs/development/libraries/haskell/c2hs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index 6ad4db61cfd..90fb53051e2 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.16.4"; - sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi"; + version = "0.16.5"; + sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y"; isLibrary = false; isExecutable = true; buildDepends = [ filepath languageC ]; meta = { - homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/"; + homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; From 92a9b2ab831599cfd562cfdc69df6daf8913f254 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 19:18:43 +0200 Subject: [PATCH 210/332] haskell-cabal2nix: update to version 1.53 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 05dcb2aa119..29585256216 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.52"; - sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s"; + version = "1.53"; + sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 35221e2be3129f957004e266018665edbc197f92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 19:20:18 +0200 Subject: [PATCH 211/332] haskell-intervals: add version 0.2.2 --- .../libraries/haskell/intervals/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/intervals/default.nix diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix new file mode 100644 index 00000000000..3cc44b05dbb --- /dev/null +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -0,0 +1,14 @@ +{ cabal, numericExtras }: + +cabal.mkDerivation (self: { + pname = "intervals"; + version = "0.2.2"; + sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q"; + buildDepends = [ numericExtras ]; + meta = { + homepage = "http://github.com/ekmett/intervals"; + description = "Interval Arithmetic"; + 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 aa43c45cfa5..400975cbab4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1277,6 +1277,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); instantGenerics = callPackage ../development/libraries/haskell/instant-generics {}; + intervals = callPackage ../development/libraries/haskell/intervals {}; + ioChoice = callPackage ../development/libraries/haskell/io-choice {}; IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; From db322400dfa834621efb4abe34b82f0e674d5b4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 19:25:32 +0200 Subject: [PATCH 212/332] haskell-tls-extra: jailbreak to fix build with recent versions of cipher-aes --- pkgs/development/libraries/haskell/tls-extra/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index b53b948c41d..55b2582017c 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { certificate cipherAes cipherRc4 cryptohash cryptoPubkey cryptoRandomApi mtl network pem text time tls vector ]; + jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS extra default values and helpers"; From 39f336b92f01867aef86078cb381ea9f4a838acd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 19:31:20 +0200 Subject: [PATCH 213/332] haskell-numeric-extras: add version 0.0.3 --- .../libraries/haskell/numeric-extras/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/numeric-extras/default.nix diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix new file mode 100644 index 00000000000..76783dceb49 --- /dev/null +++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "numeric-extras"; + version = "0.0.3"; + sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg"; + meta = { + homepage = "http://github.com/ekmett/numeric-extras"; + description = "Useful tools from the C standard library"; + 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 400975cbab4..be9d8f415fc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1509,6 +1509,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); nonNegative = callPackage ../development/libraries/haskell/non-negative {}; + numericExtras = callPackage ../development/libraries/haskell/numeric-extras {}; + numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; NumInstances = callPackage ../development/libraries/haskell/NumInstances {}; From 9547cdaadc4bb9b5340454032988cc1dc5300a14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 21:47:01 +0200 Subject: [PATCH 214/332] haskell-language-c: drop obsolete version 0.3.2.1 --- .../libraries/haskell/language-c/0.3.2.1.nix | 16 ---------------- .../language-c/{0.4.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++------ 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/language-c/0.3.2.1.nix rename pkgs/development/libraries/haskell/language-c/{0.4.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix deleted file mode 100644 index 154bc68c3c5..00000000000 --- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, alex, filepath, happy, syb }: - -cabal.mkDerivation (self: { - pname = "language-c"; - version = "0.3.2.1"; - sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx"; - buildDepends = [ filepath syb ]; - buildTools = [ alex happy ]; - meta = { - homepage = "http://www.sivity.net/projects/language.c/"; - description = "Analysis and generation of C code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-c/0.4.2.nix rename to pkgs/development/libraries/haskell/language-c/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be9d8f415fc..79045f14831 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -647,9 +647,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {}; - c2hs = callPackage ../development/libraries/haskell/c2hs { - languageC = self.languageC_0_3_2_1; - }; + c2hs = callPackage ../development/libraries/haskell/c2hs {}; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; @@ -1314,9 +1312,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); knob = callPackage ../development/libraries/haskell/knob {}; - languageC_0_4_2 = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {}; - languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {}; - languageC = self.languageC_0_4_2; + languageC = callPackage ../development/libraries/haskell/language-c {}; languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {}; From bb312b77b5b931ed1592a84652e625941a020362 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 22:08:26 +0200 Subject: [PATCH 215/332] ghc-head: update to version 7.7.20130811 --- pkgs/development/compilers/ghc/head.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 035ebc8b268..1ea283f87fe 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7"; + version = "7.7.20130811"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb"; + url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2"; + sha256 = "1jkks2nq9189vxim9lfiwmf3wrnxi834brv9kn9n31225f34qdyr"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -19,24 +19,16 @@ stdenv.mkDerivation rec { DYNAMIC_BY_DEFAULT = NO ''; - # The tarball errorneously contains an executable that doesn't work in - # Nix. Deleting it will cause the program to be re-built locally. - postUnpack = '' - rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants - ''; - preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure ''; - configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" - ]; + configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort - stripDebugFlags=["-S" "--keep-file-symbols"]; + stripDebugFlags = [ "-S" "--keep-file-symbols" ]; meta = { homepage = "http://haskell.org/ghc"; From 1ce0c6d4e3c451cf9480d4c38c33a05e92fea840 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 11 Aug 2013 16:08:01 -0430 Subject: [PATCH 216/332] racket: advance version to 5.3.6. --- pkgs/development/interpreters/racket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index da3390bb1e1..ddcf2634039 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.3.5"; + version = "5.3.6"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk"; + sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z"; }; # Various racket executables do run-time searches for these. From 1ccc0025e48d56d202e3a700d1e43580501395f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 23:56:02 +0200 Subject: [PATCH 217/332] haskell-union-find: add version 0.2 --- .../libraries/haskell/union-find/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/union-find/default.nix diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix new file mode 100644 index 00000000000..b50713d5291 --- /dev/null +++ b/pkgs/development/libraries/haskell/union-find/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "union-find"; + version = "0.2"; + sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/nominolo/union-find"; + description = "Efficient union and equivalence testing of sets"; + 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 79045f14831..ace5b0ff308 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1990,6 +1990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {}; + unionFind = callPackage ../development/libraries/haskell/union-find {}; + uniplate = callPackage ../development/libraries/haskell/uniplate {}; uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; From 91358d65297604017fe81278f29481049f7d9bf3 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 11 Aug 2013 18:08:05 -0430 Subject: [PATCH 218/332] racket: libpng 1.6 now supported --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 948288c496e..afff21ee292 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3158,9 +3158,7 @@ let qi = callPackage ../development/compilers/qi { }; - racket = callPackage ../development/interpreters/racket { - libpng = libpng15; - }; + racket = callPackage ../development/interpreters/racket { }; regina = callPackage ../development/interpreters/regina {}; From 339e1d94c65def31998f746fa27f5a11b2bd2c3f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 12 Aug 2013 05:30:10 +0300 Subject: [PATCH 219/332] Turning off PAE support which makes kernel unbootable on older hardware causes CRASH_DUMP option to disappear, so make it optional. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0c3aca17e4e..d4021e735e6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -186,7 +186,7 @@ with stdenv.lib; BT_HCIUART_H4 y # UART (H4) protocol support BT_HCIUART_LL y BT_RFCOMM_TTY? y # RFCOMM TTY support - CRASH_DUMP n + CRASH_DUMP? n ${optionalString (versionOlder version "3.1") '' DMAR? n # experimental ''} From 92443dea6cb0c76d900220533f314cd4bd49485c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Aug 2013 02:40:54 +0200 Subject: [PATCH 220/332] generated python packages for Plone and Pyramid --- pkgs/top-level/python-packages-generated.nix | 5495 ++++++++++++++++++ pkgs/top-level/python-packages.json | 109 + pkgs/top-level/python-packages.nix | 6 +- 3 files changed, 5609 insertions(+), 1 deletion(-) create mode 100644 pkgs/top-level/python-packages-generated.nix create mode 100644 pkgs/top-level/python-packages.json diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix new file mode 100644 index 00000000000..71da839ada9 --- /dev/null +++ b/pkgs/top-level/python-packages-generated.nix @@ -0,0 +1,5495 @@ +{ pkgs, stdenv, fetchurl, python, self }: + +let +in +{ + +} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { + + + "plone.uuid-1.0.3" = self.buildPythonPackage { + name = "plone.uuid-1.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip"; + md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UUIDs for content items + ''; + homepage = "http://plone.org"; + license = "BSD"; + }; + }; + + + "six-1.2.0" = self.buildPythonPackage { + name = "six-1.2.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz"; + md5 = "2a5d1afc79912832ac78fd38e3d75d7e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Python 2 and 3 compatibility utilities + ''; + homepage = "http://pypi.python.org/pypi/six/"; + license = "UNKNOWN"; + }; + }; + + + "Products.ZopeVersionControl-1.1.3" = self.buildPythonPackage { + name = "Products.ZopeVersionControl-1.1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip"; + md5 = "238239102f3ac798ee4f4c53343a561f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Version Control + ''; + homepage = "http://pypi.python.org/pypi/Products.ZopeVersionControl"; + license = "ZPL"; + }; + }; + + + "Products.Archetypes-1.9.1" = self.buildPythonPackage { + name = "Products.Archetypes-1.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip"; + md5 = "c2343539f9f3e485f0bc98b46c12cd85"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.4" self."Products.PlacelessTranslationService-2.0.3" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Archetypes is a developers framework for rapidly developing and deploying rich, full featured content types within the context of Zope/CMF and Plone. + ''; + homepage = "http://pypi.python.org/pypi/Products.Archetypes"; + license = "GPL"; + }; + }; + + + "Products.Marshall-2.1.2" = self.buildPythonPackage { + name = "Products.Marshall-2.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip"; + md5 = "bde4d7f75195c1ded8371554b04d2541"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Configurable Marshallers for Archetypes + ''; + homepage = "http://pypi.python.org/pypi/Products.Marshall"; + license = "GPL"; + }; + }; + + + "plone.folder-1.0.4" = self.buildPythonPackage { + name = "plone.folder-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip"; + md5 = "1674ff18b7a9452d0c2063cf11c679b7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + BTree-based folder implementation with order support + ''; + homepage = "http://pypi.python.org/pypi/plone.folder"; + license = "GPL version 2"; + }; + }; + + + "Products.CMFPlone-4.3.1" = self.buildPythonPackage { + name = "Products.CMFPlone-4.3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip"; + md5 = "2fee0c66e0d9bdf28b513bcd6d95a602"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.8" self."archetypes.referencebrowserwidget-2.4.18" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.10" self."plone.app.content-2.1.2" self."plone.app.contentlisting-1.0.4" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.3" self."plone.app.controlpanel-2.3.6" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.6" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.5" self."plone.app.layout-2.3.5" self."plone.app.linkintegrity-1.5.2" self."plone.app.locales-4.3.1" self."plone.app.portlets-2.4.4" self."plone.app.redirector-1.2" self."plone.app.search-1.1.4" self."plone.app.upgrade-1.3.3" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.3" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.8" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.4" self."Products.Archetypes-1.9.1" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PasswordResetTool-2.0.14" self."Products.PlacelessTranslationService-2.0.3" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.4" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The Plone Content Management System (core) + ''; + homepage = "http://plone.org/"; + license = "GPL version 2"; + }; + }; + + + "zope.deferredimport-3.5.3" = self.buildPythonPackage { + name = "zope.deferredimport-3.5.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz"; + md5 = "68fce3bf4f011d4a840902fd763884ee"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.proxy-3.6.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. + ''; + homepage = "http://pypi.python.org/pypi/zope.deferredimport"; + license = "ZPL 2.1"; + }; + }; + + + "coverage-3.6" = self.buildPythonPackage { + name = "coverage-3.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.6.tar.gz"; + md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Code coverage measurement for Python + ''; + homepage = "http://nedbatchelder.com/code/coverage"; + license = "BSD"; + }; + }; + + + "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { + name = "Products.ExternalMethod-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; + md5 = "15ba953ef6cb632eb571977651252ea6"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + This package provides support for external Python methods within a Zope 2 environment. + ''; + homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFUid-2.2.1" = self.buildPythonPackage { + name = "Products.CMFUid-2.2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz"; + md5 = "e20727959351dffbf0bac80613eee110"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Uid product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFUid"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "roman-1.4.0" = self.buildPythonPackage { + name = "roman-1.4.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Integer to Roman numerals converter + ''; + homepage = "http://pypi.python.org/pypi/roman"; + license = "Python 2.1.1"; + }; + }; + + + "plone.autoform-1.4" = self.buildPythonPackage { + name = "plone.autoform-1.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip"; + md5 = "01e5ccb59253bfaaa02c1ab4be3f212f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Tools to construct z3c.form forms + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "LGPL"; + }; + }; + + + "Unidecode-0.04.1" = self.buildPythonPackage { + name = "Unidecode-0.04.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; + md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + US-ASCII transliterations of Unicode text + ''; + homepage = "http://code.zemanta.com/tsolc/unidecode/"; + license = "UNKNOWN"; + }; + }; + + + "plone.fieldsets-2.0.2" = self.buildPythonPackage { + name = "plone.fieldsets-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip"; + md5 = "4158c8a1f784fcb5cecbd63deda7222f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + An extension to zope.formlib, which allows to group fields into different fieldsets. + ''; + homepage = "http://pypi.python.org/pypi/plone.fieldsets"; + license = "GPL version 2"; + }; + }; + + + "plone.app.redirector-1.2" = self.buildPythonPackage { + name = "plone.app.redirector-1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip"; + md5 = "bc0508844f276ac7a7b9556d37281cc8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + redirection tool + ''; + homepage = "http://pypi.python.org/pypi/plone.app.redirector"; + license = "GPL version 2"; + }; + }; + + + "plone.app.blob-1.5.8" = self.buildPythonPackage { + name = "plone.app.blob-1.5.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip"; + md5 = "7e575d8df137cd19067cc95845aae604"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + ZODB blob support for Plone + ''; + homepage = "http://plone.org/products/plone.app.blob"; + license = "GPL version 2"; + }; + }; + + + "WebOb-1.2.3" = self.buildPythonPackage { + name = "WebOb-1.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.2.3.tar.gz"; + md5 = "11825b7074ba7043e157805e4e6e0f55"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + WSGI request and response object + ''; + homepage = "http://webob.org/"; + license = "MIT"; + }; + }; + + + "zope.testbrowser-3.11.1" = self.buildPythonPackage { + name = "zope.testbrowser-3.11.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz"; + md5 = "64abbee892121e7f1a91aed12cfc155a"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."mechanize-0.2.5" self."pytz-2013b" self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Programmable browser for functional black-box tests + ''; + homepage = "http://pypi.python.org/pypi/zope.testbrowser"; + license = "ZPL 2.1"; + }; + }; + + + "plone.theme-2.1" = self.buildPythonPackage { + name = "plone.theme-2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip"; + md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Tools for managing themes in CMF and Plone sites + ''; + homepage = "http://pypi.python.org/pypi/plone.theme"; + license = "GPL version 2"; + }; + }; + + + "plone.outputfilters-1.10" = self.buildPythonPackage { + name = "plone.outputfilters-1.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip"; + md5 = "2c8ba3b7fd2bf18406eb49d01b478139"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Transformations applied to HTML in Plone text fields as they are rendered + ''; + homepage = "http://github.com/plone/plone.outputfilters"; + license = "GPL"; + }; + }; + + + "zope.site-3.9.2" = self.buildPythonPackage { + name = "zope.site-3.9.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz"; + md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Local registries for zope component architecture + ''; + homepage = "http://pypi.python.org/pypi/zope.site"; + license = "ZPL 2.1"; + }; + }; + + + "plone.batching-1.0" = self.buildPythonPackage { + name = "plone.batching-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip"; + md5 = "cabd58ccfec67cd384602343ce40dc7b"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Batching facilities used in Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.batching"; + license = "GPL"; + }; + }; + + + "six-1.3.0" = self.buildPythonPackage { + name = "six-1.3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz"; + md5 = "ec47fe6070a8a64c802363d2c2b1e2ee"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Python 2 and 3 compatibility utilities + ''; + homepage = "http://pypi.python.org/pypi/six/"; + license = "UNKNOWN"; + }; + }; + + + "plone.app.form-2.2.2" = self.buildPythonPackage { + name = "plone.app.form-2.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip"; + md5 = "6101e6a5bd4de6cc8cdef09ced2743eb"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zope.formlib integration for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.form"; + license = "GPL version 2"; + }; + }; + + + "Pillow-1.7.8" = self.buildPythonPackage { + name = "Pillow-1.7.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.8.zip"; + md5 = "41d8688d4db72673069a6dc63b5289d6"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Python Imaging Library (fork) + ''; + homepage = "http://github.com/python-imaging/Pillow"; + license = "UNKNOWN"; + }; + }; + + + "ZConfig-2.9.1" = self.buildPythonPackage { + name = "ZConfig-2.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz"; + md5 = "4738de641d90b992de5b89ff1bc2fe49"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Structured Configuration Library + ''; + homepage = "http://www.zope.org/Members/fdrake/zconfig/"; + license = "ZPL 2.1"; + }; + }; + + + "Products.PlacelessTranslationService-2.0.3" = self.buildPythonPackage { + name = "Products.PlacelessTranslationService-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip"; + md5 = "a94635eb712563c5a002520713f5d6dc"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService"; + license = "GPL"; + }; + }; + + + "zope.deprecation-3.4.1" = self.buildPythonPackage { + name = "zope.deprecation-3.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz"; + md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Deprecation Infrastructure + ''; + homepage = "http://pypi.python.org/pypi/zope.deprecation"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFFormController-3.0.3" = self.buildPythonPackage { + name = "Products.CMFFormController-3.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip"; + md5 = "6573df7dcb39e3b63ba22abe2acd639e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + CMFFormController provides a form validation mechanism for CMF. + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFFormController"; + license = "BSD"; + }; + }; + + + "Products.validation-2.0" = self.buildPythonPackage { + name = "Products.validation-2.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip"; + md5 = "afa217e2306637d1dccbebf337caa8bf"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Data validation package for Archetypes + ''; + homepage = "UNKNOWN"; + license = "UNKNOWN"; + }; + }; + + + "zope.event-4.0.2" = self.buildPythonPackage { + name = "zope.event-4.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.2.tar.gz"; + md5 = "e08dd299d428d77a1cfcbfe841b81872"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Very basic event publishing system + ''; + homepage = "http://pypi.python.org/pypi/zope.event"; + license = "ZPL 2.1"; + }; + }; + + + "plone.caching-1.0" = self.buildPythonPackage { + name = "plone.caching-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip"; + md5 = "2c2e3b27d13b9101c92dfed222fde36c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope 2 integration for z3c.caching + ''; + homepage = "http://pypi.python.org/pypi/plone.caching"; + license = "GPL"; + }; + }; + + + "zope.proxy-3.6.1" = self.buildPythonPackage { + name = "zope.proxy-3.6.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip"; + md5 = "a400b0a26624b17fa889dbcaa989d440"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Generic Transparent Proxies + ''; + homepage = "http://pypi.python.org/pypi/zope.proxy"; + license = "ZPL 2.1"; + }; + }; + + + "zope.componentvocabulary-1.0.1" = self.buildPythonPackage { + name = "zope.componentvocabulary-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz"; + md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Component vocabularies + ''; + homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; + license = "ZPL 2.1"; + }; + }; + + + "Products.PasswordResetTool-2.0.14" = self.buildPythonPackage { + name = "Products.PasswordResetTool-2.0.14"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; + md5 = "4267a5fef471d0ebe5ca848e86630702"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Password reset tool for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; + license = "GPL"; + }; + }; + + + "Products.PlonePAS-4.1.1" = self.buildPythonPackage { + name = "Products.PlonePAS-4.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip"; + md5 = "32db1808c3ad42e82542b65eb95c3c71"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + PlonePAS adapts the PluggableAuthService for use by Plone. + ''; + homepage = "http://pypi.python.org/pypi/Products.PlonePAS"; + license = "ZPL"; + }; + }; + + + "mock-1.0.1" = self.buildPythonPackage { + name = "mock-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz"; + md5 = "c3971991738caa55ec7c356bbc154ee2"; + }; + doCheck = true; + buildInputs = [ self."unittest2-0.5.1" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + A Python Mocking and Patching Library for Testing + ''; + homepage = "http://www.voidspace.org.uk/python/mock/"; + license = "UNKNOWN"; + }; + }; + + + "Products.ATReferenceBrowserWidget-3.0" = self.buildPythonPackage { + name = "Products.ATReferenceBrowserWidget-3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip"; + md5 = "157bdd32155c8353450c17c649aad042"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + ATReferenceBrowserWidget is reference widget for Archetypes. + ''; + homepage = "http://pypi.python.org/pypi/Products.ATReferenceBrowserWidget"; + license = "GPL"; + }; + }; + + + "MultiMapping-2.13.0" = self.buildPythonPackage { + name = "MultiMapping-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip"; + md5 = "d69c5904c105b9f2f085d4103e0f0586"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Special MultiMapping objects used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/MultiMapping"; + license = "ZPL 2.1"; + }; + }; + + + "Products.ZSQLMethods-2.13.4" = self.buildPythonPackage { + name = "Products.ZSQLMethods-2.13.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip"; + md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + SQL method support for Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; + license = "ZPL 2.1"; + }; + }; + + + "Mako-0.8.1" = self.buildPythonPackage { + name = "Mako-0.8.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.8.1.tar.gz"; + md5 = "96d962464ce6316004af0cc48495d73e"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ self."MarkupSafe-0.18" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + A super-fast templating language that borrows the best ideas from the existing templating languages. + ''; + homepage = "http://www.makotemplates.org/"; + license = "MIT"; + }; + }; + + + "plone.transformchain-1.0.3" = self.buildPythonPackage { + name = "plone.transformchain-1.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip"; + md5 = "f5fb7ca894249e3e666501c4fae52a6c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Hook into repoze.zope2 that allows third party packages to register a sequence of hooks that will be allowed to modify the response before it is returned to the browser + ''; + homepage = "http://pypi.python.org/pypi/plone.transformchain"; + license = "BSD"; + }; + }; + + + "plone.indexer-1.0.2" = self.buildPythonPackage { + name = "plone.indexer-1.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Hooks to facilitate managing custom index values in Zope 2/CMF applications + ''; + homepage = "http://pypi.python.org/pypi/plone.indexer"; + license = "BSD"; + }; + }; + + + "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage { + name = "Products.CMFQuickInstallerTool-3.0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz"; + md5 = "af34adb87ddf2b6da48eff8b70ca2989"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + CMFQuickInstallerTool is a facility for comfortable activation/deactivation of CMF compliant products. + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFQuickInstallerTool"; + license = "GPL"; + }; + }; + + + "zope.deprecation-4.0.2" = self.buildPythonPackage { + name = "zope.deprecation-4.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.0.2.tar.gz"; + md5 = "5f8cecce85f2783f9e020f1288e908fd"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Zope Deprecation Infrastructure + ''; + homepage = "http://pypi.python.org/pypi/zope.deprecation"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFEditions-2.2.8" = self.buildPythonPackage { + name = "Products.CMFEditions-2.2.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; + md5 = "1806f2e17e2527fad9364670b343bd11"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Versioning for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + license = "GPL"; + }; + }; + + + "Products.CMFDefault-2.2.3" = self.buildPythonPackage { + name = "Products.CMFDefault-2.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz"; + md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Default product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "zope.processlifetime-1.0" = self.buildPythonPackage { + name = "zope.processlifetime-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz"; + md5 = "69604bfd668a01ebebdd616a8f26ccfe"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope process lifetime events + ''; + homepage = "http://pypi.python.org/pypi/zope.processlifetime"; + license = "ZPL 2.1"; + }; + }; + + + "zope.component-4.1.0" = self.buildPythonPackage { + name = "zope.component-4.1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; + md5 = "8e185893699f9fa577bd9ada0a5302fa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Zope Component Architecture + ''; + homepage = "http://pypi.python.org/pypi/zope.component"; + license = "ZPL 2.1"; + }; + }; + + + "zope.browserresource-3.10.3" = self.buildPythonPackage { + name = "zope.browserresource-3.10.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; + md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Browser resources implementation for Zope. + ''; + homepage = "http://pypi.python.org/pypi/zope.browserresource/"; + license = "UNKNOWN"; + }; + }; + + + "plone.synchronize-1.0.1" = self.buildPythonPackage { + name = "plone.synchronize-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip"; + md5 = "d25e86ace8daa0816861296c3288c4fb"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Simple decorators to support synchronized methods + ''; + homepage = "http://pypi.python.org/pypi/plone.synchronize"; + license = "BSD"; + }; + }; + + + "collective.monkeypatcher-1.0.1" = self.buildPythonPackage { + name = "collective.monkeypatcher-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip"; + md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Support for applying monkey patches late in the startup cycle by using ZCML configuration actions + ''; + homepage = "http://pypi.python.org/pypi/collective.monkeypatcher"; + license = "BSD"; + }; + }; + + + "tempstorage-2.12.2" = self.buildPythonPackage { + name = "tempstorage-2.12.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; + md5 = "7a2b76b39839e229249b1bb175604480"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A RAM-based storage for ZODB + ''; + homepage = "http://pypi.python.org/pypi/tempstorage"; + license = "ZPL 2.1"; + }; + }; + + + "plonetheme.sunburst-1.4.4" = self.buildPythonPackage { + name = "plonetheme.sunburst-1.4.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip"; + md5 = "f2cb3fdd66ecc14d1a542d2ca76252db"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The default theme for Plone 4. + ''; + homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; + license = "GPL version 2"; + }; + }; + + + "PasteDeploy-1.5.0" = self.buildPythonPackage { + name = "PasteDeploy-1.5.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.0.tar.gz"; + md5 = "f1a068a0b680493b6eaff3dd7690690f"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Load, configure, and compose WSGI applications and servers + ''; + homepage = "http://pythonpaste.org/deploy/"; + license = "MIT"; + }; + }; + + + "zope.sequencesort-3.4.0" = self.buildPythonPackage { + name = "zope.sequencesort-3.4.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz"; + md5 = "cfc35fc426a47f5c0ee43c416224b864"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Sequence Sorting + ''; + homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; + license = "ZPL 2.1"; + }; + }; + + + "plone.openid-2.0.1" = self.buildPythonPackage { + name = "plone.openid-2.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip"; + md5 = "d4c36926a6dbefed035ed92c29329ce1"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + OpenID authentication support for PAS + ''; + homepage = "http://svn.plone.org/svn/plone/plone.openid"; + license = "BSD"; + }; + }; + + + "z3c.form-3.0" = self.buildPythonPackage { + name = "z3c.form-3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; + md5 = "f9fa3cf56c83722425b3b1be4467ce46"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + An advanced form and widget framework for Zope 3 + ''; + homepage = "https://launchpad.net/z3c.form"; + license = "ZPL 2.1"; + }; + }; + + + "zope.app.publication-3.12.0" = self.buildPythonPackage { + name = "zope.app.publication-3.12.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip"; + md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.authentication-3.7.1" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.error-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope publication + ''; + homepage = "http://pypi.python.org/pypi/zope.app.publication"; + license = "ZPL 2.1"; + }; + }; + + + "zope.schema-4.2.2" = self.buildPythonPackage { + name = "zope.schema-4.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; + md5 = "e7e581af8193551831560a736a53cf58"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zope.interface extension for defining data schemas + ''; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; + }; + }; + + + "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { + name = "Products.ExternalEditor-1.1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope External Editor + ''; + homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.content-2.1.2" = self.buildPythonPackage { + name = "plone.app.content-2.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip"; + md5 = "247eb174269b2ab03c05f318915f087e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Content Views for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.content"; + license = "GPL version 2"; + }; + }; + + + "Products.CMFDiffTool-2.1" = self.buildPythonPackage { + name = "Products.CMFDiffTool-2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip"; + md5 = "7513d954294e9f318182f9d61660abdb"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Diff tool for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFDiffTool"; + license = "GPL"; + }; + }; + + + "repoze.lru-0.6" = self.buildPythonPackage { + name = "repoze.lru-0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/repoze.lru/repoze.lru-0.6.tar.gz"; + md5 = "2c3b64b17a8e18b405f55d46173e14dd"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + A tiny LRU cache implementation and decorator + ''; + homepage = "http://www.repoze.org"; + license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; + }; + }; + + + "Markdown-2.0.3" = self.buildPythonPackage { + name = "Markdown-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz"; + md5 = "751e8055be2433dfd1a82e0fb1b12f13"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Python implementation of Markdown. + ''; + homepage = "http://www.freewisdom.org/projects/python-markdown"; + license = "BSD License"; + }; + }; + + + "diazo-1.0.3" = self.buildPythonPackage { + name = "diazo-1.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip"; + md5 = "d3c2b017af521db4c86fb360c86e0bc8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Diazo implements a Deliverance like language using a pure XSLT engine. With Diazo, you +"compile" your theme and ruleset in one step, then use a superfast/simple +transform on each request thereafter. Alternatively, compile your theme during +development, check it into Subversion, and not touch Diazo during deployment. + ''; + homepage = "http://diazo.org"; + license = "New BSD"; + }; + }; + + + "plone.behavior-1.0.2" = self.buildPythonPackage { + name = "plone.behavior-1.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip"; + md5 = "4459b91287ebc2f2cf4fa38728b2a739"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Infrastructure for maintaining a registry of available behaviors + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "BSD"; + }; + }; + + + "zc.lockfile-1.0.2" = self.buildPythonPackage { + name = "zc.lockfile-1.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; + md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Basic inter-process locks + ''; + homepage = "http://www.python.org/pypi/zc.lockfile"; + license = "ZPL 2.1"; + }; + }; + + + "zope.tales-3.5.3" = self.buildPythonPackage { + name = "zope.tales-3.5.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz"; + md5 = "a2dbc6e41140c29de81b66a4d703fc3f"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.tal-3.5.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Template Application Language Expression Syntax (TALES) + ''; + homepage = "http://pypi.python.org/pypi/zope.tales"; + license = "ZPL 2.1"; + }; + }; + + + "DateTime-3.0.3" = self.buildPythonPackage { + name = "DateTime-3.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip"; + md5 = "5ebf0a8e3775b744c5de2e6685b37ae9"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."pytz-2013b" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. + ''; + homepage = "http://pypi.python.org/pypi/DateTime"; + license = "ZPL 2.1"; + }; + }; + + + "z3c.autoinclude-0.3.4" = self.buildPythonPackage { + name = "z3c.autoinclude-0.3.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip"; + md5 = "6a615ae18c12b459bceb3ae28e8e7709"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zc.buildout-1.7.1" self."zope.configuration-3.7.4" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Automatically include ZCML + ''; + homepage = "UNKNOWN"; + license = "ZPL"; + }; + }; + + + "pytz-2013b" = self.buildPythonPackage { + name = "pytz-2013b"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pytz/pytz-2013b.tar.bz2"; + md5 = "34f47470eedd5cd1faf6c3da2741967b"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + World timezone definitions, modern and historical + ''; + homepage = "http://pytz.sourceforge.net"; + license = "MIT"; + }; + }; + + + "plone.app.dexterity-2.0.8" = self.buildPythonPackage { + name = "plone.app.dexterity-2.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; + md5 = "2e0ec48224a3a8afd51656c22d574359"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. + ''; + homepage = "http://plone.org/products/dexterity"; + license = "GPL"; + }; + }; + + + "plone.app.iterate-2.1.10" = self.buildPythonPackage { + name = "plone.app.iterate-2.1.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip"; + md5 = "8bd270d8a3c9509e524a06e092a9b4c4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + check-out/check-in staging for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.iterate"; + license = "GPL version 2"; + }; + }; + + + "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { + name = "Products.PortalTransforms-2.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; + md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.4" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + MIME based content transformations + ''; + homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + license = "UNKNOWN"; + }; + }; + + + "Products.MailHost-2.13.1" = self.buildPythonPackage { + name = "Products.MailHost-2.13.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip"; + md5 = "1102e523435d8bf78a15b9ddb57478e1"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zope.sendmail integration for Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.MailHost"; + license = "ZPL 2.1"; + }; + }; + + + "lxml-3.2.3" = self.buildPythonPackage { + name = "lxml-3.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.2.3.tar.gz"; + md5 = "fef47bb4ac72ac38ce778518dac42236"; + }; + doCheck = false; + buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. + ''; + homepage = "http://lxml.de/"; + license = "UNKNOWN"; + }; + }; + + + "DocumentTemplate-2.13.2" = self.buildPythonPackage { + name = "DocumentTemplate-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; + md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Document Templating Markup Language (DTML) + ''; + homepage = "http://pypi.python.org/pypi/DocumentTemplate"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.controlpanel-2.3.6" = self.buildPythonPackage { + name = "plone.app.controlpanel-2.3.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip"; + md5 = "ca5e0e0c8497d9860603e39e0eeba9b8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.app.workflow-2.1.5" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Formlib-based controlpanels for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; + license = "GPL version 2"; + }; + }; + + + "zope.ptresource-3.9.0" = self.buildPythonPackage { + name = "zope.ptresource-3.9.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz"; + md5 = "f4645e51c15289d3fdfb4139039e18e9"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.browserresource-3.10.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Page template resource plugin for zope.browserresource + ''; + homepage = "http://pypi.python.org/pypi/zope.ptresource/"; + license = "UNKNOWN"; + }; + }; + + + "python-dateutil-1.5" = self.buildPythonPackage { + name = "python-dateutil-1.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; + md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Extensions to the standard python 2.3+ datetime module + ''; + homepage = "http://labix.org/python-dateutil"; + license = "PSF License"; + }; + }; + + + "docutils-0.9.1" = self.buildPythonPackage { + name = "docutils-0.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz"; + md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Docutils -- Python Documentation Utilities + ''; + homepage = "http://docutils.sourceforge.net/"; + license = "public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt)"; + }; + }; + + + "nose-1.3.0" = self.buildPythonPackage { + name = "nose-1.3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.0.tar.gz"; + md5 = "95d6d32b9d6b029c3c65674bd9e7eabe"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + nose extends unittest to make testing easier + ''; + homepage = "http://readthedocs.org/docs/nose/"; + license = "GNU LGPL"; + }; + }; + + + "plone.intelligenttext-2.0.2" = self.buildPythonPackage { + name = "plone.intelligenttext-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; + md5 = "51688fa0815b49e00334e3ef948328ba"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Provides transforms from text/x-web-intelligent to text/html and vice versa. + ''; + homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; + license = "GPL version 2"; + }; + }; + + + "zope.error-3.7.4" = self.buildPythonPackage { + name = "zope.error-3.7.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz"; + md5 = "281445a906458ff5f18f56923699a127"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + An error reporting utility for Zope3 + ''; + homepage = "http://pypi.python.org/pypi/zope.error"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.openid-2.0.2" = self.buildPythonPackage { + name = "plone.app.openid-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz"; + md5 = "ae0748f91cab0612a498926d405d8edd"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."plone.app.portlets-2.4.4" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone OpenID authentication support + ''; + homepage = "http://pypi.python.org/pypi/plone.app.openid"; + license = "GPL version 2"; + }; + }; + + + "plone.app.layout-2.3.5" = self.buildPythonPackage { + name = "plone.app.layout-2.3.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; + md5 = "960665807ad60eb3e12c52a0cf092ceb"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Layout mechanisms for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.layout"; + license = "GPL version 2"; + }; + }; + + + "zope.schema-4.3.2" = self.buildPythonPackage { + name = "zope.schema-4.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; + md5 = "b63df4a3035f29113f8130c8ae28bb13"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + zope.interface extension for defining data schemas + ''; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; + }; + }; + + + "waitress-0.8.5" = self.buildPythonPackage { + name = "waitress-0.8.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.5.tar.gz"; + md5 = "7a3094d812c0dffb948d1334ef5fd56f"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Waitress WSGI server + ''; + homepage = "https://github.com/Pylons/waitress"; + license = "ZPL 2.1"; + }; + }; + + + "plone.keyring-2.0.1" = self.buildPythonPackage { + name = "plone.keyring-2.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip"; + md5 = "f3970e9bddb2cc65e461a2c62879233f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Manage secrets + ''; + homepage = "http://pypi.python.org/pypi/plone.keyring"; + license = "BSD"; + }; + }; + + + "plone.app.portlets-2.4.4" = self.buildPythonPackage { + name = "plone.app.portlets-2.4.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip"; + md5 = "c1144f7686cacf3d64fcd202ab2e5e2d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.10" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone integration for the basic plone.portlets package + ''; + homepage = "http://pypi.python.org/pypi/plone.app.portlets"; + license = "GPL version 2"; + }; + }; + + + "plone.dexterity-2.1.3" = self.buildPythonPackage { + name = "plone.dexterity-2.1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip"; + md5 = "7f6444a2c26488e4068217266fd243b7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.0.1" self."plone.supermodel-1.2.2" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Flexible CMF content + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "GPL version 2"; + }; + }; + + + "feedparser-5.0.1" = self.buildPythonPackage { + name = "feedparser-5.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2"; + md5 = "702835de74bd4a578524f311e62c2877"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + + ''; + homepage = "https://code.google.com/p/feedparser/"; + license = ""; + }; + }; + + + "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage { + name = "Products.BTreeFolder2-2.13.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz"; + md5 = "f57c85673036af7ccd34c3fa251f6bb2"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.lifecycleevent-3.6.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A BTree based implementation for Zope 2's OFS. + ''; + homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; + license = "ZPL 2.1"; + }; + }; + + + "mechanize-0.2.5" = self.buildPythonPackage { + name = "mechanize-0.2.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; + md5 = "32657f139fc2fb75bcf193b63b8c60b2"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Stateful programmatic web browsing. + ''; + homepage = "http://wwwsearch.sourceforge.net/mechanize/"; + license = "BSD"; + }; + }; + + + "zope.testing-3.9.7" = self.buildPythonPackage { + name = "zope.testing-3.9.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz"; + md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.exceptions-3.6.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope testing framework, including the testrunner script. + ''; + homepage = "http://pypi.python.org/pypi/zope.testing"; + license = "ZPL 2.1"; + }; + }; + + + "zope.lifecycleevent-3.6.2" = self.buildPythonPackage { + name = "zope.lifecycleevent-3.6.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz"; + md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Object life-cycle events + ''; + homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; + license = "ZPL 2.1"; + }; + }; + + + "plone.formwidget.namedfile-1.0.6" = self.buildPythonPackage { + name = "plone.formwidget.namedfile-1.0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; + md5 = "afd20f030906a72fca7548876bdcbb48"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Image widget for z3c.form and Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; + license = "GPL"; + }; + }; + + + "plone.app.contentrules-3.0.3" = self.buildPythonPackage { + name = "plone.app.contentrules-3.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip"; + md5 = "518c1e22a9cfe187b6770e62be4f8bd8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.2" self."plone.app.vocabularies-2.1.10" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone integration for plone.contentrules + ''; + homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; + license = "GPL version 2"; + }; + }; + + + "translationstring-1.1" = self.buildPythonPackage { + name = "translationstring-1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/translationstring/translationstring-1.1.tar.gz"; + md5 = "0979b46d8f0f852810c8ec4be5c26cf2"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Utility library for i18n relied on by various Repoze and Pyramid packages + ''; + homepage = "http://pylonsproject.org"; + license = "BSD-like (http://repoze.org/license.html)"; + }; + }; + + + "MarkupSafe-0.18" = self.buildPythonPackage { + name = "MarkupSafe-0.18"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz"; + md5 = "f8d252fd05371e51dec2fe9a36890687"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Implements a XML/HTML/XHTML Markup safe string for Python + ''; + homepage = "http://github.com/mitsuhiko/markupsafe"; + license = "BSD"; + }; + }; + + + "zope.pagetemplate-3.6.3" = self.buildPythonPackage { + name = "zope.pagetemplate-3.6.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip"; + md5 = "834a4bf702c05fba1e669677b4dc871f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.security__untrustedpython-3.7.4" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Page Templates + ''; + homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; + license = "ZPL 2.1"; + }; + }; + + + "python-gettext-1.2" = self.buildPythonPackage { + name = "python-gettext-1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; + md5 = "cd4201d440126d1296d1d2bc2b4795f3"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."unittest2-0.5.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Python Gettext po to mo file compiler. + ''; + homepage = "http://pypi.python.org/pypi/python-gettext"; + license = "BSD"; + }; + }; + + + "zc.buildout-1.7.1" = self.buildPythonPackage { + name = "zc.buildout-1.7.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-1.7.1.tar.gz"; + md5 = "8834a21586bf2be53dc412002241a996"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + System for managing development buildouts + ''; + homepage = "http://pypi.python.org/pypi/zc.buildout"; + license = "ZPL 2.1"; + }; + }; + + + "archetypes.schemaextender-2.1.2" = self.buildPythonPackage { + name = "archetypes.schemaextender-2.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip"; + md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Dynamically extend Archetypes schemas with named adapters. + ''; + homepage = "http://pypi.python.org/pypi/archetypes.schemaextender"; + license = "GPL"; + }; + }; + + + "zope.tal-3.5.2" = self.buildPythonPackage { + name = "zope.tal-3.5.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip"; + md5 = "13869f292ba36b294736b7330b1396fd"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope 3 Template Application Languate (TAL) + ''; + homepage = "http://pypi.python.org/pypi/zope.tal"; + license = "ZPL 2.1"; + }; + }; + + + "Products.OFSP-2.13.2" = self.buildPythonPackage { + name = "Products.OFSP-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip"; + md5 = "c76d40928753c2ee56db873304e65bd5"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + General Zope 2 help screens. + ''; + homepage = "http://pypi.python.org/pypi/Products.OFSP"; + license = "ZPL 2.1"; + }; + }; + + + "cssselect-0.8" = self.buildPythonPackage { + name = "cssselect-0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.8.tar.gz"; + md5 = "c4683e050351abcbbd5990b01f5344e2"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + cssselect parses CSS3 Selectors and translates them to XPath 1.0 + ''; + homepage = "http://packages.python.org/cssselect/"; + license = "BSD"; + }; + }; + + + "plone.app.search-1.1.4" = self.buildPythonPackage { + name = "plone.app.search-1.1.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip"; + md5 = "fb24320380ed2ba11e6f20cc1fe3b6df"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Search user interface for Plone CMS. + ''; + homepage = "http://github.com/plone/plone.app.search"; + license = "GPL"; + }; + }; + + + "zope.container-3.11.2" = self.buildPythonPackage { + name = "zope.container-3.11.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz"; + md5 = "fc66d85a17b8ffb701091c9328983dcc"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.broken-3.6.0" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.filerepresentation-3.6.1" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Container + ''; + homepage = "http://pypi.python.org/pypi/zope.container"; + license = "ZPL 2.1"; + }; + }; + + + "Products.PloneTestCase-0.9.17" = self.buildPythonPackage { + name = "Products.PloneTestCase-0.9.17"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip"; + md5 = "2a5bfb94220a520961d710abc92280f2"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Integration testing framework for Plone. + ''; + homepage = "http://plone.org/products/plonetestcase"; + license = "GPL"; + }; + }; + + + "beautifulsoup4-4.2.1" = self.buildPythonPackage { + name = "beautifulsoup4-4.2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.2.1.tar.gz"; + md5 = "91ea70ce16a5f1f43e58f2ef05651679"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; + license = "MIT"; + }; + }; + + + "unittest2-0.5.1" = self.buildPythonPackage { + name = "unittest2-0.5.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz"; + md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The new features in unittest for Python 2.7 backported to Python 2.3+. + ''; + homepage = "http://pypi.python.org/pypi/unittest2"; + license = "UNKNOWN"; + }; + }; + + + "zExceptions-2.13.0" = self.buildPythonPackage { + name = "zExceptions-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip"; + md5 = "4c679696c959040d8e656ef85ae40136"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zExceptions contains common exceptions used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/zExceptions"; + license = "ZPL 2.1"; + }; + }; + + + "Persistence-2.13.2" = self.buildPythonPackage { + name = "Persistence-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."ZODB3-3.10.5" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Persistent ExtensionClass + ''; + homepage = "http://pypi.python.org/pypi/Persistence"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFDynamicViewFTI-4.0.5" = self.buildPythonPackage { + name = "Products.CMFDynamicViewFTI-4.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip"; + md5 = "2d31b1700ed8b1441adc737b454af693"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + CMFDynamicViewFTI is a product for dynamic views in CMF. + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFDynamicViewFTI"; + license = "ZPL"; + }; + }; + + + "zope.publisher-3.12.6" = self.buildPythonPackage { + name = "zope.publisher-3.12.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz"; + md5 = "495131970cc7cb14de8e517fb3857ade"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The Zope publisher publishes Python objects on the web. + ''; + homepage = "http://pypi.python.org/pypi/zope.publisher"; + license = "ZPL 2.1"; + }; + }; + + + "zope.browserpage-3.12.2" = self.buildPythonPackage { + name = "zope.browserpage-3.12.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + ZCML directives for configuring browser views for Zope. + ''; + homepage = "http://pypi.python.org/pypi/zope.browserpage/"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.i18n-2.0.2" = self.buildPythonPackage { + name = "plone.app.i18n-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip"; + md5 = "a10026573463dfc1899bf4062cebdbf2"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone specific i18n extensions. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.i18n"; + license = "GPL version 2"; + }; + }; + + + "zope.security__untrustedpython-3.7.4" = self.buildPythonPackage { + name = "zope.security__untrustedpython-3.7.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; + md5 = "072ab8d11adc083eace11262da08630c"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" self."RestrictedPython-3.6.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Security Framework + ''; + homepage = "http://pypi.python.org/pypi/zope.security"; + license = "ZPL 2.1"; + }; + }; + + + "plone.cachepurging-1.0.4" = self.buildPythonPackage { + name = "plone.cachepurging-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip"; + md5 = "886814ac4deef0f1ed99a2eb60864264"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Cache purging support for Zope 2 applications + ''; + homepage = "http://pypi.python.org/pypi/plone.cachepurging"; + license = "GPL version 2"; + }; + }; + + + "zope.component__zcml-3.9.5" = self.buildPythonPackage { + name = "zope.component__zcml-3.9.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz"; + md5 = "22780b445b1b479701c05978055d1c82"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Component Architecture + ''; + homepage = "http://pypi.python.org/pypi/zope.component"; + license = "ZPL 2.1"; + }; + }; + + + "zope.viewlet-3.7.2" = self.buildPythonPackage { + name = "zope.viewlet-3.7.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz"; + md5 = "367e03096df57e2f9b74fff43f7901f9"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Viewlets + ''; + homepage = "http://pypi.python.org/pypi/zope.viewlet"; + license = "ZPL 2.1"; + }; + }; + + + "zope.i18n__zcml-3.7.4" = self.buildPythonPackage { + name = "zope.i18n__zcml-3.7.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz"; + md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.schema-4.2.2" self."zope.configuration-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Internationalization Support + ''; + homepage = "http://pypi.python.org/pypi/zope.i18n"; + license = "ZPL 2.1"; + }; + }; + + + "Products.ATContentTypes-2.1.13" = self.buildPythonPackage { + name = "Products.ATContentTypes-2.1.13"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip"; + md5 = "093899fc74f5e2a83db464c96d0f5293"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.18" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.5" self."plone.i18n-2.0.8" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.1" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Default Content Types for Plone + ''; + homepage = "http://plone.org/"; + license = "GPL"; + }; + }; + + + "WSGIProxy2-0.2" = self.buildPythonPackage { + name = "WSGIProxy2-0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.2.tar.gz"; + md5 = "d8c764aa68173e0d4851874ed6021211"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/gawel/WSGIProxy2/"; + license = "MIT"; + }; + }; + + + "Products.ResourceRegistries-2.2.9" = self.buildPythonPackage { + name = "Products.ResourceRegistries-2.2.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip"; + md5 = "8dd4f36eb894d868366b51941f6f0966"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Registry for managing CSS and JS + ''; + homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; + license = "GPL version 2"; + }; + }; + + + "five.formlib-1.0.4" = self.buildPythonPackage { + name = "five.formlib-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip"; + md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + zope.formlib integration for Zope 2 + ''; + homepage = "http://pypi.python.org/pypi/five.formlib"; + license = "ZPL 2.1"; + }; + }; + + + "Products.statusmessages-4.0" = self.buildPythonPackage { + name = "Products.statusmessages-4.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip"; + md5 = "265324b0a58a032dd0ed038103ed0473"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + statusmessages provides an easy way of handling internationalized status messages managed via an BrowserRequest adapter storing status messages in client-side cookies. + ''; + homepage = "http://pypi.python.org/pypi/Products.statusmessages"; + license = "BSD"; + }; + }; + + + "pyramid-1.4.3" = self.buildPythonPackage { + name = "pyramid-1.4.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.3.tar.gz"; + md5 = "28fabf42cf585ecec7a57b5acc1174e3"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.7" self."zope.component-4.1.0" self."zope.interface-4.0.5" ]; + propagatedBuildInputs = [ self."Chameleon-2.11" self."Mako-0.8.1" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + The Pyramid web application development framework, a Pylons project + ''; + homepage = "http://pylonsproject.org"; + license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; + }; + }; + + + "Products.MimetypesRegistry-2.0.4" = self.buildPythonPackage { + name = "Products.MimetypesRegistry-2.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; + md5 = "898166bb2aaececc8238ad4ee4826793"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + MIME type handling for Zope + ''; + homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; + license = "UNKNOWN"; + }; + }; + + + "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage { + name = "Products.PloneLanguageTool-3.2.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; + md5 = "bd9eb6278bf76e8cbce99437ca362164"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations. + ''; + homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool"; + license = "GPL"; + }; + }; + + + "plone.app.upgrade-1.3.3" = self.buildPythonPackage { + name = "plone.app.upgrade-1.3.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; + md5 = "1c45e809fba27bec11e8a40f686f0f5b"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Upgrade machinery for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; + license = "GPL version 2"; + }; + }; + + + "plone.namedfile__scales-2.0.2" = self.buildPythonPackage { + name = "plone.namedfile__scales-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip"; + md5 = "f6168ab9e38f3a171dc35483527b3e01"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.rfc822-1.0.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + File types and fields for images, files and blob files with filenames + ''; + homepage = "http://pypi.python.org/pypi/plone.namedfile"; + license = "BSD"; + }; + }; + + + "zope.contenttype-3.5.5" = self.buildPythonPackage { + name = "zope.contenttype-3.5.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip"; + md5 = "c6ac80e6887de4108a383f349fbdf332"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope contenttype + ''; + homepage = "http://pypi.python.org/pypi/zope.contenttype"; + license = "ZPL 2.1"; + }; + }; + + + "zope.proxy-4.1.3" = self.buildPythonPackage { + name = "zope.proxy-4.1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.3.zip"; + md5 = "8dbca0d33996511b9a9026da84a47109"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Generic Transparent Proxies + ''; + homepage = "http://pypi.python.org/pypi/zope.proxy"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.theming-1.1.1" = self.buildPythonPackage { + name = "plone.app.theming-1.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; + md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Integrates the Diazo theming engine with Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.theming"; + license = "GPL"; + }; + }; + + + "ExtensionClass-2.13.2" = self.buildPythonPackage { + name = "ExtensionClass-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Metaclass for subclassable extension types + ''; + homepage = "http://pypi.python.org/pypi/ExtensionClass"; + license = "ZPL 2.1"; + }; + }; + + + "zope.globalrequest-1.0" = self.buildPythonPackage { + name = "zope.globalrequest-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip"; + md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Global way of retrieving the currently active request. + ''; + homepage = "http://pypi.python.org/pypi/zope.globalrequest"; + license = "ZPL"; + }; + }; + + + "plone.rfc822-1.0.1" = self.buildPythonPackage { + name = "plone.rfc822-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip"; + md5 = "b5b79bb5a9181da624a7e88940a45424"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."python-dateutil-1.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + RFC822 marshalling for zope.schema fields + ''; + homepage = "http://pypi.python.org/pypi/plone.rfc822"; + license = "BSD"; + }; + }; + + + "zope.sendmail-3.7.5" = self.buildPythonPackage { + name = "zope.sendmail-3.7.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz"; + md5 = "8a513ecf2b41cad849f6607bf16d6818"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope sendmail + ''; + homepage = "http://pypi.python.org/pypi/zope.sendmail"; + license = "ZPL 2.1"; + }; + }; + + + "Products.MIMETools-2.13.0" = self.buildPythonPackage { + name = "Products.MIMETools-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; + md5 = "ad5372fc1190599a19493db0864448ec"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + MIMETools provides the <!--#mime--> tag for DocumentTemplate. + ''; + homepage = "http://pypi.python.org/pypi/Products.MIMETools"; + license = "ZPL 2.1"; + }; + }; + + + "zope.annotation-3.5.0" = self.buildPythonPackage { + name = "zope.annotation-3.5.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz"; + md5 = "4238153279d3f30ab5613438c8e76380"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Object annotation mechanism + ''; + homepage = "http://pypi.python.org/pypi/zope.annotation"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.customerize-1.2.2" = self.buildPythonPackage { + name = "plone.app.customerize-1.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip"; + md5 = "6a3802c4e8fbd955597adc6a8298febf"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Integrate five.customerize into Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; + license = "GPL version 2"; + }; + }; + + + "zope.browsermenu-3.9.1" = self.buildPythonPackage { + name = "zope.browsermenu-3.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; + md5 = "a47c7b1e786661c912a1150bf8d1f83f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Browser menu implementation for Zope. + ''; + homepage = "http://pypi.python.org/pypi/zope.browsermenu/"; + license = "UNKNOWN"; + }; + }; + + + "plone.app.registry-1.2.3" = self.buildPythonPackage { + name = "plone.app.registry-1.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip"; + md5 = "b2269e10516e8f2faf83545e3d0163d8"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.registry-1.0.1" self."plone.supermodel-1.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope 2 and Plone integration for plone.registry + ''; + homepage = "http://pypi.python.org/pypi/plone.app.registry"; + license = "GPL"; + }; + }; + + + "plone.session-3.5.3" = self.buildPythonPackage { + name = "plone.session-3.5.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip"; + md5 = "f95872454735abc8f27c3dcbc9434c11"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Session based authentication for Zope + ''; + homepage = "http://pypi.python.org/pypi/plone.session"; + license = "BSD"; + }; + }; + + + "z3c.caching__zcml-2.0a1" = self.buildPythonPackage { + name = "z3c.caching__zcml-2.0a1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz"; + md5 = "17f250b5084c2324a7d15c6810ee628e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.configuration-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Caching infrastructure for web apps + ''; + homepage = "UNKNOWN"; + license = "ZPL"; + }; + }; + + + "Products.ZCTextIndex-2.13.4" = self.buildPythonPackage { + name = "Products.ZCTextIndex-2.13.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip"; + md5 = "8bbfa5fcd3609246990a9314d6f826b4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Full text indexing for ZCatalog / Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; + license = "ZPL 2.1"; + }; + }; + + + "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { + name = "Products.CMFPlacefulWorkflow-1.5.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; + md5 = "9041e1f52eab5b348c0dfa85be438722"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Workflow policies for CMF and Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; + license = "GPL"; + }; + }; + + + "zope.filerepresentation-3.6.1" = self.buildPythonPackage { + name = "zope.filerepresentation-3.6.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz"; + md5 = "4a7a434094f4bfa99a7f22e75966c359"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + File-system Representation Interfaces + ''; + homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; + license = "ZPL 2.1"; + }; + }; + + + "plone.memoize-1.1.1" = self.buildPythonPackage { + name = "plone.memoize-1.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip"; + md5 = "d07cd14b976160e1f26a859e3370147e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.ramcache-1.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Decorators for caching the values of functions and methods + ''; + homepage = "http://pypi.python.org/pypi/plone.memoize"; + license = "GPL version 2"; + }; + }; + + + "zope.interface-3.6.7" = self.buildPythonPackage { + name = "zope.interface-3.6.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip"; + md5 = "9df962180fbbb54eb1875cff9fe436e5"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Interfaces for Python + ''; + homepage = "http://pypi.python.org/pypi/zope.interface"; + license = "ZPL 2.1"; + }; + }; + + + "zope.size-3.4.1" = self.buildPythonPackage { + name = "zope.size-3.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz"; + md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Interfaces and simple adapter that give the size of an object + ''; + homepage = "http://pypi.python.org/pypi/zope.size"; + license = "ZPL 2.1"; + }; + }; + + + "five.customerize-1.1" = self.buildPythonPackage { + name = "five.customerize-1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip"; + md5 = "80772212a2d55150a6c070fc4638b0c7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + TTW customization of template-based Zope views + ''; + homepage = "http://pypi.python.org/pypi/five.customerize"; + license = "ZPL 2.1"; + }; + }; + + + "zope.dottedname-3.4.6" = self.buildPythonPackage { + name = "zope.dottedname-3.4.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz"; + md5 = "62d639f75b31d2d864fe5982cb23959c"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Resolver for Python dotted names. + ''; + homepage = "http://pypi.python.org/pypi/zope.dottedname"; + license = "ZPL 2.1"; + }; + }; + + + "plone.resource-1.0.2" = self.buildPythonPackage { + name = "plone.resource-1.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip"; + md5 = "594d41e3acd913ae92f2e9ef96503b9f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://svn.plone.org/svn/plone/plone.resource"; + license = "GPL"; + }; + }; + + + "Products.DCWorkflow-2.2.4" = self.buildPythonPackage { + name = "Products.DCWorkflow-2.2.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; + md5 = "c90a16c4f3611015592ba8173a5f1863"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + DCWorkflow product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "plone.app.locales-4.3.1" = self.buildPythonPackage { + name = "plone.app.locales-4.3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip"; + md5 = "c88b2da05361a24a564bdef30fb371aa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Translation files for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.locales"; + license = "GPL version 2"; + }; + }; + + + "collective.z3cform.datetimewidget-1.2.3" = self.buildPythonPackage { + name = "collective.z3cform.datetimewidget-1.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip"; + md5 = "439117021c93f26c677510504ee245d3"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + z3c.form date and datetime widgets + ''; + homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; + license = "GPL version 2"; + }; + }; + + + "plone.app.contentlisting-1.0.4" = self.buildPythonPackage { + name = "plone.app.contentlisting-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip"; + md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Listing of content for the Plone CMS + ''; + homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; + license = "GPL version 2"; + }; + }; + + + "Zope2-2.13.20" = self.buildPythonPackage { + name = "Zope2-2.13.20"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip"; + md5 = "557b08fec37620c37e32f2dc01020f29"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope2 application server / web framework + ''; + homepage = "http://zope2.zope.org"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.workflow-2.1.5" = self.buildPythonPackage { + name = "plone.app.workflow-2.1.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; + md5 = "b3589b4def82201adc196b3075b54213"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + workflow and security settings for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.workflow"; + license = "GPL version 2"; + }; + }; + + + "plone.browserlayer-2.1.2" = self.buildPythonPackage { + name = "plone.browserlayer-2.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip"; + md5 = "bce02f4907a4f29314090c525e5fc28e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Browser layer management for Zope 2 applications + ''; + homepage = "http://pypi.python.org/pypi/plone.browserlayer"; + license = "GPL version 2"; + }; + }; + + + "plone.app.folder-1.0.5" = self.buildPythonPackage { + name = "plone.app.folder-1.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip"; + md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Integration package for `plone.folder` into Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.folder/"; + license = "GPL version 2"; + }; + }; + + + "Chameleon-2.11" = self.buildPythonPackage { + name = "Chameleon-2.11"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.11.tar.gz"; + md5 = "df72458bf3dd26a744dcff5ad555c34b"; + }; + doCheck = false; + buildInputs = [ self."zope.event-4.0.2" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Fast HTML/XML Template Compiler. + ''; + homepage = "https://chameleon.readthedocs.org/en/latest/"; + license = "BSD-like (http://repoze.org/license.html)"; + }; + }; + + + "Products.StandardCacheManagers-2.13.0" = self.buildPythonPackage { + name = "Products.StandardCacheManagers-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip"; + md5 = "c5088b2b62bd26d63d9579a04369cb73"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Cache managers for Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; + license = "ZPL 2.1"; + }; + }; + + + "RestrictedPython-3.6.0" = self.buildPythonPackage { + name = "RestrictedPython-3.6.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip"; + md5 = "aa75a7dcc7fbc966357837cc66cacec6"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. + ''; + homepage = "http://pypi.python.org/pypi/RestrictedPython"; + license = "ZPL 2.1"; + }; + }; + + + "plone.stringinterp-1.0.10" = self.buildPythonPackage { + name = "plone.stringinterp-1.0.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; + md5 = "595074e94944ad6860e2105a020a3b9a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Adaptable string interpolation + ''; + homepage = "http://pypi.python.org/pypi/plone.stringinterp"; + license = "GPL version 2"; + }; + }; + + + "plone.app.uuid-1.0" = self.buildPythonPackage { + name = "plone.app.uuid-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip"; + md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.indexer-1.0.2" self."plone.uuid-1.0.3" self.setuptools self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone integration for the basic plone.uuid package + ''; + homepage = "http://plone.org"; + license = "GPL"; + }; + }; + + + "Products.PluginRegistry-1.3" = self.buildPythonPackage { + name = "Products.PluginRegistry-1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; + md5 = "5b166193ca1eb84dfb402051f779ebab"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Configure application plugins based on interfaces + ''; + homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "zope.datetime-3.4.1" = self.buildPythonPackage { + name = "zope.datetime-3.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz"; + md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope datetime + ''; + homepage = "http://pypi.python.org/pypi/zope.datetime"; + license = "ZPL 2.1"; + }; + }; + + + "lxml-2.3.6" = self.buildPythonPackage { + name = "lxml-2.3.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz"; + md5 = "d5d886088e78b1bdbfd66d328fc2d0bc"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API. + ''; + homepage = "http://lxml.de/"; + license = "UNKNOWN"; + }; + }; + + + "zope.location-4.0.2" = self.buildPythonPackage { + name = "zope.location-4.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; + md5 = "44d865b2c0b1e1cc93898c7df938d353"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Zope Location + ''; + homepage = "http://pypi.python.org/pypi/zope.location/"; + license = "ZPL 2.1"; + }; + }; + + + "zope.app.locales-3.6.2" = self.buildPythonPackage { + name = "zope.app.locales-3.6.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz"; + md5 = "bd2b4c6040e768f33004b1210d3207fa"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope locale extraction and management utilities + ''; + homepage = "http://pypi.python.org/pypi/zope.app.locales"; + license = "ZPL 2.1"; + }; + }; + + + "five.globalrequest-1.0" = self.buildPythonPackage { + name = "five.globalrequest-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; + md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope 2 integration for zope.globalrequest + ''; + homepage = "http://pypi.python.org/pypi/five.globalrequest"; + license = "ZPL"; + }; + }; + + + "zope.app.content-3.5.1" = self.buildPythonPackage { + name = "zope.app.content-3.5.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz"; + md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.componentvocabulary-1.0.1" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Content Type + ''; + homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; + license = "ZPL 2.1"; + }; + }; + + + "plone.locking-2.0.4" = self.buildPythonPackage { + name = "plone.locking-2.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; + md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + webdav locking support + ''; + homepage = "http://pypi.python.org/pypi/plone.locking"; + license = "GPL version 2"; + }; + }; + + + "z3c.formwidget.query-0.9" = self.buildPythonPackage { + name = "z3c.formwidget.query-0.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip"; + md5 = "d9f7960b1a5a81d8ba5241530f496522"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A source query widget for z3c.form. + ''; + homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.z3cform-0.7.3" = self.buildPythonPackage { + name = "plone.app.z3cform-0.7.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip"; + md5 = "deddc1af36efb26a6792c9803531c665"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A collection of widgets, templates and other components for use with z3c.form and Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.z3cform"; + license = "GPL"; + }; + }; + + + "plone.app.querystring-1.0.8" = self.buildPythonPackage { + name = "plone.app.querystring-1.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip"; + md5 = "3ad2155da0dd5c6b99643551ad494607"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.4" self."plone.app.layout-2.3.5" self."plone.app.vocabularies-2.1.10" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "http://pypi.python.org/pypi/plone.app.querystring"; + license = "GPL version 2"; + }; + }; + + + "zope.interface-4.0.5" = self.buildPythonPackage { + name = "zope.interface-4.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.0.5.zip"; + md5 = "caf26025ae1b02da124a58340e423dfe"; + }; + doCheck = true; + buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Interfaces for Python + ''; + homepage = "http://pypi.python.org/pypi/zope.interface"; + license = "ZPL 2.1"; + }; + }; + + + "plone.i18n-2.0.8" = self.buildPythonPackage { + name = "plone.i18n-2.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip"; + md5 = "572c21e86b99316a06dc9998454d7750"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."Unidecode-0.04.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Advanced i18n/l10n features + ''; + homepage = "http://pypi.python.org/pypi/plone.i18n"; + license = "GPL version 2"; + }; + }; + + + "Products.contentmigration-2.1.4" = self.buildPythonPackage { + name = "Products.contentmigration-2.1.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.4.zip"; + md5 = "711f9d4ea3cc2130acaa74efb0f9da5e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A generic content migration framework for Plone. + ''; + homepage = "http://pypi.python.org/pypi/Products.contentmigration"; + license = "LGPL"; + }; + }; + + + "Missing-2.13.1" = self.buildPythonPackage { + name = "Missing-2.13.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; + md5 = "9823cff54444cbbcaef8fc45d8e42572"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Special Missing objects used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/Missing"; + license = "ZPL 2.1"; + }; + }; + + + "WebTest-2.0.7" = self.buildPythonPackage { + name = "WebTest-2.0.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.7.zip"; + md5 = "4ca4e944a7f5f08b5aebd3bf90699890"; + }; + doCheck = true; + buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.2.1" self."six-1.3.0" self."waitress-0.8.5" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Helper to test WSGI applications + ''; + homepage = "http://webtest.pythonpaste.org/"; + license = "MIT"; + }; + }; + + + "ZODB3-3.10.5" = self.buildPythonPackage { + name = "ZODB3-3.10.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Object Database: object database and persistence + ''; + homepage = "UNKNOWN"; + license = "ZPL 2.1"; + }; + }; + + + "archetypes.referencebrowserwidget-2.4.18" = self.buildPythonPackage { + name = "archetypes.referencebrowserwidget-2.4.18"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip"; + md5 = "6eff85cbde401ff1566a76323792d514"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.jquerytools-1.5.5" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A referencebrowser implementation for Archetypes + ''; + homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; + license = "ZPL 2.1"; + }; + }; + + + "zope.configuration-3.7.4" = self.buildPythonPackage { + name = "zope.configuration-3.7.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; + md5 = "5b0271908ef26c05059eda76928896ea"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Configuration Markup Language (ZCML) + ''; + homepage = "http://pypi.python.org/pypi/zope.configuration"; + license = "ZPL 2.1"; + }; + }; + + + "venusian-1.0a8" = self.buildPythonPackage { + name = "venusian-1.0a8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/v/venusian/venusian-1.0a8.tar.gz"; + md5 = "a1a72166fd7cccf0f30e3305e09ce5cf"; + }; + doCheck = false; + buildInputs = [ self."nose-1.3.0" ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + A library for deferring decorator actions + ''; + homepage = "http://pylonsproject.org"; + license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; + }; + }; + + + "plone.app.contentmenu-2.0.8" = self.buildPythonPackage { + name = "plone.app.contentmenu-2.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip"; + md5 = "8ba463f1a164c454c70d26507e5bd22a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone's content menu implementation + ''; + homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; + license = "GPL version 2"; + }; + }; + + + "plone.contentrules-2.0.3" = self.buildPythonPackage { + name = "plone.contentrules-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip"; + md5 = "e743dca41b07b7ac1c2a65b652679201"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone ContentRules Engine + ''; + homepage = "http://pypi.python.org/pypi/plone.contentrules"; + license = "GPL version 2"; + }; + }; + + + "plone.protect-2.0.2" = self.buildPythonPackage { + name = "plone.protect-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip"; + md5 = "74925ffb08782e72f9b1e850fa78fffa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Security for browser forms + ''; + homepage = "http://pypi.python.org/pypi/plone.protect"; + license = "BSD"; + }; + }; + + + "transaction-1.1.1" = self.buildPythonPackage { + name = "transaction-1.1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz"; + md5 = "30b062baa34fe1521ad979fb088c8c55"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Transaction management for Python + ''; + homepage = "http://www.zope.org/Products/ZODB"; + license = "ZPL 2.1"; + }; + }; + + + "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { + name = "zope.cachedescriptors-3.5.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Method and property caching decorators + ''; + homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.discussion-2.2.6" = self.buildPythonPackage { + name = "plone.app.discussion-2.2.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip"; + md5 = "36cf9cd22119282f49facd03fb3c2632"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.5" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Enhanced discussion support for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.discussion"; + license = "GPL"; + }; + }; + + + "borg.localrole-3.0.2" = self.buildPythonPackage { + name = "borg.localrole-3.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip"; + md5 = "04082694dfda9ae5cda62747b8ac7ccf"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A PAS plugin which can manage local roles via an adapter lookup on the current context + ''; + homepage = "http://pypi.python.org/pypi/borg.localrole"; + license = "LGPL"; + }; + }; + + + "Products.ZCatalog-2.13.23" = self.buildPythonPackage { + name = "Products.ZCatalog-2.13.23"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip"; + md5 = "d425171516dfc70e543a4e2b852301cb"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope 2's indexing and search solution. + ''; + homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; + license = "ZPL 2.1"; + }; + }; + + + "Products.TinyMCE-1.3.4" = self.buildPythonPackage { + name = "Products.TinyMCE-1.3.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip"; + md5 = "e697dfdd72f3b6238e26908bb455d39a"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.5" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.10" self."Products.Archetypes-1.9.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Adds support for TinyMCE, a platform independent web based Javascript HTML WYSIWYG editor, to Plone. + ''; + homepage = "http://plone.org/products/tinymce"; + license = "LGPL"; + }; + }; + + + "python-openid-2.2.5" = self.buildPythonPackage { + name = "python-openid-2.2.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz"; + md5 = "393f48b162ec29c3de9e2973548ea50d"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + OpenID support for servers and consumers. + ''; + homepage = "http://github.com/openid/python-openid"; + license = "UNKNOWN"; + }; + }; + + + "plone.supermodel-1.2.2" = self.buildPythonPackage { + name = "plone.supermodel-1.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip"; + md5 = "6e829dc362d6ff8e3c7696277e11e322"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools self."z3c.zcmlhook-1.0b1" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Serialize Zope schema definitions to and from XML + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "BSD"; + }; + }; + + + "zope.exceptions-3.6.2" = self.buildPythonPackage { + name = "zope.exceptions-3.6.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz"; + md5 = "d7234d99d728abe3d9275346e8d24fd9"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Exceptions + ''; + homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.users-1.2a2" = self.buildPythonPackage { + name = "plone.app.users-1.2a2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip"; + md5 = "a96e42e34d97162363cb3bbc8483d2ba"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.6" self."plone.app.layout-2.3.5" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A package for all things users and groups related (specific to plone) + ''; + homepage = "http://pypi.python.org/pypi/plone.app.users"; + license = "GPL version 2"; + }; + }; + + + "plone.z3cform-0.8.0" = self.buildPythonPackage { + name = "plone.z3cform-0.8.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; + md5 = "bdb23dd162544964d2f8f8f5f002e874"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. + ''; + homepage = "http://pypi.python.org/pypi/plone.z3cform"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.caching-1.1.4" = self.buildPythonPackage { + name = "plone.app.caching-1.1.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip"; + md5 = "bbb46c9dc36f0ac6cc833ee152203a81"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.3" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Plone UI and default rules for plone.caching/z3c.caching + ''; + homepage = "http://pypi.python.org/pypi/plone.app.caching"; + license = "GPL version 2"; + }; + }; + + + "Record-2.13.0" = self.buildPythonPackage { + name = "Record-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip"; + md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Special Record objects used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/Record"; + license = "ZPL 2.1"; + }; + }; + + + "AccessControl-3.0.6" = self.buildPythonPackage { + name = "AccessControl-3.0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip"; + md5 = "a8ce472482adabf9ec969f3971a39a19"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self."Record-2.13.0" self."RestrictedPython-3.6.0" self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Security framework for Zope2. + ''; + homepage = "http://pypi.python.org/pypi/AccessControl"; + license = "ZPL 2.1"; + }; + }; + + + "plone.resourceeditor-1.0" = self.buildPythonPackage { + name = "plone.resourceeditor-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; + md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/plone/plone.resourceeditor"; + license = "GPL"; + }; + }; + + + "plone.app.textfield-1.2.2" = self.buildPythonPackage { + name = "plone.app.textfield-1.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip"; + md5 = "f832887a40826d6f68c48b48f071fb9c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Text field with MIME type support + ''; + homepage = "http://pypi.python.org/pypi/plone.app.textfield"; + license = "GPL"; + }; + }; + + + "zope.event-3.5.2" = self.buildPythonPackage { + name = "zope.event-3.5.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; + md5 = "6e8af2a16157a74885d4f0d88137cefb"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Very basic event publishing system + ''; + homepage = "http://pypi.python.org/pypi/zope.event"; + license = "ZPL 2.1"; + }; + }; + + + "pyquery-1.2.4" = self.buildPythonPackage { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self."cssselect-0.8" self."lxml-3.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + A jquery-like library for python + ''; + homepage = "https://github.com/gawel/pyquery"; + license = "BSD"; + }; + }; + + + "initgroups-2.13.0" = self.buildPythonPackage { + name = "initgroups-2.13.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip"; + md5 = "38e842dcab8445f65e701fec75213acd"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Convenience uid/gid helper function used in Zope2. + ''; + homepage = "http://pypi.python.org/pypi/initgroups"; + license = "ZPL 2.1"; + }; + }; + + + "zdaemon-2.0.7" = self.buildPythonPackage { + name = "zdaemon-2.0.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz"; + md5 = "291a875f82e812110557eb6704af8afe"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Daemon process control library and tools for Unix-based systems + ''; + homepage = "http://www.python.org/pypi/zdaemon"; + license = "ZPL 2.1"; + }; + }; + + + "plone.alterego-1.0" = self.buildPythonPackage { + name = "plone.alterego-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip"; + md5 = "b7b6dbcbba00505d98d5aba83e016408"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Low level support for dynamic modules + ''; + homepage = "http://code.google.com/p/dexterity"; + license = "LGPL"; + }; + }; + + + "z3c.zcmlhook-1.0b1" = self.buildPythonPackage { + name = "z3c.zcmlhook-1.0b1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz"; + md5 = "7b6c80146f5930409eb0b355ddf3daeb"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Easily hook into the ZCML processing machinery + ''; + homepage = "UNKNOWN"; + license = "ZPL"; + }; + }; + + + "zope.authentication-3.7.1" = self.buildPythonPackage { + name = "zope.authentication-3.7.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip"; + md5 = "7d6bb340610518f2fc71213cfeccda68"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Definition of authentication basics for the Zope Framework + ''; + homepage = "http://pypi.python.org/pypi/zope.authentication"; + license = "ZPL 2.1"; + }; + }; + + + "eggtestinfo-0.3" = self.buildPythonPackage { + name = "eggtestinfo-0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz"; + md5 = "6f0507aee05f00c640c0d64b5073f840"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Add test information to .egg-info + ''; + homepage = "http://pypi.python.org/pypi/eggtestinfo"; + license = "PSF or ZPL"; + }; + }; + + + "plone.portlet.collection-2.1.5" = self.buildPythonPackage { + name = "plone.portlet.collection-2.1.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip"; + md5 = "065f0d9141860229cf66d0ff2ed6d4ea"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A portlet that fetches results from a collection + ''; + homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; + license = "GPL version 2"; + }; + }; + + + "zope.browser-1.3" = self.buildPythonPackage { + name = "zope.browser-1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip"; + md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Shared Zope Toolkit browser components + ''; + homepage = "http://pypi.python.org/pypi/zope.browser"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.collection-1.0.10" = self.buildPythonPackage { + name = "plone.app.collection-1.0.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip"; + md5 = "1042ac059be2311d4758452a3fa4f82e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."archetypes.querywidget-1.0.8" self."plone.app.contentlisting-1.0.4" self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.app.vocabularies-2.1.10" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.1" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + This package adds 'saved search' functionality to Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.collection"; + license = "GPL version 2"; + }; + }; + + + "Products.CMFCalendar-2.2.2" = self.buildPythonPackage { + name = "Products.CMFCalendar-2.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz"; + md5 = "49458e68dc3b6826ea9a3576ac014419"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Calendar product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage { + name = "Products.PluggableAuthService-1.10.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; + md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Pluggable Zope2 authentication / authorization framework + ''; + homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "Plone-4.3.1" = self.buildPythonPackage { + name = "Plone-4.3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip"; + md5 = "faefd5d2044a9f7660fd18388fd71a4e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.caching-1.1.4" self."plone.app.dexterity-2.0.8" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.1" self.setuptools self."wicked-1.1.10" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The Plone Content Management System + ''; + homepage = "http://plone.org/"; + license = "GPL version 2"; + }; + }; + + + "wicked-1.1.10" = self.buildPythonPackage { + name = "wicked-1.1.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.container-3.11.2" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + wicked is a compact syntax for doing wiki-like content linking and creation in zope and plone + ''; + homepage = "http://pypi.python.org/pypi/wicked"; + license = "GPL"; + }; + }; + + + "zope.broken-3.6.0" = self.buildPythonPackage { + name = "zope.broken-3.6.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip"; + md5 = "eff24d7918099a3e899ee63a9c31bee6"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Broken Object Interfaces + ''; + homepage = "http://pypi.python.org/pypi/zope.broken"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.jquerytools-1.5.5" = self.buildPythonPackage { + name = "plone.app.jquerytools-1.5.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip"; + md5 = "7a4957a3a8482e4963e49e2d02772e33"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + jQuery Tools integration for Plone plus overlay and AJAX form helpers. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; + license = "GPL version 2"; + }; + }; + + + "plone.app.viewletmanager-2.0.3" = self.buildPythonPackage { + name = "plone.app.viewletmanager-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip"; + md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.10" self."Products.GenericSetup-1.7.3" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + configurable viewlet manager + ''; + homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; + license = "GPL version 2"; + }; + }; + + + "Products.GenericSetup-1.7.3" = self.buildPythonPackage { + name = "Products.GenericSetup-1.7.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz"; + md5 = "c48967c81c880ed33ee16a14caab3b11"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Read Zope configuration state from profile dirs / tarballs + ''; + homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "plone.app.jquery-1.7.2" = self.buildPythonPackage { + name = "plone.app.jquery-1.7.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; + md5 = "e204cf45456d26217263531832b5bdac"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + jQuery integration for Plone + ''; + homepage = "http://pypi.python.org/pypi/plone.app.jquery"; + license = "GPL version 2"; + }; + }; + + + "plone.schemaeditor-1.3.2" = self.buildPythonPackage { + name = "plone.schemaeditor-1.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip"; + md5 = "ab9cb4e929f305063dc8f33e9a33fd21"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.autoform-1.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Provides through-the-web editing of a zope schema/interface. + ''; + homepage = "http://svn.plone.org/svn/plone/plone.schemaeditor"; + license = "BSD"; + }; + }; + + + "zope.structuredtext-3.5.1" = self.buildPythonPackage { + name = "zope.structuredtext-3.5.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz"; + md5 = "eabbfb983485d0879322bc878d2478a0"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + StructuredText parser + ''; + homepage = "http://pypi.python.org/pypi/zope.structuredtext"; + license = "ZPL 2.1"; + }; + }; + + + "zope.ramcache-1.0" = self.buildPythonPackage { + name = "zope.ramcache-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip"; + md5 = "87289e15f0e51f50704adda1557c02a7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope RAM Cache + ''; + homepage = "http://pypi.python.org/pypi/zope.ramcache"; + license = "ZPL 2.1"; + }; + }; + + + "ZopeUndo-2.12.0" = self.buildPythonPackage { + name = "ZopeUndo-2.12.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; + md5 = "2b8da09d1b98d5558f62e12f6e52c401"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + ZODB undo support for Zope2. + ''; + homepage = "http://pypi.python.org/pypi/ZopeUndo"; + license = "ZPL 2.1"; + }; + }; + + + "zope.traversing-3.13.2" = self.buildPythonPackage { + name = "zope.traversing-3.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip"; + md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Resolving paths in the object hierarchy + ''; + homepage = "http://pypi.python.org/pypi/zope.traversing"; + license = "ZPL 2.1"; + }; + }; + + + "zope.contentprovider-3.7.2" = self.buildPythonPackage { + name = "zope.contentprovider-3.7.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz"; + md5 = "1bb2132551175c0123f17939a793f812"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.tales-3.5.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Content Provider Framework for Zope Templates + ''; + homepage = "http://pypi.python.org/pypi/zope.contentprovider"; + license = "ZPL 2.1"; + }; + }; + + + "plonetheme.classic-1.3.2" = self.buildPythonPackage { + name = "plonetheme.classic-1.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip"; + md5 = "c77d4c34afaf7c02df44d4df72328155"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The classic Plone 3 default theme. + ''; + homepage = "http://pypi.python.org/pypi/plonetheme.classic"; + license = "GPL version 2"; + }; + }; + + + "Products.CMFCore-2.2.7" = self.buildPythonPackage { + name = "Products.CMFCore-2.2.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; + md5 = "9320a4023b8575097feacfd4a400e930"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.3" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Content Management Framework core components + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFCore"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "plone.scale__storage-1.3.2" = self.buildPythonPackage { + name = "plone.scale__storage-1.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip"; + md5 = "584ccbf515aff9fef363c2cc8abac789"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."Persistence-2.13.2" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Image scaling + ''; + homepage = "http://pypi.python.org/pypi/plone.scale"; + license = "BSD"; + }; + }; + + + "plone.portlet.static-2.0.2" = self.buildPythonPackage { + name = "plone.portlet.static-2.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; + md5 = "ec0dc691b4191a41ff97779b117f9985"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.2" self."plone.app.portlets-2.4.4" self."plone.i18n-2.0.8" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A simple static HTML portlet for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.portlet.static"; + license = "GPL version 2"; + }; + }; + + + "plone.app.imaging-1.0.9" = self.buildPythonPackage { + name = "plone.app.imaging-1.0.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip"; + md5 = "e680c5540021a70266343b935ac732a7"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + User-configurable, blob-aware image scaling for Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.imaging"; + license = "GPL version 2"; + }; + }; + + + "Products.SecureMailHost-1.1.2" = self.buildPythonPackage { + name = "Products.SecureMailHost-1.1.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip"; + md5 = "7db0f1fa867bd0df972082f502a7a707"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + SecureMailHost is a reimplementation of the standard Zope2 MailHost with some security and usability enhancements. + ''; + homepage = "http://svn.plone.org/svn/collective/SecureMailHost/trunk"; + license = "ZPL"; + }; + }; + + + "plone.portlets-2.2" = self.buildPythonPackage { + name = "plone.portlets-2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip"; + md5 = "5b7e06bee6e40af83694b82e1fee8c2d"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.memoize-1.1.1" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + An extension of zope.viewlet to support dynamic portlets + ''; + homepage = "http://pypi.python.org/pypi/plone.portlets"; + license = "GPL version 2"; + }; + }; + + + "archetypes.querywidget-1.0.8" = self.buildPythonPackage { + name = "archetypes.querywidget-1.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip"; + md5 = "3416b6b4948c624e1b5b8dd8d7e33f59"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; + license = "GPL version 2"; + }; + }; + + + "Acquisition-2.13.8" = self.buildPythonPackage { + name = "Acquisition-2.13.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. + ''; + homepage = "http://pypi.python.org/pypi/Acquisition"; + license = "ZPL 2.1"; + }; + }; + + + "repoze.xmliter-0.5" = self.buildPythonPackage { + name = "repoze.xmliter-0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip"; + md5 = "99da76bcbad6fbaced4a273bde29b10e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Wrapper for ``lxml`` trees which serializes to string upon iteration. + ''; + homepage = "http://www.repoze.org"; + license = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; + }; + }; + + + "zLOG-2.11.1" = self.buildPythonPackage { + name = "zLOG-2.11.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz"; + md5 = "68073679aaa79ac5a7b6a5c025467147"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."ZConfig-2.9.1" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A general logging facility + ''; + homepage = "http://cheeseshop.python.org/pypi/zLOG"; + license = "ZPL 2.1"; + }; + }; + + + "zope.location-3.9.1" = self.buildPythonPackage { + name = "zope.location-3.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz"; + md5 = "1684a8f986099d15296f670c58e713d8"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.schema-4.2.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope Location + ''; + homepage = "http://pypi.python.org/pypi/zope.location/"; + license = "ZPL 2.1"; + }; + }; + + + "experimental.cssselect-0.3" = self.buildPythonPackage { + name = "experimental.cssselect-0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip"; + md5 = "3fecdcf1fbc3ea6025e115a56a262957"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Experimental version of lxml.cssselect + ''; + homepage = "https://github.com/lrowe/experimental.cssselect"; + license = "UNKNOWN"; + }; + }; + + + "zope.formlib-4.0.6" = self.buildPythonPackage { + name = "zope.formlib-4.0.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip"; + md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."pytz-2013b" self.setuptools self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.datetime-3.4.1" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Form generation and validation library for Zope + ''; + homepage = "http://pypi.python.org/pypi/zope.formlib"; + license = "ZPL 2.1"; + }; + }; + + + "zope.copy-3.5.0" = self.buildPythonPackage { + name = "zope.copy-3.5.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz"; + md5 = "a9836a5d36cd548be45210eb00407337"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Pluggable object copying mechanism + ''; + homepage = "http://pypi.python.org/pypi/zope.copy"; + license = "ZPL 2.1"; + }; + }; + + + "plone.subrequest-1.6.7" = self.buildPythonPackage { + name = "plone.subrequest-1.6.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip"; + md5 = "cc12f68a22565415b10dbeef0020baa4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Subrequests for Zope2 + ''; + homepage = "http://pypi.python.org/pypi/plone.subrequest/"; + license = "GPL version 2"; + }; + }; + + + "plone.app.vocabularies-2.1.10" = self.buildPythonPackage { + name = "plone.app.vocabularies-2.1.10"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz"; + md5 = "166a0d6f9a3e3cd753efa56aaef585be"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A collection of generally useful vocabularies. + ''; + homepage = "https://github.com/plone/plone.app.vocabularies"; + license = "GPL version 2"; + }; + }; + + + "plone.registry-1.0.1" = self.buildPythonPackage { + name = "plone.registry-1.0.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip"; + md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + A debconf-like (or about:config-like) registry for storing application settings + ''; + homepage = "http://pypi.python.org/pypi/plone.registry"; + license = "GPL"; + }; + }; + + + "Products.ExtendedPathIndex-3.1" = self.buildPythonPackage { + name = "Products.ExtendedPathIndex-3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip"; + md5 = "00c048a4b103200bdcbda61fa22c66df"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Zope catalog index for paths + ''; + homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; + license = "GPL version 2"; + }; + }; + + + "zope.i18nmessageid-3.5.3" = self.buildPythonPackage { + name = "zope.i18nmessageid-3.5.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; + md5 = "cb84bf61c2b7353e3b7578057fbaa264"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Message Identifiers for internationalization + ''; + homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; + license = "ZPL 2.1"; + }; + }; + + + "plone.app.linkintegrity-1.5.2" = self.buildPythonPackage { + name = "plone.app.linkintegrity-1.5.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip"; + md5 = "f97c61da9f243391cafdfe3fe1cf6d6c"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Manage link integrity in Plone. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; + license = "GPL version 2"; + }; + }; + + + "Products.CMFActionIcons-2.1.3" = self.buildPythonPackage { + name = "Products.CMFActionIcons-2.1.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz"; + md5 = "ab1dc62404ed11aea84dc0d782b2235e"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Action icons product for the Zope Content Management Framework + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + }; + }; + + + "zope.app.form-4.0.2" = self.buildPythonPackage { + name = "zope.app.form-4.0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz"; + md5 = "3d2b164d9d37a71490a024aaeb412e91"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."transaction-1.1.1" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.datetime-3.4.1" self."zope.exceptions-3.6.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.proxy-3.6.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + The Original Zope 3 Form Framework + ''; + homepage = "http://pypi.python.org/pypi/zope.app.form"; + license = "ZPL 2.1"; + }; + }; + + + "five.localsitemanager-2.0.5" = self.buildPythonPackage { + name = "five.localsitemanager-2.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip"; + md5 = "5e3a658e6068832bd802018ebc83f2d4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Local site manager implementation for Zope 2 + ''; + homepage = "http://pypi.python.org/pypi/five.localsitemanager"; + license = "ZPL 2.1"; + }; + }; + + + "Products.PythonScripts-2.13.2" = self.buildPythonPackage { + name = "Products.PythonScripts-2.13.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; + md5 = "04c86f2c45a29a162297a80dac61d14f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Provides support for restricted execution of Python scripts in Zope 2. + ''; + homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; + license = "ZPL 2.1"; + }; + }; + + +} + diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json new file mode 100644 index 00000000000..245638cfe46 --- /dev/null +++ b/pkgs/top-level/python-packages.json @@ -0,0 +1,109 @@ +[ + { "name": "pyramid", + "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], + "override": { + "pyramid": { + "buildInputs": [ + "nose", + "WebTest", + "zope.component", + "zope.interface" + ] + }, + "cssselect": { + "doCheck": false + }, + "lxml": { + "buildInputs": [ "pkgs.libxml2", "pkgs.libxslt" ], + "doCheck": false + }, + "six": { + "doCheck": false + }, + "beautifulsoup4": { + "doCheck": false + }, + "zope.exceptions": { + "doCheck": false + }, + "zope.component": { + "doCheck": false + }, + "zope.schema": { + "doCheck": false + }, + "zope.testing": { + "buildInputs": [ "zope.location" ] + }, + "waitress": { + "doCheck": false + }, + "venusian": { + "buildInputs": [ "nose" ], + "doCheck": false + }, + "Mako": { + "buildInputs": [ "nose" ] + }, + "WebOb": { + "buildInputs": [ "nose" ], + "propagatedBuildInputs": [ "python.modules.ssl" ] + }, + "WebTest": { + "buildInputs": [ + "nose", + "unittest2", + "pyquery", + "WSGIProxy2", + "PasteDeploy", + "mock", + "coverage" + ] + }, + "mock": { + "buildInputs": [ "unittest2" ] + }, + "PasteDeploy": { + "buildInputs": [ "nose" ] + }, + "Chameleon": { + "buildInputs": [ "zope.event" ], + "doCheck": false + }, + "zope.interface": { + "buildInputs": [ "zope.event" ] + }, + "translationstring": { + "buildInputs": [ "nose" ] + }, + "repoze.lru": { + "buildInputs": [ "nose" ] + } + } + }, + { "name": "Plone", + "extends": "http://dist.plone.org/release/4.3.1/versions.cfg", + "doCheck": false, + "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .", + "override": { + "Products.DCWorkflow": { + "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Products.CMFDefault": { + "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Products.CMFQuickInstallerTool": { + "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Products.CMFUid": { + "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Products.CMFActionIcons": { + "propagatedBuildInputs": [ "eggtestinfo" ] + }, + "Products.CMFCalendar": { + "propagatedBuildInputs": [ "eggtestinfo" ] + } + } + } +] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cfa7b94353..f515d436cf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7,7 +7,11 @@ optional = pkgs.lib.optional; optionals = pkgs.lib.optionals; modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; }; -pythonPackages = modules // rec { +pythonPackages = modules // import ./python-packages-generated.nix { + inherit pkgs python; + inherit (pkgs) stdenv fetchurl; + self = pythonPackages; +} // rec { inherit python; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; From a646dee027375c84962d71598324d8e19a8c18d1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Aug 2013 02:42:33 +0200 Subject: [PATCH 221/332] removing existing plone packages --- pkgs/development/web/plone/4.1.nix | 5141 -------------------------- pkgs/development/web/plone/4.2.nix | 5394 --------------------------- pkgs/development/web/plone/4.3.nix | 5532 ---------------------------- pkgs/top-level/all-packages.nix | 15 - 4 files changed, 16082 deletions(-) delete mode 100644 pkgs/development/web/plone/4.1.nix delete mode 100644 pkgs/development/web/plone/4.2.nix delete mode 100644 pkgs/development/web/plone/4.3.nix diff --git a/pkgs/development/web/plone/4.1.nix b/pkgs/development/web/plone/4.1.nix deleted file mode 100644 index 47bd00b80cb..00000000000 --- a/pkgs/development/web/plone/4.1.nix +++ /dev/null @@ -1,5141 +0,0 @@ -# DO NOT EDIT THIS FILE! -# -# Nix expressions autogenerated with: -# bin/pypi2nix -n plone41Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.1.6.json -p plone/4.1.6.txt -o plone/4.1.6.nix - -{ pkgs, pythonPackages }: - -let plone41Packages = pythonPackages.python.modules // rec { - inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow; - inherit (pkgs) fetchurl stdenv; - - plone_app_portlets = buildPythonPackage rec { - name = "plone.app.portlets-2.1.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.1.8.zip"; - md5 = "cfdcd1c2261103f8ce823813b2ca54ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope2 = buildPythonPackage rec { - name = "Zope2-2.13.15"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.15.zip"; - md5 = "dc43f1fa82a3aa044466143c5524143c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_btreefolder2 = buildPythonPackage rec { - name = "Products.BTreeFolder2-2.13.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz"; - md5 = "f57c85673036af7ccd34c3fa251f6bb2"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pythonscripts = buildPythonPackage rec { - name = "Products.PythonScripts-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.0.zip"; - md5 = "db1fad6815cb238a58dbbab8d5e95667"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zopeundo = buildPythonPackage rec { - name = "ZopeUndo-2.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; - md5 = "2b8da09d1b98d5558f62e12f6e52c401"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - datetime = buildPythonPackage rec { - name = "DateTime-2.12.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-2.12.6.zip"; - md5 = "b2ade6cd7e85dd0c38c770f015c42500"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface pytz ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_session = buildPythonPackage rec { - name = "plone.session-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip"; - md5 = "f95872454735abc8f27c3dcbc9434c11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_container = buildPythonPackage rec { - name = "zope.container-3.11.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz"; - md5 = "fc66d85a17b8ffb701091c9328983dcc"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_folder = buildPythonPackage rec { - name = "plone.folder-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.1.zip"; - md5 = "acb3958b623c0da35fdb259c94120396"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonepas = buildPythonPackage rec { - name = "Products.PlonePAS-4.0.13"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.0.13.zip"; - md5 = "93da488c71a2b8a1751f1733cbc235f1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_locales = buildPythonPackage rec { - name = "plone.app.locales-4.0.13"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.0.13.zip"; - md5 = "276fcceff2b567a32293de373e182d1f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sequencesort = buildPythonPackage rec { - name = "zope.sequencesort-3.4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz"; - md5 = "cfc35fc426a47f5c0ee43c416224b864"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_genericsetup = buildPythonPackage rec { - name = "Products.GenericSetup-1.6.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.6.6.tar.gz"; - md5 = "f9ce78d543052179ebc3cedcc3c5852f"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - kss_core = buildPythonPackage rec { - name = "kss.core-1.6.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/k/kss.core/kss.core-1.6.3.zip"; - md5 = "e9e0974851499556b7d09d79e1e14f11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_security zope_datetime zope_app_component zope_app_publication zope_pagetemplate zope_interface zope_location zope_app_publisher zope_contenttype zope_configuration zope_publisher zope_component zope_event setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope_app_folder zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tal = buildPythonPackage rec { - name = "zope.tal-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip"; - md5 = "13869f292ba36b294736b7330b1396fd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_cachepurging = buildPythonPackage rec { - name = "plone.cachepurging-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.3.tar.gz"; - md5 = "26d47c4e2dccfb1992feb259e7e01c11"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_securemailhost = buildPythonPackage rec { - name = "Products.SecureMailHost-1.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip"; - md5 = "7db0f1fa867bd0df972082f502a7a707"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_portaltransforms = buildPythonPackage rec { - name = "Products.PortalTransforms-2.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.0.7.zip"; - md5 = "bd3568fa71e8941d049514ba91b3292e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_memoize = buildPythonPackage rec { - name = "plone.memoize-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip"; - md5 = "d07cd14b976160e1f26a859e3370147e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - docutils = buildPythonPackage rec { - name = "docutils-0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.7.tar.gz"; - md5 = "9aec716baf15d06b5aa57cf8d5591c15"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_formlib = buildPythonPackage rec { - name = "five.formlib-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip"; - md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zexceptions = buildPythonPackage rec { - name = "zExceptions-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip"; - md5 = "4c679696c959040d8e656ef85ae40136"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfuid = buildPythonPackage rec { - name = "Products.CMFUid-2.2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz"; - md5 = "e20727959351dffbf0bac80613eee110"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - restrictedpython = buildPythonPackage rec { - name = "RestrictedPython-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip"; - md5 = "aa75a7dcc7fbc966357837cc66cacec6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - feedparser = buildPythonPackage rec { - name = "feedparser-5.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip"; - md5 = "cefffeba66b658d3cc7c1d66b92c6a1a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browser = buildPythonPackage rec { - name = "zope.browser-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip"; - md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdefault = buildPythonPackage rec { - name = "Products.CMFDefault-2.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.2.tar.gz"; - md5 = "87d0a1637afb1d09731b376f72236e31"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_dateutil = buildPythonPackage rec { - name = "python-dateutil-1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_error = buildPythonPackage rec { - name = "zope.error-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz"; - md5 = "281445a906458ff5f18f56923699a127"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_monkeypatcher = buildPythonPackage rec { - name = "collective.monkeypatcher-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip"; - md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetools = buildPythonPackage rec { - name = "Products.MIMETools-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ documenttemplate setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deprecation = buildPythonPackage rec { - name = "zope.deprecation-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz"; - md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unidecode = buildPythonPackage rec { - name = "Unidecode-0.04.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; - md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcore = buildPythonPackage rec { - name = "Products.CMFCore-2.2.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.6.tar.gz"; - md5 = "ae649fd2d54755691148c86d2e02c8ae"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_zsqlmethods five_localsitemanager setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_localsitemanager = buildPythonPackage rec { - name = "five.localsitemanager-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip"; - md5 = "5e3a658e6068832bd802018ebc83f2d4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_configuration = buildPythonPackage rec { - name = "zope.configuration-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_batching = buildPythonPackage rec { - name = "z3c.batching-1.1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.batching/z3c.batching-1.1.0.tar.gz"; - md5 = "d1dc834781d228127ca6d15301757863"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_form = buildPythonPackage rec { - name = "z3c.form-2.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-2.5.1.tar.gz"; - md5 = "f029f83dd226f695f55049ed1ecee95e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_pagetemplate zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_traversing zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcalendar = buildPythonPackage rec { - name = "Products.CMFCalendar-2.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz"; - md5 = "49458e68dc3b6826ea9a3576ac014419"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_extendedpathindex = buildPythonPackage rec { - name = "Products.ExtendedPathIndex-2.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-2.9.zip"; - md5 = "7dfd5a6c3abc87f91cbaab3798038e1f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_schemaextender = buildPythonPackage rec { - name = "archetypes.schemaextender-2.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.1.zip"; - md5 = "3659dd72db341b629308d90f135031df"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zconfig = buildPythonPackage rec { - name = "ZConfig-2.9.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip"; - md5 = "5c932690a70c8907efd240cdd76a7bc4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_copypastemove = buildPythonPackage rec { - name = "zope.copypastemove-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.copypastemove/zope.copypastemove-3.7.0.tar.gz"; - md5 = "f335940686d15cfc5520c42f2494a924"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_container zope_copy zope_interface zope_location zope_exceptions zope_component zope_event setuptools zope_lifecycleevent zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentmenu = buildPythonPackage rec { - name = "plone.app.contentmenu-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.5.tar.gz"; - md5 = "50de3ddf80d602ab79064d652275c2e7"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_app_publisher zope_publisher products_cmfdynamicviewfti zope_interface plone_memoize plone_app_content zope_component zope2 acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluginregistry = buildPythonPackage rec { - name = "Products.PluginRegistry-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplacefulworkflow = buildPythonPackage rec { - name = "Products.CMFPlacefulWorkflow-1.5.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.7.zip"; - md5 = "7617fcd9d2590c0d2f1b6cff08addc8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_outputfilters = buildPythonPackage rec { - name = "plone.outputfilters-1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.2.zip"; - md5 = "052ec24783b6ca7b5e55e50c7b57d3a2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_publisher = buildPythonPackage rec { - name = "zope.publisher-3.12.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz"; - md5 = "495131970cc7cb14de8e517fb3857ade"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_security = buildPythonPackage rec { - name = "zope.security-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; - md5 = "072ab8d11adc083eace11262da08630c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zdaemon = buildPythonPackage rec { - name = "zdaemon-2.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz"; - md5 = "291a875f82e812110557eb6704af8afe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_annotation = buildPythonPackage rec { - name = "zope.annotation-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz"; - md5 = "4238153279d3f30ab5613438c8e76380"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmftestcase = buildPythonPackage rec { - name = "Products.CMFTestCase-0.9.11"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/Products.CMFTestCase-0.9.11.zip"; - md5 = "19ed5008a93eff36b853780dd0bca119"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope2 products_genericsetup zope_site zope_interface zope_component zodb3 products_cmfdefault products_cmfcalendar setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_structuredtext = buildPythonPackage rec { - name = "zope.structuredtext-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz"; - md5 = "eabbfb983485d0879322bc878d2478a0"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zodb3 = buildPythonPackage rec { - name = "ZODB3-3.10.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - documenttemplate = buildPythonPackage rec { - name = "DocumentTemplate-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_globalrequest = buildPythonPackage rec { - name = "zope.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip"; - md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_customerize = buildPythonPackage rec { - name = "plone.app.customerize-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip"; - md5 = "6a3802c4e8fbd955597adc6a8298febf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdifftool = buildPythonPackage rec { - name = "Products.CMFDiffTool-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip"; - md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testbrowser = buildPythonPackage rec { - name = "zope.testbrowser-3.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz"; - md5 = "64abbee892121e7f1a91aed12cfc155a"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_contentmigration = buildPythonPackage rec { - name = "Products.contentmigration-2.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.1.zip"; - md5 = "3231b92976728ced7b9699472fe0cc43"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_intelligenttext = buildPythonPackage rec { - name = "plone.intelligenttext-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.1.zip"; - md5 = "bec8ed2107d3c1b63a60d49a1a88ddeb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_classic = buildPythonPackage rec { - name = "plonetheme.classic-1.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.1.2.tar.gz"; - md5 = "b1305c82931e9e19ce910318c8e1dc55"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_kupu = buildPythonPackage rec { - name = "Products.kupu-1.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.kupu/Products.kupu-1.5.0.zip"; - md5 = "0952b721f77fdb38bd0bbc0a52943cbd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid products_genericsetup zope_interface products_portaltransforms products_cmfcore products_archetypes products_mimetypesregistry setuptools products_cmfplone zope_schema zope_i18n plone_outputfilters ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_authentication = buildPythonPackage rec { - name = "zope.authentication-3.7.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip"; - md5 = "7d6bb340610518f2fc71213cfeccda68"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18n = buildPythonPackage rec { - name = "zope.i18n-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz"; - md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_componentvocabulary = buildPythonPackage rec { - name = "zope.componentvocabulary-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz"; - md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_ofsp = buildPythonPackage rec { - name = "Products.OFSP-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip"; - md5 = "c76d40928753c2ee56db873304e65bd5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol persistence setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_datetime = buildPythonPackage rec { - name = "zope.datetime-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz"; - md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_form = buildPythonPackage rec { - name = "plone.app.form-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.0.5.tar.gz"; - md5 = "ecac76663325511a110837e7ad7c24a6"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_app_form zope_site zope_formlib plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_schema zope_lifecycleevent zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_passwordresettool = buildPythonPackage rec { - name = "Products.PasswordResetTool-2.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.8.zip"; - md5 = "f6658bec0ba11a34f53e8ef49461ad4a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_jquerytools = buildPythonPackage rec { - name = "plone.app.jquerytools-1.3.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.3.2.zip"; - md5 = "326470a34e07aa98c40d75ec22484572"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_validation = buildPythonPackage rec { - name = "Products.validation-2.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip"; - md5 = "afa217e2306637d1dccbebf337caa8bf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_registry = buildPythonPackage rec { - name = "plone.registry-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip"; - md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_pagetemplate = buildPythonPackage rec { - name = "zope.app.pagetemplate-3.11.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/zope.app.pagetemplate-3.11.2.tar.gz"; - md5 = "2d304729c0d6a9ab67dd5ea852f19476"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_browserpage zope_traversing zope_tales zope_size zope_pagetemplate zope_dublincore zope_security zope_component zope_configuration setuptools zope_interface zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_viewlet = buildPythonPackage rec { - name = "zope.viewlet-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz"; - md5 = "367e03096df57e2f9b74fff43f7901f9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_static = buildPythonPackage rec { - name = "plone.portlet.static-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.1.zip"; - md5 = "63a5f5555cd9d829e995bd7fe23a44b3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_collection = buildPythonPackage rec { - name = "plone.portlet.collection-2.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.0.4.tar.gz"; - md5 = "39ba9a24e240ffe30c3a0d1984b771f1"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_users = buildPythonPackage rec { - name = "plone.app.users-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.1.3.tar.gz"; - md5 = "21b1ac5c3a8ff554f1cbf593fd1d3600"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_app_form setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_theme = buildPythonPackage rec { - name = "plone.theme-2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip"; - md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18nmessageid = buildPythonPackage rec { - name = "zope.i18nmessageid-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; - md5 = "cb84bf61c2b7353e3b7578057fbaa264"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_folder = buildPythonPackage rec { - name = "plone.app.folder-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.4.zip"; - md5 = "90fbe9c841a2f01d06979a1869c12fce"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_folder setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zcatalog = buildPythonPackage rec { - name = "Products.ZCatalog-2.13.23"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip"; - md5 = "d425171516dfc70e543a4e2b852301cb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_autoinclude = buildPythonPackage rec { - name = "z3c.autoinclude-0.3.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip"; - md5 = "6a615ae18c12b459bceb3ae28e8e7709"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_processlifetime = buildPythonPackage rec { - name = "zope.processlifetime-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz"; - md5 = "69604bfd668a01ebebdd616a8f26ccfe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_uuid = buildPythonPackage rec { - name = "plone.uuid-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip"; - md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_kss = buildPythonPackage rec { - name = "archetypes.kss-1.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.kss/archetypes.kss-1.7.2.zip"; - md5 = "a8502140123b74f1b7ed4f36d3e56ff3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_traversing = buildPythonPackage rec { - name = "zope.traversing-3.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip"; - md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_gettext = buildPythonPackage rec { - name = "python-gettext-1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; - md5 = "cd4201d440126d1296d1d2bc2b4795f3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unittest2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_stringinterp = buildPythonPackage rec { - name = "plone.stringinterp-1.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.5.tar.gz"; - md5 = "a60848a07b35c14639ca6aa0d9c4d66b"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_container = buildPythonPackage rec { - name = "zope.app.container-3.9.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.container/zope.app.container-3.9.2.tar.gz"; - md5 = "1e286c59f0166e517d67ddd723641c84"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_copypastemove zope_exceptions zope_component zope_dublincore zope_location zope_browsermenu zope_size zope_security zope_publisher zope_container zope_browserpage zope_event setuptools zope_interface zope_lifecycleevent zope_browser zope_i18n zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonelanguagetool = buildPythonPackage rec { - name = "Products.PloneLanguageTool-3.2.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.4.tar.gz"; - md5 = "6cdc7d49a0b76051b80ca915289ad72d"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - eggtestinfo = buildPythonPackage rec { - name = "eggtestinfo-0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz"; - md5 = "6f0507aee05f00c640c0d64b5073f840"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mailinglogger = buildPythonPackage rec { - name = "mailinglogger-3.3.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.3.3.tar.gz"; - md5 = "1e5897227b7990ee0c2d98f1ad33b072"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - missing = buildPythonPackage rec { - name = "Missing-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deferredimport = buildPythonPackage rec { - name = "zope.deferredimport-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz"; - md5 = "68fce3bf4f011d4a840902fd763884ee"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tales = buildPythonPackage rec { - name = "zope.tales-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz"; - md5 = "1c5060bd766a0a18632b7879fc9e4e1e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools zope_tal ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zsqlmethods = buildPythonPackage rec { - name = "Products.ZSQLMethods-2.13.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip"; - md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_statusmessages = buildPythonPackage rec { - name = "Products.statusmessages-4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip"; - md5 = "265324b0a58a032dd0ed038103ed0473"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_i18n = buildPythonPackage rec { - name = "plone.i18n-2.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.6.zip"; - md5 = "651e8cbc2cea201276777ab56337a3ee"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_transformchain = buildPythonPackage rec { - name = "plone.transformchain-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.2.tar.gz"; - md5 = "18f836f28ad78ee69ab5d182a1b7664a"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluggableauthservice = buildPythonPackage rec { - name = "Products.PluggableAuthService-1.8.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.8.0.tar.gz"; - md5 = "76de2b0c95e8159c7edfe94e3fd6eb8a"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - borg_localrole = buildPythonPackage rec { - name = "borg.localrole-3.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip"; - md5 = "04082694dfda9ae5cda62747b8ac7ccf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - elementtree = buildPythonPackage rec { - name = "elementtree-1.2.7-20070827-preview"; - src = fetchurl { - url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip"; - md5 = "30e2fe5edd143f347e03a8baf5d60f8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_content = buildPythonPackage rec { - name = "zope.app.content-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz"; - md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_sunburst = buildPythonPackage rec { - name = "plonetheme.sunburst-1.1.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.1.6.tar.gz"; - md5 = "43d3a8c79c4605dd489ed24c93cdd21f"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlets = buildPythonPackage rec { - name = "plone.portlets-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.0.2.zip"; - md5 = "8a719cb0495081415fe03f3c8820d6b0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_proxy = buildPythonPackage rec { - name = "zope.proxy-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip"; - md5 = "a400b0a26624b17fa889dbcaa989d440"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_archetypes = buildPythonPackage rec { - name = "Products.Archetypes-1.7.14"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.7.14.zip"; - md5 = "275eb51788761fdd3b24ad836deb4311"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller products_cmftestcase zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_dublincore = buildPythonPackage rec { - name = "zope.dublincore-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.dublincore/zope.dublincore-3.7.0.tar.gz"; - md5 = "2e34e42e454d896feb101ac74af62ded"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_datetime zope_interface zope_location zope_security zope_component pytz setuptools zope_schema zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - initgroups = buildPythonPackage rec { - name = "initgroups-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip"; - md5 = "38e842dcab8445f65e701fec75213acd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_schema = buildPythonPackage rec { - name = "zope.schema-4.2.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.0.tar.gz"; - md5 = "d1ecf5a29e8572eee28450fd9c2150da"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_publisher = buildPythonPackage rec { - name = "zope.app.publisher-3.10.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.publisher/zope.app.publisher-3.10.2.zip"; - md5 = "66e9110e2967d8d204a65a98e2227404"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_componentvocabulary zope_datetime zope_browsermenu zope_interface zope_browserresource zope_security zope_configuration zope_component zope_browserpage zope_publisher setuptools zope_ptresource zope_schema zope_location ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_scale = buildPythonPackage rec { - name = "plone.scale-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.2.2.zip"; - md5 = "7c59522b4806ee24f5e0a5fa69c523a5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_copy = buildPythonPackage rec { - name = "zope.copy-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz"; - md5 = "a9836a5d36cd548be45210eb00407337"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_event = buildPythonPackage rec { - name = "zope.event-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; - md5 = "6e8af2a16157a74885d4f0d88137cefb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - acquisition = buildPythonPackage rec { - name = "Acquisition-2.13.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_linkintegrity = buildPythonPackage rec { - name = "plone.app.linkintegrity-1.4.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.4.5.zip"; - md5 = "206edc1a0b8e7755560578bee95043a8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_resourceregistries = buildPythonPackage rec { - name = "Products.ResourceRegistries-2.0.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.0.9.zip"; - md5 = "bd6f31bb793ac5894b89763a2ac45ca0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_browserlayer = buildPythonPackage rec { - name = "plone.browserlayer-2.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.1.tar.gz"; - md5 = "10d5737682c3287241aab286d1477050"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - markdown = buildPythonPackage rec { - name = "Markdown-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip"; - md5 = "122418893e21e91109edbf6e082f830d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_formwidget_query = buildPythonPackage rec { - name = "z3c.formwidget.query-0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.5.tar.gz"; - md5 = "a049d9f3b11bcdc48d37379e8883c5bb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_app_form z3c_form zope_interface zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_z3cform = buildPythonPackage rec { - name = "plone.app.z3cform-0.5.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.5.8.zip"; - md5 = "af8f85f81cb127d6531b191f9cef063b"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget kss_core zope_component setuptools plone_app_kss ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_viewletmanager = buildPythonPackage rec { - name = "plone.app.viewletmanager-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.2.zip"; - md5 = "2e60a9239f70ccf40bc57a58c5fc2dd7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools zope_viewlet zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ramcache = buildPythonPackage rec { - name = "zope.ramcache-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip"; - md5 = "87289e15f0e51f50704adda1557c02a7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_vocabularies = buildPythonPackage rec { - name = "plone.app.vocabularies-2.1.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.6.zip"; - md5 = "3880f2f3310ce0b59cb6146d563047ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_app_form zope_site products_archetypes zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_cache = buildPythonPackage rec { - name = "zope.app.cache-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.cache/zope.app.cache-3.7.0.zip"; - md5 = "8dd74574e869ce236ced0de7e349bb5c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_ramcache zope_app_form zope_interface zope_traversing zope_publisher zope_component zodb3 zope_proxy setuptools zope_schema zope_componentvocabulary zope_app_pagetemplate zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_folder = buildPythonPackage rec { - name = "zope.app.folder-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.folder/zope.app.folder-3.5.2.tar.gz"; - md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_container zope_app_content zope_site setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_discussion = buildPythonPackage rec { - name = "plone.app.discussion-2.1.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.1.6.zip"; - md5 = "60fda796ae3bab6c728805050e63a8f5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer zope_container collective_monkeypatcher zope_interface plone_app_z3cform plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zlog = buildPythonPackage rec { - name = "zLOG-2.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz"; - md5 = "68073679aaa79ac5a7b6a5c025467147"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone = buildPythonPackage rec { - name = "Plone-4.1.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.1.6.zip"; - md5 = "a7585cd8f8608ec251829f1e9c03f1ff"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone products_kupu plone_app_caching setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_standardcachemanagers = buildPythonPackage rec { - name = "Products.StandardCacheManagers-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip"; - md5 = "c5088b2b62bd26d63d9579a04369cb73"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_fieldsets = buildPythonPackage rec { - name = "plone.fieldsets-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.1.zip"; - md5 = "ae0cf4288466efb440a205764e2f5280"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_referencebrowserwidget = buildPythonPackage rec { - name = "archetypes.referencebrowserwidget-2.4.11"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.11.zip"; - md5 = "81029c17d051c0e76c2a3543a90b345c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_zcmlhook = buildPythonPackage rec { - name = "z3c.zcmlhook-1.0b1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz"; - md5 = "7b6c80146f5930409eb0b355ddf3daeb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_recipe_zope2instance = buildPythonPackage rec { - name = "plone.recipe.zope2instance-4.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.1.10.zip"; - md5 = "787fad7fa44757de74a50a91e9bcfcb5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zc_buildout zc_recipe_egg mailinglogger setuptools zope2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_supermodel = buildPythonPackage rec { - name = "plone.supermodel-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.1.1.zip"; - md5 = "301bf89f7e75d372d9175c0b76ac752b"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema elementtree ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_registry = buildPythonPackage rec { - name = "plone.app.registry-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.0.1.tar.gz"; - md5 = "e2bef48f39750a4c2b2afcc883b8badf"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_registry products_genericsetup elementtree zope_interface plone_app_z3cform zope_dottedname zope_component products_statusmessages plone_supermodel setuptools plone_autoform products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_pagetemplate = buildPythonPackage rec { - name = "zope.pagetemplate-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.5.2.tar.gz"; - md5 = "caa27a15351bc2ae11f5eecb5531e6c5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfformcontroller = buildPythonPackage rec { - name = "Products.CMFFormController-3.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.2.zip"; - md5 = "dab913bfda518714046c811e2dfe2c34"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_openid = buildPythonPackage rec { - name = "plone.openid-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip"; - md5 = "d4c36926a6dbefed035ed92c29329ce1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_size = buildPythonPackage rec { - name = "zope.size-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz"; - md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetypesregistry = buildPythonPackage rec { - name = "Products.MimetypesRegistry-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.3.zip"; - md5 = "b04aeeb9d49836272efc9ad0226d6118"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_imaging = buildPythonPackage rec { - name = "plone.app.imaging-1.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.6.zip"; - md5 = "8d494cd69b3f6be7fcb9e21c20277765"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_marshall = buildPythonPackage rec { - name = "Products.Marshall-2.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.1.zip"; - md5 = "5de4b78af86ea43dc4c60314ac8f681e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ptresource = buildPythonPackage rec { - name = "zope.ptresource-3.9.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz"; - md5 = "f4645e51c15289d3fdfb4139039e18e9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_component = buildPythonPackage rec { - name = "zope.app.component-3.9.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.component/zope.app.component-3.9.3.tar.gz"; - md5 = "bc2dce245d2afe462529c350956711e0"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_component zope_site zope_deprecation zope_interface zope_traversing zope_exceptions zope_security zope_formlib zope_componentvocabulary setuptools zope_schema zope_app_pagetemplate zope_publisher zope_app_container ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - multimapping = buildPythonPackage rec { - name = "MultiMapping-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip"; - md5 = "d69c5904c105b9f2f085d4103e0f0586"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mailhost = buildPythonPackage rec { - name = "Products.MailHost-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip"; - md5 = "1102e523435d8bf78a15b9ddb57478e1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_kss = buildPythonPackage rec { - name = "plone.app.kss-1.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.kss/plone.app.kss-1.6.2.zip"; - md5 = "4849de5b67ca1694791f7d916cfc4dc8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zope2 setuptools products_archetypes zope_deprecation zope_interface kss_core zope_component products_statusmessages acquisition plone_app_portlets products_dcworkflow zope_lifecycleevent zope_i18n plone_locking products_cmfcore zope_contentprovider plone_portlets ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - pytz = buildPythonPackage rec { - name = "pytz-2012c"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.zip"; - md5 = "115c950275d185f69f05d5441b1c2151"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_i18n = buildPythonPackage rec { - name = "plone.app.i18n-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.1.zip"; - md5 = "39f5a8dbfe102c0309abe30a0e77f639"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_indexer = buildPythonPackage rec { - name = "plone.indexer-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externalmethod = buildPythonPackage rec { - name = "Products.ExternalMethod-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_upgrade = buildPythonPackage rec { - name = "plone.app.upgrade-1.1.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.1.7.zip"; - md5 = "c40910e7df831070cdba94039fbdfc11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets products_atcontenttypes zope2 plone_app_portlets products_pluggableauthservice products_cmfcalendar products_plonepas transaction zope_app_cache zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserpage = buildPythonPackage rec { - name = "zope.browserpage-3.12.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atcontenttypes = buildPythonPackage rec { - name = "Products.ATContentTypes-2.1.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.7.zip"; - md5 = "2dd578f1f2e23e06aaa20c70ce47b62f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfeditions = buildPythonPackage rec { - name = "Products.CMFEditions-2.1.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.1.7.tar.gz"; - md5 = "a5d248705523b90526dfdfa605276943"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool plone_app_blob zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_interface = buildPythonPackage rec { - name = "zope.interface-3.6.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip"; - md5 = "9df962180fbbb54eb1875cff9fe436e5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_content = buildPythonPackage rec { - name = "plone.app.content-2.0.11"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.0.11.zip"; - md5 = "a48bc7e7a06ca80e538706ad394125a1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container zope_interface plone_memoize plone_i18n products_atcontenttypes zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfquickinstallertool = buildPythonPackage rec { - name = "Products.CMFQuickInstallerTool-3.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz"; - md5 = "af34adb87ddf2b6da48eff8b70ca2989"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_autoform = buildPythonPackage rec { - name = "plone.autoform-1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.2.zip"; - md5 = "f6d73e2d46d3f19601e919ce1f0ef10c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentrules = buildPythonPackage rec { - name = "plone.app.contentrules-2.1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-2.1.5.zip"; - md5 = "b43c695ac824140f2cb5a07ec6a38e07"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_app_kss plone_uuid products_archetypes plone_memoize zope2 products_atcontenttypes plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher kss_core zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - record = buildPythonPackage rec { - name = "Record-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip"; - md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonetestcase = buildPythonPackage rec { - name = "Products.PloneTestCase-0.9.14"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.14.zip"; - md5 = "c9539a7901c7d5418e69642ecd1b9d33"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - wicked = buildPythonPackage rec { - name = "wicked-1.1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.9.zip"; - md5 = "78ab0e6dbe28eadaae11c869d6169f69"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_blob = buildPythonPackage rec { - name = "plone.app.blob-1.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.2.zip"; - md5 = "4ba2e753d3355b929891d2cd0f5fb33d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdynamicviewfti = buildPythonPackage rec { - name = "Products.CMFDynamicViewFTI-4.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.2.zip"; - md5 = "d29f89c3c83b3694c6f76b8c7d9b3bb2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass products_genericsetup zope_interface zope_app_publisher zope_component zope2 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_keyring = buildPythonPackage rec { - name = "plone.keyring-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip"; - md5 = "f3970e9bddb2cc65e461a2c62879233f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contentprovider = buildPythonPackage rec { - name = "zope.contentprovider-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz"; - md5 = "1bb2132551175c0123f17939a793f812"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atreferencebrowserwidget = buildPythonPackage rec { - name = "Products.ATReferenceBrowserWidget-3.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip"; - md5 = "157bdd32155c8353450c17c649aad042"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserresource = buildPythonPackage rec { - name = "zope.browserresource-3.10.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; - md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_caching = buildPythonPackage rec { - name = "plone.caching-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip"; - md5 = "2c2e3b27d13b9101c92dfed222fde36c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_locales = buildPythonPackage rec { - name = "zope.app.locales-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz"; - md5 = "bd2b4c6040e768f33004b1210d3207fa"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_placelesstranslationservice = buildPythonPackage rec { - name = "Products.PlacelessTranslationService-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip"; - md5 = "a94635eb712563c5a002520713f5d6dc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_z3cform = buildPythonPackage rec { - name = "plone.z3cform-0.7.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.7.8.zip"; - md5 = "da891365156a5d5824d4e504465886a2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_batching z3c_form zope_i18n zope_component collective_monkeypatcher setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_lifecycleevent = buildPythonPackage rec { - name = "zope.lifecycleevent-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz"; - md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_form = buildPythonPackage rec { - name = "zope.app.form-4.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz"; - md5 = "3d2b164d9d37a71490a024aaeb412e91"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_tinymce = buildPythonPackage rec { - name = "Products.TinyMCE-1.2.12"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.2.12.zip"; - md5 = "0a6ae43c75950878691d9136c356df18"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_imaging elementtree plone_outputfilters setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_z3cform_datetimewidget = buildPythonPackage rec { - name = "collective.z3cform.datetimewidget-1.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.0.5.tar.gz"; - md5 = "3c6703fa6ef43bc749411c90a5e1fc77"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_protect = buildPythonPackage rec { - name = "plone.protect-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip"; - md5 = "74925ffb08782e72f9b1e850fa78fffa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_dcworkflow = buildPythonPackage rec { - name = "Products.DCWorkflow-2.2.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; - md5 = "c90a16c4f3611015592ba8173a5f1863"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mechanize = buildPythonPackage rec { - name = "mechanize-0.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip"; - md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_iterate = buildPythonPackage rec { - name = "plone.app.iterate-2.1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.5.zip"; - md5 = "7b7b9fcac73dfdd0edee042eec8d6489"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_statusmessages zope_event setuptools products_dcworkflow zope_schema products_cmfplacefulworkflow zope_annotation zope2 plone_locking products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - accesscontrol = buildPythonPackage rec { - name = "AccessControl-2.13.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-2.13.7.zip"; - md5 = "b64088eecdc488e6b2a5b6eced2cfaa6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testing = buildPythonPackage rec { - name = "zope.testing-3.9.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz"; - md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externaleditor = buildPythonPackage rec { - name = "Products.ExternalEditor-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.0.zip"; - md5 = "015350455d140233cb3aa4846cae2571"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_publication = buildPythonPackage rec { - name = "zope.app.publication-3.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip"; - md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_filerepresentation = buildPythonPackage rec { - name = "zope.filerepresentation-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz"; - md5 = "4a7a434094f4bfa99a7f22e75966c359"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_globalrequest = buildPythonPackage rec { - name = "five.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_exceptions = buildPythonPackage rec { - name = "zope.exceptions-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz"; - md5 = "d7234d99d728abe3d9275346e8d24fd9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_layout = buildPythonPackage rec { - name = "plone.app.layout-2.1.13"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.1.13.tar.gz"; - md5 = "b8652d42bb04ee1977ff6bbb15b38857"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_controlpanel plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contenttype = buildPythonPackage rec { - name = "zope.contenttype-3.5.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip"; - md5 = "c6ac80e6887de4108a383f349fbdf332"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_customerize = buildPythonPackage rec { - name = "five.customerize-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.0.3.zip"; - md5 = "32f597c2fa961f7dcc84b23e655d928e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_site = buildPythonPackage rec { - name = "zope.site-3.9.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz"; - md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_uuid = buildPythonPackage rec { - name = "plone.app.uuid-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip"; - md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unittest2 = buildPythonPackage rec { - name = "unittest2-0.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip"; - md5 = "1527fb89e38343945af1166342d851ee"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - persistence = buildPythonPackage rec { - name = "Persistence-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; - md5 = "92693648ccdc59c8fc71f7f06b1d228c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zopeversioncontrol = buildPythonPackage rec { - name = "Products.ZopeVersionControl-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip"; - md5 = "238239102f3ac798ee4f4c53343a561f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_location = buildPythonPackage rec { - name = "zope.location-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz"; - md5 = "1684a8f986099d15296f670c58e713d8"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browsermenu = buildPythonPackage rec { - name = "zope.browsermenu-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; - md5 = "a47c7b1e786661c912a1150bf8d1f83f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_workflow = buildPythonPackage rec { - name = "plone.app.workflow-2.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.0.6.zip"; - md5 = "7e217af9bd7a9e6cd4dbe9791dd844ad"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime kss_core zope_component products_cmfcore products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n plone_app_kss acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_locking = buildPythonPackage rec { - name = "plone.locking-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.3.tar.gz"; - md5 = "73b8a045121ad14e2e0ed3fc2713fa63"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_dottedname = buildPythonPackage rec { - name = "zope.dottedname-3.4.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz"; - md5 = "62d639f75b31d2d864fe5982cb23959c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_cachedescriptors = buildPythonPackage rec { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_lockfile = buildPythonPackage rec { - name = "zc.lockfile-1.0.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz"; - md5 = "6cf83766ef9935c33e240b0904c7a45e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_contentrules = buildPythonPackage rec { - name = "plone.contentrules-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.1.zip"; - md5 = "3ae91cb7a21749e14f4cd7564dcf1619"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sendmail = buildPythonPackage rec { - name = "zope.sendmail-3.7.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz"; - md5 = "8a513ecf2b41cad849f6607bf16d6818"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_formlib = buildPythonPackage rec { - name = "zope.formlib-4.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip"; - md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_caching = buildPythonPackage rec { - name = "plone.app.caching-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.0.3.zip"; - md5 = "37429bd0fb79814ac1b3383acb215226"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize zope_publisher plone_protect zope_pagetemplate zope_interface plone_app_z3cform plone_app_registry products_cmfcore zope_component z3c_form products_statusmessages plone_caching z3c_zcmlhook setuptools python_dateutil zope2 plone_cachepurging plone_registry products_genericsetup acquisition products_cmfdynamicviewfti ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplone = buildPythonPackage rec { - name = "Products.CMFPlone-4.1.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.1.6.zip"; - md5 = "ac1e1b42c429b9d1d0b9c8b620d7723d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plone_app_contentmenu plonetheme_classic plone_fieldsets products_cmfdefault five_localsitemanager products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup acquisition plone_app_vocabularies zope_location products_plonelanguagetool borg_localrole kss_core zope_i18n products_cmfuid plone_theme plone_memoize plone_app_i18n zope_component products_mimetypesregistry plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool plone_app_layout products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form products_cmfquickinstallertool five_customerize plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice z3c_autoinclude zope_interface zope_event plone_app_viewletmanager zope_structuredtext plone_app_customerize zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer zope_deferredimport zope_container plone_app_workflow plone_browserlayer setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_app_users plone_intelligenttext products_passwordresettool plone_app_content plonetheme_sunburst archetypes_kss plone_app_kss plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - transaction = buildPythonPackage rec { - name = "transaction-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz"; - md5 = "30b062baa34fe1521ad979fb088c8c55"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_controlpanel = buildPythonPackage rec { - name = "plone.app.controlpanel-2.1.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.1.4.zip"; - md5 = "254da507958dcb54b60bcc9e37360c94"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form zope_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site products_archetypes plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_redirector = buildPythonPackage rec { - name = "plone.app.redirector-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.1.3.zip"; - md5 = "7d441340a83b8ed72a03bc16148a5f21"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_component = buildPythonPackage rec { - name = "zope.component-3.9.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz"; - md5 = "22780b445b1b479701c05978055d1c82"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_broken = buildPythonPackage rec { - name = "zope.broken-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip"; - md5 = "eff24d7918099a3e899ee63a9c31bee6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_recipe_egg = buildPythonPackage rec { - name = "zc.recipe.egg-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.2.2.tar.gz"; - md5 = "fe5ad0f1c0fc3d4348286534e1b9cec5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zc_buildout setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_openid = buildPythonPackage rec { - name = "plone.app.openid-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz"; - md5 = "ae0748f91cab0612a498926d405d8edd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_caching = buildPythonPackage rec { - name = "z3c.caching-2.0a1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz"; - md5 = "17f250b5084c2324a7d15c6810ee628e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_openid = buildPythonPackage rec { - name = "python-openid-2.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip"; - md5 = "f89d9d4f4dccfd33b5ce34eb4725f751"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - tempstorage = buildPythonPackage rec { - name = "tempstorage-2.12.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.1.zip"; - md5 = "8389f6c9a653a0ee2b82138502e28487"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfactionicons = buildPythonPackage rec { - name = "Products.CMFActionIcons-2.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz"; - md5 = "ab1dc62404ed11aea84dc0d782b2235e"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zctextindex = buildPythonPackage rec { - name = "Products.ZCTextIndex-2.13.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip"; - md5 = "bf95ea9fa2831237fa3c3d38fafdec96"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - extensionclass = buildPythonPackage rec { - name = "ExtensionClass-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - -}; in plone41Packages diff --git a/pkgs/development/web/plone/4.2.nix b/pkgs/development/web/plone/4.2.nix deleted file mode 100644 index 6006e5908b2..00000000000 --- a/pkgs/development/web/plone/4.2.nix +++ /dev/null @@ -1,5394 +0,0 @@ -# DO NOT EDIT THIS FILE! -# -# Nix expressions autogenerated with: -# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.2.5.json -p plone/4.2.5.txt -o plone/4.2.5.nix - -{ pkgs, pythonPackages }: - -let plone43Packages = pythonPackages.python.modules // rec { - inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow; - inherit (pkgs) fetchurl stdenv; - - plone_app_portlets = buildPythonPackage rec { - name = "plone.app.portlets-2.3.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.3.8.zip"; - md5 = "3d18ff10053f5a04670f22e6359d2804"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope2 = buildPythonPackage rec { - name = "Zope2-2.13.19"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip"; - md5 = "26fee311aace7c12e406543ea91eb42a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_btreefolder2 = buildPythonPackage rec { - name = "Products.BTreeFolder2-2.13.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz"; - md5 = "f57c85673036af7ccd34c3fa251f6bb2"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pythonscripts = buildPythonPackage rec { - name = "Products.PythonScripts-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; - md5 = "04c86f2c45a29a162297a80dac61d14f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zopeundo = buildPythonPackage rec { - name = "ZopeUndo-2.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; - md5 = "2b8da09d1b98d5558f62e12f6e52c401"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - datetime = buildPythonPackage rec { - name = "DateTime-2.12.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-2.12.7.zip"; - md5 = "72a8bcf80b52211ae7fdfe36c693d70c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface pytz ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_session = buildPythonPackage rec { - name = "plone.session-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip"; - md5 = "f95872454735abc8f27c3dcbc9434c11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_container = buildPythonPackage rec { - name = "zope.container-3.11.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz"; - md5 = "fc66d85a17b8ffb701091c9328983dcc"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_folder = buildPythonPackage rec { - name = "plone.folder-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip"; - md5 = "1674ff18b7a9452d0c2063cf11c679b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonepas = buildPythonPackage rec { - name = "Products.PlonePAS-4.0.16"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.0.16.zip"; - md5 = "f504cdfb5d1e9703cf526f6f03c9a1c5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_locales = buildPythonPackage rec { - name = "plone.app.locales-4.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.2.5.zip"; - md5 = "baf48a0a5278a18fa1c2848d3470464f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sequencesort = buildPythonPackage rec { - name = "zope.sequencesort-3.4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz"; - md5 = "cfc35fc426a47f5c0ee43c416224b864"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_genericsetup = buildPythonPackage rec { - name = "Products.GenericSetup-1.7.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz"; - md5 = "c48967c81c880ed33ee16a14caab3b11"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - kss_core = buildPythonPackage rec { - name = "kss.core-1.6.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/k/kss.core/kss.core-1.6.5.zip"; - md5 = "87e66e78c3bbd7af3ecce5b2fef935ae"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_security zope_datetime zope_site zope_pagetemplate zope_interface zope_browserresource zope_contenttype zope_configuration zope_publisher zope_component zope_browserpage zope_event setuptools zope_schema zope_lifecycleevent zope_location zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tal = buildPythonPackage rec { - name = "zope.tal-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip"; - md5 = "13869f292ba36b294736b7330b1396fd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_cachepurging = buildPythonPackage rec { - name = "plone.cachepurging-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip"; - md5 = "886814ac4deef0f1ed99a2eb60864264"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_protect = buildPythonPackage rec { - name = "plone.protect-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip"; - md5 = "74925ffb08782e72f9b1e850fa78fffa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_portaltransforms = buildPythonPackage rec { - name = "Products.PortalTransforms-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; - md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_memoize = buildPythonPackage rec { - name = "plone.memoize-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip"; - md5 = "d07cd14b976160e1f26a859e3370147e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - docutils = buildPythonPackage rec { - name = "docutils-0.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz"; - md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_formlib = buildPythonPackage rec { - name = "five.formlib-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip"; - md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zexceptions = buildPythonPackage rec { - name = "zExceptions-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip"; - md5 = "4c679696c959040d8e656ef85ae40136"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfuid = buildPythonPackage rec { - name = "Products.CMFUid-2.2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz"; - md5 = "e20727959351dffbf0bac80613eee110"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - restrictedpython = buildPythonPackage rec { - name = "RestrictedPython-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip"; - md5 = "aa75a7dcc7fbc966357837cc66cacec6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_theming = buildPythonPackage rec { - name = "plone.app.theming-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.0.4.zip"; - md5 = "2da6d810e0d5f295dd0daa2b60731a1b"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone plone_resource repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml setuptools five_globalrequest diazo plone_subrequest ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - feedparser = buildPythonPackage rec { - name = "feedparser-5.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip"; - md5 = "cefffeba66b658d3cc7c1d66b92c6a1a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browser = buildPythonPackage rec { - name = "zope.browser-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip"; - md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdefault = buildPythonPackage rec { - name = "Products.CMFDefault-2.2.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz"; - md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_dateutil = buildPythonPackage rec { - name = "python-dateutil-1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_error = buildPythonPackage rec { - name = "zope.error-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz"; - md5 = "281445a906458ff5f18f56923699a127"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetools = buildPythonPackage rec { - name = "Products.MIMETools-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ documenttemplate setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deprecation = buildPythonPackage rec { - name = "zope.deprecation-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz"; - md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unidecode = buildPythonPackage rec { - name = "Unidecode-0.04.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; - md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcore = buildPythonPackage rec { - name = "Products.CMFCore-2.2.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; - md5 = "9320a4023b8575097feacfd4a400e930"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_localsitemanager = buildPythonPackage rec { - name = "five.localsitemanager-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip"; - md5 = "5e3a658e6068832bd802018ebc83f2d4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_configuration = buildPythonPackage rec { - name = "zope.configuration-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_batching = buildPythonPackage rec { - name = "z3c.batching-1.1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.batching/z3c.batching-1.1.0.tar.gz"; - md5 = "d1dc834781d228127ca6d15301757863"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcalendar = buildPythonPackage rec { - name = "Products.CMFCalendar-2.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz"; - md5 = "49458e68dc3b6826ea9a3576ac014419"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_extendedpathindex = buildPythonPackage rec { - name = "Products.ExtendedPathIndex-3.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip"; - md5 = "00c048a4b103200bdcbda61fa22c66df"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_schemaextender = buildPythonPackage rec { - name = "archetypes.schemaextender-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip"; - md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zconfig = buildPythonPackage rec { - name = "ZConfig-2.9.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip"; - md5 = "5c932690a70c8907efd240cdd76a7bc4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_copypastemove = buildPythonPackage rec { - name = "zope.copypastemove-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.copypastemove/zope.copypastemove-3.7.0.tar.gz"; - md5 = "f335940686d15cfc5520c42f2494a924"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_container zope_copy zope_interface zope_location zope_exceptions zope_component zope_event setuptools zope_lifecycleevent zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentmenu = buildPythonPackage rec { - name = "plone.app.contentmenu-2.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip"; - md5 = "8ba463f1a164c454c70d26507e5bd22a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluginregistry = buildPythonPackage rec { - name = "Products.PluginRegistry-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplacefulworkflow = buildPythonPackage rec { - name = "Products.CMFPlacefulWorkflow-1.5.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; - md5 = "9041e1f52eab5b348c0dfa85be438722"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_outputfilters = buildPythonPackage rec { - name = "plone.outputfilters-1.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.8.zip"; - md5 = "a5ef28580f7fa7f2dc1768893995b0f7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_publisher = buildPythonPackage rec { - name = "zope.publisher-3.12.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz"; - md5 = "495131970cc7cb14de8e517fb3857ade"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_security = buildPythonPackage rec { - name = "zope.security-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; - md5 = "072ab8d11adc083eace11262da08630c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zdaemon = buildPythonPackage rec { - name = "zdaemon-2.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz"; - md5 = "291a875f82e812110557eb6704af8afe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_annotation = buildPythonPackage rec { - name = "zope.annotation-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz"; - md5 = "4238153279d3f30ab5613438c8e76380"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - repoze_xmliter = buildPythonPackage rec { - name = "repoze.xmliter-0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip"; - md5 = "99da76bcbad6fbaced4a273bde29b10e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_form = buildPythonPackage rec { - name = "plone.app.form-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.1.2.zip"; - md5 = "8017f8f782d992825ed71d16b126c4e7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_structuredtext = buildPythonPackage rec { - name = "zope.structuredtext-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz"; - md5 = "eabbfb983485d0879322bc878d2478a0"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_validation = buildPythonPackage rec { - name = "Products.validation-2.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip"; - md5 = "afa217e2306637d1dccbebf337caa8bf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zodb3 = buildPythonPackage rec { - name = "ZODB3-3.10.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - documenttemplate = buildPythonPackage rec { - name = "DocumentTemplate-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_search = buildPythonPackage rec { - name = "plone.app.search-1.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.0.8.zip"; - md5 = "80dffacba718ab809d28147b5b6b0892"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_contentlisting setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - diazo = buildPythonPackage rec { - name = "diazo-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip"; - md5 = "d3c2b017af521db4c86fb360c86e0bc8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml experimental_cssselect setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_globalrequest = buildPythonPackage rec { - name = "zope.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip"; - md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_customerize = buildPythonPackage rec { - name = "plone.app.customerize-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip"; - md5 = "6a3802c4e8fbd955597adc6a8298febf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdifftool = buildPythonPackage rec { - name = "Products.CMFDiffTool-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip"; - md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testbrowser = buildPythonPackage rec { - name = "zope.testbrowser-3.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz"; - md5 = "64abbee892121e7f1a91aed12cfc155a"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_contentmigration = buildPythonPackage rec { - name = "Products.contentmigration-2.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.3.zip"; - md5 = "e15b9777593157f060b50638b0253be1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_intelligenttext = buildPythonPackage rec { - name = "plone.intelligenttext-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; - md5 = "51688fa0815b49e00334e3ef948328ba"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfquickinstallertool = buildPythonPackage rec { - name = "Products.CMFQuickInstallerTool-3.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz"; - md5 = "af34adb87ddf2b6da48eff8b70ca2989"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_kupu = buildPythonPackage rec { - name = "Products.kupu-1.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.kupu/Products.kupu-1.5.1.zip"; - md5 = "b884fcc7f510426974d8d3c4333da4f4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid products_genericsetup zope_app_component zope_interface products_portaltransforms products_cmfcore products_archetypes products_mimetypesregistry setuptools products_cmfplone zope_schema zope_i18n plone_outputfilters ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_authentication = buildPythonPackage rec { - name = "zope.authentication-3.7.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip"; - md5 = "7d6bb340610518f2fc71213cfeccda68"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18n = buildPythonPackage rec { - name = "zope.i18n-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz"; - md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_componentvocabulary = buildPythonPackage rec { - name = "zope.componentvocabulary-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz"; - md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_ofsp = buildPythonPackage rec { - name = "Products.OFSP-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip"; - md5 = "c76d40928753c2ee56db873304e65bd5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol persistence setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_datetime = buildPythonPackage rec { - name = "zope.datetime-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz"; - md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - experimental_cssselect = buildPythonPackage rec { - name = "experimental.cssselect-0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip"; - md5 = "3fecdcf1fbc3ea6025e115a56a262957"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_passwordresettool = buildPythonPackage rec { - name = "Products.PasswordResetTool-2.0.12"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.12.zip"; - md5 = "db87c166732a5800f25e33f27a23b7b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_jquerytools = buildPythonPackage rec { - name = "plone.app.jquerytools-1.3.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.3.2.zip"; - md5 = "326470a34e07aa98c40d75ec22484572"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_viewletmanager = buildPythonPackage rec { - name = "plone.app.viewletmanager-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip"; - md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_registry = buildPythonPackage rec { - name = "plone.registry-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip"; - md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_pagetemplate = buildPythonPackage rec { - name = "zope.app.pagetemplate-3.11.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/zope.app.pagetemplate-3.11.2.tar.gz"; - md5 = "2d304729c0d6a9ab67dd5ea852f19476"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_browserpage zope_traversing zope_tales zope_size zope_pagetemplate zope_dublincore zope_security zope_component zope_configuration setuptools zope_interface zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_viewlet = buildPythonPackage rec { - name = "zope.viewlet-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz"; - md5 = "367e03096df57e2f9b74fff43f7901f9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_static = buildPythonPackage rec { - name = "plone.portlet.static-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; - md5 = "ec0dc691b4191a41ff97779b117f9985"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_collection = buildPythonPackage rec { - name = "plone.portlet.collection-2.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.3.zip"; - md5 = "5f0006dbb3e0b56870383dfdedc49228"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_users = buildPythonPackage rec { - name = "plone.app.users-1.1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.1.5.zip"; - md5 = "97895d8dbdf885784be1afbf5b8b364c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore products_plonepas ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_querystring = buildPythonPackage rec { - name = "plone.app.querystring-1.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.7.zip"; - md5 = "b501910b23def9b58e8309d1e469eb6f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_theme = buildPythonPackage rec { - name = "plone.theme-2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip"; - md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18nmessageid = buildPythonPackage rec { - name = "zope.i18nmessageid-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; - md5 = "cb84bf61c2b7353e3b7578057fbaa264"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_folder = buildPythonPackage rec { - name = "plone.app.folder-1.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip"; - md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_folder setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zcatalog = buildPythonPackage rec { - name = "Products.ZCatalog-2.13.23"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip"; - md5 = "d425171516dfc70e543a4e2b852301cb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_autoinclude = buildPythonPackage rec { - name = "z3c.autoinclude-0.3.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip"; - md5 = "6a615ae18c12b459bceb3ae28e8e7709"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_processlifetime = buildPythonPackage rec { - name = "zope.processlifetime-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz"; - md5 = "69604bfd668a01ebebdd616a8f26ccfe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_uuid = buildPythonPackage rec { - name = "plone.uuid-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip"; - md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_kss = buildPythonPackage rec { - name = "archetypes.kss-1.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.kss/archetypes.kss-1.7.2.zip"; - md5 = "a8502140123b74f1b7ed4f36d3e56ff3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_traversing = buildPythonPackage rec { - name = "zope.traversing-3.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip"; - md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_gettext = buildPythonPackage rec { - name = "python-gettext-1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; - md5 = "cd4201d440126d1296d1d2bc2b4795f3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unittest2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_securemailhost = buildPythonPackage rec { - name = "Products.SecureMailHost-1.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip"; - md5 = "7db0f1fa867bd0df972082f502a7a707"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_container = buildPythonPackage rec { - name = "zope.app.container-3.9.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.container/zope.app.container-3.9.2.tar.gz"; - md5 = "1e286c59f0166e517d67ddd723641c84"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_copypastemove zope_exceptions zope_component zope_dublincore zope_location zope_browsermenu zope_size zope_security zope_publisher zope_container zope_browserpage zope_event setuptools zope_interface zope_lifecycleevent zope_browser zope_i18n zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonelanguagetool = buildPythonPackage rec { - name = "Products.PloneLanguageTool-3.2.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; - md5 = "bd9eb6278bf76e8cbce99437ca362164"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - eggtestinfo = buildPythonPackage rec { - name = "eggtestinfo-0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz"; - md5 = "6f0507aee05f00c640c0d64b5073f840"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mailinglogger = buildPythonPackage rec { - name = "mailinglogger-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz"; - md5 = "f865f0df6059ce23062b7457d01dbac5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - missing = buildPythonPackage rec { - name = "Missing-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deferredimport = buildPythonPackage rec { - name = "zope.deferredimport-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz"; - md5 = "68fce3bf4f011d4a840902fd763884ee"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tales = buildPythonPackage rec { - name = "zope.tales-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz"; - md5 = "1c5060bd766a0a18632b7879fc9e4e1e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools zope_tal ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zsqlmethods = buildPythonPackage rec { - name = "Products.ZSQLMethods-2.13.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip"; - md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_statusmessages = buildPythonPackage rec { - name = "Products.statusmessages-4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip"; - md5 = "265324b0a58a032dd0ed038103ed0473"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_i18n = buildPythonPackage rec { - name = "plone.i18n-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.5.zip"; - md5 = "ef36aa9a294d507abb37787f9f7700bd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_querywidget = buildPythonPackage rec { - name = "archetypes.querywidget-1.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip"; - md5 = "3416b6b4948c624e1b5b8dd8d7e33f59"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_transformchain = buildPythonPackage rec { - name = "plone.transformchain-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip"; - md5 = "f5fb7ca894249e3e666501c4fae52a6c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluggableauthservice = buildPythonPackage rec { - name = "Products.PluggableAuthService-1.10.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; - md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - borg_localrole = buildPythonPackage rec { - name = "borg.localrole-3.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip"; - md5 = "04082694dfda9ae5cda62747b8ac7ccf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - elementtree = buildPythonPackage rec { - name = "elementtree-1.2.7-20070827-preview"; - src = fetchurl { - url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip"; - md5 = "30e2fe5edd143f347e03a8baf5d60f8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_content = buildPythonPackage rec { - name = "zope.app.content-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz"; - md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_sunburst = buildPythonPackage rec { - name = "plonetheme.sunburst-1.2.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.2.8.zip"; - md5 = "be02660c869e04ac8cf6ade3559f2516"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlets = buildPythonPackage rec { - name = "plone.portlets-2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.1.zip"; - md5 = "12b9a33f787756a48617c2d2dd63c538"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_proxy = buildPythonPackage rec { - name = "zope.proxy-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip"; - md5 = "a400b0a26624b17fa889dbcaa989d440"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_archetypes = buildPythonPackage rec { - name = "Products.Archetypes-1.8.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.6.zip"; - md5 = "74be68879b27228c084a9be869132a98"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_dublincore = buildPythonPackage rec { - name = "zope.dublincore-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.dublincore/zope.dublincore-3.7.0.tar.gz"; - md5 = "2e34e42e454d896feb101ac74af62ded"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_datetime zope_interface zope_location zope_security zope_component pytz setuptools zope_schema zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - initgroups = buildPythonPackage rec { - name = "initgroups-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip"; - md5 = "38e842dcab8445f65e701fec75213acd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_schema = buildPythonPackage rec { - name = "zope.schema-4.2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.1.zip"; - md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_publisher = buildPythonPackage rec { - name = "zope.app.publisher-3.10.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.publisher/zope.app.publisher-3.10.2.zip"; - md5 = "66e9110e2967d8d204a65a98e2227404"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_componentvocabulary zope_datetime zope_browsermenu zope_interface zope_browserresource zope_security zope_configuration zope_component zope_browserpage zope_publisher setuptools zope_ptresource zope_schema zope_location ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_scale = buildPythonPackage rec { - name = "plone.scale-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.2.2.zip"; - md5 = "7c59522b4806ee24f5e0a5fa69c523a5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_copy = buildPythonPackage rec { - name = "zope.copy-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz"; - md5 = "a9836a5d36cd548be45210eb00407337"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_event = buildPythonPackage rec { - name = "zope.event-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; - md5 = "6e8af2a16157a74885d4f0d88137cefb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - acquisition = buildPythonPackage rec { - name = "Acquisition-2.13.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unittest2 = buildPythonPackage rec { - name = "unittest2-0.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip"; - md5 = "1527fb89e38343945af1166342d851ee"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_resource = buildPythonPackage rec { - name = "plone.resource-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip"; - md5 = "594d41e3acd913ae92f2e9ef96503b9f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_linkintegrity = buildPythonPackage rec { - name = "plone.app.linkintegrity-1.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip"; - md5 = "89701634d59c3b1a6fc61e5a21c4de52"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_resourceregistries = buildPythonPackage rec { - name = "Products.ResourceRegistries-2.2.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip"; - md5 = "954e31a168a1eb3153e2fd4e590bb9ba"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_browserlayer = buildPythonPackage rec { - name = "plone.browserlayer-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip"; - md5 = "bce02f4907a4f29314090c525e5fc28e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - markdown = buildPythonPackage rec { - name = "Markdown-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip"; - md5 = "122418893e21e91109edbf6e082f830d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_formwidget_query = buildPythonPackage rec { - name = "z3c.formwidget.query-0.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip"; - md5 = "d9f7960b1a5a81d8ba5241530f496522"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_z3cform = buildPythonPackage rec { - name = "plone.app.z3cform-0.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.6.2.zip"; - md5 = "2e77f5e03d48a6fb2eb9994edb871917"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget kss_core zope_component zope_browserpage setuptools plone_app_kss zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_referencebrowserwidget = buildPythonPackage rec { - name = "archetypes.referencebrowserwidget-2.4.17"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip"; - md5 = "bb7552f5ccfddcd068649d7b8162020c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentlisting = buildPythonPackage rec { - name = "plone.app.contentlisting-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip"; - md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ramcache = buildPythonPackage rec { - name = "zope.ramcache-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip"; - md5 = "87289e15f0e51f50704adda1557c02a7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_vocabularies = buildPythonPackage rec { - name = "plone.app.vocabularies-2.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz"; - md5 = "166a0d6f9a3e3cd753efa56aaef585be"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_cache = buildPythonPackage rec { - name = "zope.app.cache-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.cache/zope.app.cache-3.7.0.zip"; - md5 = "8dd74574e869ce236ced0de7e349bb5c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_ramcache zope_app_form zope_interface zope_traversing zope_publisher zope_component zodb3 zope_proxy setuptools zope_schema zope_componentvocabulary zope_app_pagetemplate zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_discussion = buildPythonPackage rec { - name = "plone.app.discussion-2.1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.1.9.zip"; - md5 = "0c87aa53d4288d031cf384838bc03782"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zlog = buildPythonPackage rec { - name = "zLOG-2.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz"; - md5 = "68073679aaa79ac5a7b6a5c025467147"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone = buildPythonPackage rec { - name = "Plone-4.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.2.5.zip"; - md5 = "1330b7966ffb86f962f4c0bfe56ba594"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone products_kupu plone_app_caching zope_app_publisher zope_app_component zope_copypastemove plone_app_theming setuptools products_cmfplacefulworkflow zope_app_container plone_app_openid plone_app_iterate wicked ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_standardcachemanagers = buildPythonPackage rec { - name = "Products.StandardCacheManagers-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip"; - md5 = "c5088b2b62bd26d63d9579a04369cb73"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_fieldsets = buildPythonPackage rec { - name = "plone.fieldsets-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip"; - md5 = "4158c8a1f784fcb5cecbd63deda7222f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_monkeypatcher = buildPythonPackage rec { - name = "collective.monkeypatcher-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip"; - md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_zcmlhook = buildPythonPackage rec { - name = "z3c.zcmlhook-1.0b1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz"; - md5 = "7b6c80146f5930409eb0b355ddf3daeb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_recipe_zope2instance = buildPythonPackage rec { - name = "plone.recipe.zope2instance-4.2.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip"; - md5 = "787fad7fa44757de74a50a91e9bcfcb5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_supermodel = buildPythonPackage rec { - name = "plone.supermodel-1.1.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.1.4.zip"; - md5 = "00b3d723bb1a48116fe3bf8754f17085"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema elementtree ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_registry = buildPythonPackage rec { - name = "plone.app.registry-1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.1.zip"; - md5 = "0fdbb01e9ff71108f1be262c39b41b81"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_registry products_genericsetup elementtree plone_supermodel plone_app_z3cform zope_dottedname zope_component products_statusmessages setuptools zope_interface plone_autoform products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_pagetemplate = buildPythonPackage rec { - name = "zope.pagetemplate-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.5.2.tar.gz"; - md5 = "caa27a15351bc2ae11f5eecb5531e6c5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfformcontroller = buildPythonPackage rec { - name = "Products.CMFFormController-3.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip"; - md5 = "6573df7dcb39e3b63ba22abe2acd639e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_openid = buildPythonPackage rec { - name = "plone.openid-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip"; - md5 = "d4c36926a6dbefed035ed92c29329ce1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_size = buildPythonPackage rec { - name = "zope.size-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz"; - md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetypesregistry = buildPythonPackage rec { - name = "Products.MimetypesRegistry-2.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; - md5 = "898166bb2aaececc8238ad4ee4826793"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_imaging = buildPythonPackage rec { - name = "plone.app.imaging-1.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip"; - md5 = "27c24477bdcbcebeba6cd83419a57aa6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_marshall = buildPythonPackage rec { - name = "Products.Marshall-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip"; - md5 = "bde4d7f75195c1ded8371554b04d2541"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ptresource = buildPythonPackage rec { - name = "zope.ptresource-3.9.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz"; - md5 = "f4645e51c15289d3fdfb4139039e18e9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_component = buildPythonPackage rec { - name = "zope.app.component-3.9.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.component/zope.app.component-3.9.3.tar.gz"; - md5 = "bc2dce245d2afe462529c350956711e0"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_component zope_site zope_deprecation zope_interface zope_traversing zope_exceptions zope_security zope_formlib zope_componentvocabulary setuptools zope_schema zope_app_pagetemplate zope_publisher zope_app_container ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - multimapping = buildPythonPackage rec { - name = "MultiMapping-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip"; - md5 = "d69c5904c105b9f2f085d4103e0f0586"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mailhost = buildPythonPackage rec { - name = "Products.MailHost-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip"; - md5 = "1102e523435d8bf78a15b9ddb57478e1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_kss = buildPythonPackage rec { - name = "plone.app.kss-1.7.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.kss/plone.app.kss-1.7.1.zip"; - md5 = "97a35086fecfe25e55b65042eb35e796"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zope2 setuptools zope_deprecation zope_interface plone_app_layout kss_core zope_component products_statusmessages acquisition plone_app_portlets products_dcworkflow zope_lifecycleevent zope_i18n plone_locking products_cmfcore zope_contentprovider plone_portlets ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - pytz = buildPythonPackage rec { - name = "pytz-2012g"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip"; - md5 = "1a9b24da1ab6328074b48fc3d4525078"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_i18n = buildPythonPackage rec { - name = "plone.app.i18n-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip"; - md5 = "a10026573463dfc1899bf4062cebdbf2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_indexer = buildPythonPackage rec { - name = "plone.indexer-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externalmethod = buildPythonPackage rec { - name = "Products.ExternalMethod-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_upgrade = buildPythonPackage rec { - name = "plone.app.upgrade-1.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.2.5.zip"; - md5 = "8da18e8173668cad813dd8bb5a35ee9e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets products_atcontenttypes zope2 plone_app_portlets products_pluggableauthservice products_cmfcalendar products_plonepas transaction zope_app_cache zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserpage = buildPythonPackage rec { - name = "zope.browserpage-3.12.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atcontenttypes = buildPythonPackage rec { - name = "Products.ATContentTypes-2.1.12"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip"; - md5 = "ef38ce0769a5f44e272623f8f118a669"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfeditions = buildPythonPackage rec { - name = "Products.CMFEditions-2.2.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; - md5 = "1806f2e17e2527fad9364670b343bd11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_interface = buildPythonPackage rec { - name = "zope.interface-3.6.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip"; - md5 = "9df962180fbbb54eb1875cff9fe436e5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_content = buildPythonPackage rec { - name = "plone.app.content-2.0.12"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.0.12.zip"; - md5 = "2f14a85fb66d73e0b699b839caaaad26"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_classic = buildPythonPackage rec { - name = "plonetheme.classic-1.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.2.5.zip"; - md5 = "9dc15871937f9cdf94cdfdb9be77a221"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_autoform = buildPythonPackage rec { - name = "plone.autoform-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip"; - md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentrules = buildPythonPackage rec { - name = "plone.app.contentrules-2.1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-2.1.9.zip"; - md5 = "74d2fed9095a7c5f890b6f27de78dafc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_app_kss plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher kss_core zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - record = buildPythonPackage rec { - name = "Record-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip"; - md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonetestcase = buildPythonPackage rec { - name = "Products.PloneTestCase-0.9.15"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.15.zip"; - md5 = "ddd5810937919ab5233ebd64893c8bae"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_stringinterp = buildPythonPackage rec { - name = "plone.stringinterp-1.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip"; - md5 = "81909716210c6ac3fd0ee87f45ea523d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - wicked = buildPythonPackage rec { - name = "wicked-1.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; - md5 = "f65611f11d547d7dc8e623bf87d3929d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_blob = buildPythonPackage rec { - name = "plone.app.blob-1.5.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.7.zip"; - md5 = "135bc404212981c445d5bbb6a749b155"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdynamicviewfti = buildPythonPackage rec { - name = "Products.CMFDynamicViewFTI-4.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.3.zip"; - md5 = "7d39d416b41b2d93954bc73d9d0e077f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_keyring = buildPythonPackage rec { - name = "plone.keyring-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip"; - md5 = "f3970e9bddb2cc65e461a2c62879233f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contentprovider = buildPythonPackage rec { - name = "zope.contentprovider-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz"; - md5 = "1bb2132551175c0123f17939a793f812"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_jquery = buildPythonPackage rec { - name = "plone.app.jquery-1.4.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.4.4.zip"; - md5 = "a12d56f3dfd2ba6840bf21a6bd860b90"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atreferencebrowserwidget = buildPythonPackage rec { - name = "Products.ATReferenceBrowserWidget-3.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip"; - md5 = "157bdd32155c8353450c17c649aad042"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserresource = buildPythonPackage rec { - name = "zope.browserresource-3.10.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; - md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_caching = buildPythonPackage rec { - name = "plone.caching-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip"; - md5 = "2c2e3b27d13b9101c92dfed222fde36c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_locales = buildPythonPackage rec { - name = "zope.app.locales-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz"; - md5 = "bd2b4c6040e768f33004b1210d3207fa"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_placelesstranslationservice = buildPythonPackage rec { - name = "Products.PlacelessTranslationService-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip"; - md5 = "a94635eb712563c5a002520713f5d6dc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_z3cform = buildPythonPackage rec { - name = "plone.z3cform-0.7.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.7.8.zip"; - md5 = "da891365156a5d5824d4e504465886a2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_batching z3c_form zope_i18n zope_component collective_monkeypatcher setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_lifecycleevent = buildPythonPackage rec { - name = "zope.lifecycleevent-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz"; - md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_form = buildPythonPackage rec { - name = "zope.app.form-4.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz"; - md5 = "3d2b164d9d37a71490a024aaeb412e91"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_tinymce = buildPythonPackage rec { - name = "Products.TinyMCE-1.2.15"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.2.15.zip"; - md5 = "108b919bfcff711d2116e41eccbede58"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_app_component plone_app_imaging zope_app_content setuptools elementtree plone_outputfilters ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_z3cform_datetimewidget = buildPythonPackage rec { - name = "collective.z3cform.datetimewidget-1.2.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip"; - md5 = "439117021c93f26c677510504ee245d3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_form = buildPythonPackage rec { - name = "z3c.form-2.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-2.5.1.tar.gz"; - md5 = "f029f83dd226f695f55049ed1ecee95e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_pagetemplate zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_traversing zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_dcworkflow = buildPythonPackage rec { - name = "Products.DCWorkflow-2.2.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; - md5 = "c90a16c4f3611015592ba8173a5f1863"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mechanize = buildPythonPackage rec { - name = "mechanize-0.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip"; - md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_iterate = buildPythonPackage rec { - name = "plone.app.iterate-2.1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.9.zip"; - md5 = "db598cfc0986737145ddc7e6b70a1794"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - accesscontrol = buildPythonPackage rec { - name = "AccessControl-2.13.12"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-2.13.12.zip"; - md5 = "b9205bceb8386deceab51f758bc4784a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testing = buildPythonPackage rec { - name = "zope.testing-3.9.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz"; - md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externaleditor = buildPythonPackage rec { - name = "Products.ExternalEditor-1.1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_publication = buildPythonPackage rec { - name = "zope.app.publication-3.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip"; - md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_filerepresentation = buildPythonPackage rec { - name = "zope.filerepresentation-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz"; - md5 = "4a7a434094f4bfa99a7f22e75966c359"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_globalrequest = buildPythonPackage rec { - name = "five.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_exceptions = buildPythonPackage rec { - name = "zope.exceptions-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz"; - md5 = "d7234d99d728abe3d9275346e8d24fd9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_layout = buildPythonPackage rec { - name = "plone.app.layout-2.2.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.2.9.zip"; - md5 = "9ad17aaae1e37de2a427cbebc0565166"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_controlpanel plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contenttype = buildPythonPackage rec { - name = "zope.contenttype-3.5.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip"; - md5 = "c6ac80e6887de4108a383f349fbdf332"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_customerize = buildPythonPackage rec { - name = "five.customerize-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.0.3.zip"; - md5 = "32f597c2fa961f7dcc84b23e655d928e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_app_pagetemplate zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_subrequest = buildPythonPackage rec { - name = "plone.subrequest-1.6.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip"; - md5 = "cc12f68a22565415b10dbeef0020baa4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_site = buildPythonPackage rec { - name = "zope.site-3.9.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz"; - md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_uuid = buildPythonPackage rec { - name = "plone.app.uuid-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip"; - md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfactionicons = buildPythonPackage rec { - name = "Products.CMFActionIcons-2.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz"; - md5 = "ab1dc62404ed11aea84dc0d782b2235e"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - persistence = buildPythonPackage rec { - name = "Persistence-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; - md5 = "92693648ccdc59c8fc71f7f06b1d228c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zopeversioncontrol = buildPythonPackage rec { - name = "Products.ZopeVersionControl-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip"; - md5 = "238239102f3ac798ee4f4c53343a561f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_location = buildPythonPackage rec { - name = "zope.location-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz"; - md5 = "1684a8f986099d15296f670c58e713d8"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browsermenu = buildPythonPackage rec { - name = "zope.browsermenu-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; - md5 = "a47c7b1e786661c912a1150bf8d1f83f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_workflow = buildPythonPackage rec { - name = "plone.app.workflow-2.0.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.0.10.zip"; - md5 = "350ea680ccf7eb9b1598927cafad4f38"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime kss_core zope_component products_cmfcore products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_locking = buildPythonPackage rec { - name = "plone.locking-2.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; - md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_dottedname = buildPythonPackage rec { - name = "zope.dottedname-3.4.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz"; - md5 = "62d639f75b31d2d864fe5982cb23959c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_cachedescriptors = buildPythonPackage rec { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_collection = buildPythonPackage rec { - name = "plone.app.collection-1.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.8.zip"; - md5 = "8bbd299daa04b35ecfad3c13afa7aba0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_lockfile = buildPythonPackage rec { - name = "zc.lockfile-1.0.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz"; - md5 = "6cf83766ef9935c33e240b0904c7a45e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - lxml = buildPythonPackage rec { - name = "lxml-2.3.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.4.tar.gz"; - md5 = "61d4ad80726b984b35c9a81aa2510b4d"; - }; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_contentrules = buildPythonPackage rec { - name = "plone.contentrules-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip"; - md5 = "a32370656c4fd58652fcd8a234db69c5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sendmail = buildPythonPackage rec { - name = "zope.sendmail-3.7.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz"; - md5 = "8a513ecf2b41cad849f6607bf16d6818"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_formlib = buildPythonPackage rec { - name = "zope.formlib-4.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip"; - md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_caching = buildPythonPackage rec { - name = "plone.app.caching-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip"; - md5 = "1975506ecf8d42944946dbb2b8f8dc01"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplone = buildPythonPackage rec { - name = "Products.CMFPlone-4.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.2.5.zip"; - md5 = "dab2fb239699598e6b48b060b07a8c7e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing zope_app_container products_tinymce zope_publisher plonetheme_classic plone_fieldsets products_cmfdefault five_localsitemanager plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup acquisition plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole kss_core zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_folder plone_registry zope_i18nmessageid z3c_autoinclude plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext zope_app_publisher plone_app_customerize zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst archetypes_kss plone_app_kss plone_protect zope_app_component zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static zope_copypastemove plone_session products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - transaction = buildPythonPackage rec { - name = "transaction-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz"; - md5 = "30b062baa34fe1521ad979fb088c8c55"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_controlpanel = buildPythonPackage rec { - name = "plone.app.controlpanel-2.2.11"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.2.11.zip"; - md5 = "401c8880865f398c281953f5837108b9"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_redirector = buildPythonPackage rec { - name = "plone.app.redirector-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.1.3.zip"; - md5 = "7d441340a83b8ed72a03bc16148a5f21"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_component = buildPythonPackage rec { - name = "zope.component-3.9.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz"; - md5 = "22780b445b1b479701c05978055d1c82"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_broken = buildPythonPackage rec { - name = "zope.broken-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip"; - md5 = "eff24d7918099a3e899ee63a9c31bee6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_recipe_egg = buildPythonPackage rec { - name = "zc.recipe.egg-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.2.2.tar.gz"; - md5 = "fe5ad0f1c0fc3d4348286534e1b9cec5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zc_buildout setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_openid = buildPythonPackage rec { - name = "plone.app.openid-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz"; - md5 = "ae0748f91cab0612a498926d405d8edd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_caching = buildPythonPackage rec { - name = "z3c.caching-2.0a1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz"; - md5 = "17f250b5084c2324a7d15c6810ee628e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_openid = buildPythonPackage rec { - name = "python-openid-2.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip"; - md5 = "f89d9d4f4dccfd33b5ce34eb4725f751"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - tempstorage = buildPythonPackage rec { - name = "tempstorage-2.12.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; - md5 = "7a2b76b39839e229249b1bb175604480"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zctextindex = buildPythonPackage rec { - name = "Products.ZCTextIndex-2.13.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip"; - md5 = "8bbfa5fcd3609246990a9314d6f826b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - extensionclass = buildPythonPackage rec { - name = "ExtensionClass-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - -}; in plone43Packages diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix deleted file mode 100644 index 0eac538951d..00000000000 --- a/pkgs/development/web/plone/4.3.nix +++ /dev/null @@ -1,5532 +0,0 @@ -# DO NOT EDIT THIS FILE! -# -# Nix expressions autogenerated with: -# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d collective.recipe.filestorage -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix - -{ pkgs, pythonPackages }: - -let plone43Packages = pythonPackages.python.modules // rec { - inherit (pythonPackages) buildPythonPackage setuptools zc_buildout pillow; - inherit (pkgs) fetchurl stdenv; - - plone_app_portlets = buildPythonPackage rec { - name = "plone.app.portlets-2.4.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip"; - md5 = "c1144f7686cacf3d64fcd202ab2e5e2d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope2 = buildPythonPackage rec { - name = "Zope2-2.13.20"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip"; - md5 = "557b08fec37620c37e32f2dc01020f29"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_btreefolder2 = buildPythonPackage rec { - name = "Products.BTreeFolder2-2.13.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/Products.BTreeFolder2-2.13.3.tar.gz"; - md5 = "f57c85673036af7ccd34c3fa251f6bb2"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ accesscontrol zope_container zodb3 zope_event persistence setuptools zope_lifecycleevent acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pythonscripts = buildPythonPackage rec { - name = "Products.PythonScripts-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; - md5 = "04c86f2c45a29a162297a80dac61d14f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol datetime restrictedpython documenttemplate setuptools zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zopeundo = buildPythonPackage rec { - name = "ZopeUndo-2.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip"; - md5 = "2b8da09d1b98d5558f62e12f6e52c401"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - datetime = buildPythonPackage rec { - name = "DateTime-3.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DateTime/DateTime-3.0.3.zip"; - md5 = "5ebf0a8e3775b744c5de2e6685b37ae9"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface pytz ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_session = buildPythonPackage rec { - name = "plone.session-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.session/plone.session-3.5.3.zip"; - md5 = "f95872454735abc8f27c3dcbc9434c11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_pluggableauthservice plone_keyring zope_interface setuptools zope_component plone_protect ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_container = buildPythonPackage rec { - name = "zope.container-3.11.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.container/zope.container-3.11.2.tar.gz"; - md5 = "fc66d85a17b8ffb701091c9328983dcc"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_filerepresentation zope_i18nmessageid zope_publisher zope_broken zope_interface zope_size zope_dottedname zope_security zope_location zope_lifecycleevent zope_component zodb3 zope_event setuptools zope_schema zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_folder = buildPythonPackage rec { - name = "plone.folder-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip"; - md5 = "1674ff18b7a9452d0c2063cf11c679b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope_interface plone_memoize zope_container setuptools zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonepas = buildPythonPackage rec { - name = "Products.PlonePAS-4.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip"; - md5 = "32db1808c3ad42e82542b65eb95c3c71"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_genericsetup plone_memoize plone_i18n plone_session zope2 setuptools products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_locales = buildPythonPackage rec { - name = "plone.app.locales-4.3.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip"; - md5 = "c88b2da05361a24a564bdef30fb371aa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sequencesort = buildPythonPackage rec { - name = "zope.sequencesort-3.4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sequencesort/zope.sequencesort-3.4.0.tar.gz"; - md5 = "cfc35fc426a47f5c0ee43c416224b864"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_genericsetup = buildPythonPackage rec { - name = "Products.GenericSetup-1.7.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz"; - md5 = "c48967c81c880ed33ee16a14caab3b11"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_theme = buildPythonPackage rec { - name = "plone.theme-2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip"; - md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_publisher zope_interface zope_traversing zope_component products_cmfdefault setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tal = buildPythonPackage rec { - name = "zope.tal-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tal/zope.tal-3.5.2.zip"; - md5 = "13869f292ba36b294736b7330b1396fd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_cachepurging = buildPythonPackage rec { - name = "plone.cachepurging-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip"; - md5 = "886814ac4deef0f1ed99a2eb60864264"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 five_globalrequest zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_protect = buildPythonPackage rec { - name = "plone.protect-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.protect/plone.protect-2.0.2.zip"; - md5 = "74925ffb08782e72f9b1e850fa78fffa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component plone_keyring zope2 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_portaltransforms = buildPythonPackage rec { - name = "Products.PortalTransforms-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; - md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_structuredtext products_mimetypesregistry zodb3 products_cmfdefault plone_intelligenttext setuptools markdown products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_memoize = buildPythonPackage rec { - name = "plone.memoize-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.memoize/plone.memoize-1.1.1.zip"; - md5 = "d07cd14b976160e1f26a859e3370147e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope_annotation zope_ramcache setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - docutils = buildPythonPackage rec { - name = "docutils-0.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz"; - md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_formlib = buildPythonPackage rec { - name = "five.formlib-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.formlib/five.formlib-1.0.4.zip"; - md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_app_form zope_formlib zope_interface zope_location zope_publisher zope_component extensionclass zope_event setuptools zope_schema zope_lifecycleevent zope_browser zope2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zexceptions = buildPythonPackage rec { - name = "zExceptions-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zExceptions/zExceptions-2.13.0.zip"; - md5 = "4c679696c959040d8e656ef85ae40136"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_publisher zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfuid = buildPythonPackage rec { - name = "Products.CMFUid-2.2.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFUid/Products.CMFUid-2.2.1.tar.gz"; - md5 = "e20727959351dffbf0bac80613eee110"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - restrictedpython = buildPythonPackage rec { - name = "RestrictedPython-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-3.6.0.zip"; - md5 = "aa75a7dcc7fbc966357837cc66cacec6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_theming = buildPythonPackage rec { - name = "plone.app.theming-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; - md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - feedparser = buildPythonPackage rec { - name = "feedparser-5.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.zip"; - md5 = "cefffeba66b658d3cc7c1d66b92c6a1a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browser = buildPythonPackage rec { - name = "zope.browser-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browser/zope.browser-1.3.zip"; - md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdefault = buildPythonPackage rec { - name = "Products.CMFDefault-2.2.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz"; - md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_genericsetup products_cmfcore five_formlib setuptools zope2 eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_dateutil = buildPythonPackage rec { - name = "python-dateutil-1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_error = buildPythonPackage rec { - name = "zope.error-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.error/zope.error-3.7.4.tar.gz"; - md5 = "281445a906458ff5f18f56923699a127"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_location zope_exceptions setuptools zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetools = buildPythonPackage rec { - name = "Products.MIMETools-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ documenttemplate setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deprecation = buildPythonPackage rec { - name = "zope.deprecation-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-3.4.1.tar.gz"; - md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplacefulworkflow = buildPythonPackage rec { - name = "Products.CMFPlacefulWorkflow-1.5.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; - md5 = "9041e1f52eab5b348c0dfa85be438722"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_i18nmessageid products_plonetestcase products_genericsetup zope_interface zope_testing zope_component setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unidecode = buildPythonPackage rec { - name = "Unidecode-0.04.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz"; - md5 = "c4c9ed8d40cff25c390ff5d5112b9308"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcore = buildPythonPackage rec { - name = "Products.CMFCore-2.2.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; - md5 = "9320a4023b8575097feacfd4a400e930"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_localsitemanager = buildPythonPackage rec { - name = "five.localsitemanager-2.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.localsitemanager/five.localsitemanager-2.0.5.zip"; - md5 = "5e3a658e6068832bd802018ebc83f2d4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_site zope_interface zope_location zope_component zodb3 zope_event setuptools zope_lifecycleevent zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_recipe_template = buildPythonPackage rec { - name = "collective.recipe.template-1.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.recipe.template/collective.recipe.template-1.9.zip"; - md5 = "f8b8eab3cf183ea92c2e50a54da228e8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zc_buildout setuptools pythonPackages.genshi ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_configuration = buildPythonPackage rec { - name = "zope.configuration-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfcalendar = buildPythonPackage rec { - name = "Products.CMFCalendar-2.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz"; - md5 = "49458e68dc3b6826ea9a3576ac014419"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfdefault zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_extendedpathindex = buildPythonPackage rec { - name = "Products.ExtendedPathIndex-3.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/Products.ExtendedPathIndex-3.1.zip"; - md5 = "00c048a4b103200bdcbda61fa22c66df"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol transaction zope2 setuptools zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_schemaextender = buildPythonPackage rec { - name = "archetypes.schemaextender-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip"; - md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zconfig = buildPythonPackage rec { - name = "ZConfig-2.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz"; - md5 = "4738de641d90b992de5b89ff1bc2fe49"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentmenu = buildPythonPackage rec { - name = "plone.app.contentmenu-2.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip"; - md5 = "8ba463f1a164c454c70d26507e5bd22a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher products_cmfdynamicviewfti zope_browsermenu zope_interface plone_memoize plone_app_content zope_component acquisition setuptools zope_i18n plone_locking products_cmfcore zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluginregistry = buildPythonPackage rec { - name = "Products.PluginRegistry-1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_alterego = buildPythonPackage rec { - name = "plone.alterego-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip"; - md5 = "b7b6dbcbba00505d98d5aba83e016408"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_outputfilters = buildPythonPackage rec { - name = "plone.outputfilters-1.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip"; - md5 = "2c8ba3b7fd2bf18406eb49d01b478139"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_publisher = buildPythonPackage rec { - name = "zope.publisher-3.12.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.publisher/zope.publisher-3.12.6.tar.gz"; - md5 = "495131970cc7cb14de8e517fb3857ade"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_contenttype zope_proxy zope_interface zope_location zope_exceptions zope_security zope_configuration zope_component zope_event setuptools zope_browser zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_security = buildPythonPackage rec { - name = "zope.security-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; - md5 = "072ab8d11adc083eace11262da08630c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_interface zope_location zope_configuration zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zdaemon = buildPythonPackage rec { - name = "zdaemon-2.0.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zdaemon/zdaemon-2.0.7.tar.gz"; - md5 = "291a875f82e812110557eb6704af8afe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_annotation = buildPythonPackage rec { - name = "zope.annotation-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.annotation/zope.annotation-3.5.0.tar.gz"; - md5 = "4238153279d3f30ab5613438c8e76380"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy zope_interface zope_location zope_component zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_mkzeoinstance = buildPythonPackage rec { - name = "zope.mkzeoinstance-3.9.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/zope.mkzeoinstance-3.9.5.tar.gz"; - md5 = "2c2dcf7cc7de58f7d009ca3294f54377"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - repoze_xmliter = buildPythonPackage rec { - name = "repoze.xmliter-0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/r/repoze.xmliter/repoze.xmliter-0.5.zip"; - md5 = "99da76bcbad6fbaced4a273bde29b10e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_form = buildPythonPackage rec { - name = "plone.app.form-2.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip"; - md5 = "6101e6a5bd4de6cc8cdef09ced2743eb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_schema zope_site plone_app_vocabularies zope2 datetime zope_component zope_event five_formlib setuptools zope_interface zope_lifecycleevent zope_formlib zope_browser zope_i18n plone_locking products_cmfcore acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_structuredtext = buildPythonPackage rec { - name = "zope.structuredtext-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.structuredtext/zope.structuredtext-3.5.1.tar.gz"; - md5 = "eabbfb983485d0879322bc878d2478a0"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_recipe_varnish = buildPythonPackage rec { - name = "plone.recipe.varnish-1.3dev"; - src = fetchurl { - url = "https://github.com/collective/plone.recipe.varnish/archive/38ef4a86ce2e1c407e35ab36487bc1311c4eb1e3.zip"; - md5 = "9aa448793ca115790d38df6f676bd7d8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zc_buildout setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zodb3 = buildPythonPackage rec { - name = "ZODB3-3.10.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface transaction zconfig zope_event zdaemon zc_lockfile ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_batching = buildPythonPackage rec { - name = "plone.batching-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip"; - md5 = "cabd58ccfec67cd384602343ce40dc7b"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - documenttemplate = buildPythonPackage rec { - name = "DocumentTemplate-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip"; - md5 = "07bb086c77c1dfe94125ad2efbba94b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zope_sequencesort zexceptions restrictedpython zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_search = buildPythonPackage rec { - name = "plone.app.search-1.1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip"; - md5 = "fb24320380ed2ba11e6f20cc1fe3b6df"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_contentlisting setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - diazo = buildPythonPackage rec { - name = "diazo-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip"; - md5 = "d3c2b017af521db4c86fb360c86e0bc8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml experimental_cssselect setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_globalrequest = buildPythonPackage rec { - name = "zope.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.globalrequest/zope.globalrequest-1.0.zip"; - md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_customerize = buildPythonPackage rec { - name = "plone.app.customerize-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.customerize/plone.app.customerize-1.2.2.zip"; - md5 = "6a3802c4e8fbd955597adc6a8298febf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope2 zope_publisher zope_interface plone_browserlayer plone_portlets zope_component setuptools five_customerize products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdifftool = buildPythonPackage rec { - name = "Products.CMFDiffTool-2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip"; - md5 = "7513d954294e9f318182f9d61660abdb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testbrowser = buildPythonPackage rec { - name = "zope.testbrowser-3.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testbrowser/zope.testbrowser-3.11.1.tar.gz"; - md5 = "64abbee892121e7f1a91aed12cfc155a"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface mechanize pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_contentmigration = buildPythonPackage rec { - name = "Products.contentmigration-2.1.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.4.zip"; - md5 = "711f9d4ea3cc2130acaa74efb0f9da5e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_recipe_filestorage = buildPythonPackage rec { - name = "collective.recipe.filestorage-0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.recipe.filestorage/collective.recipe.filestorage-0.6.zip"; - md5 = "c0d85a82a858a860dc665dd38303fedd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zc_buildout setuptools plone_recipe_zope2instance ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_intelligenttext = buildPythonPackage rec { - name = "plone.intelligenttext-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; - md5 = "51688fa0815b49e00334e3ef948328ba"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_classic = buildPythonPackage rec { - name = "plonetheme.classic-1.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip"; - md5 = "c77d4c34afaf7c02df44d4df72328155"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_authentication = buildPythonPackage rec { - name = "zope.authentication-3.7.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.authentication/zope.authentication-3.7.1.zip"; - md5 = "7d6bb340610518f2fc71213cfeccda68"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18n = buildPythonPackage rec { - name = "zope.i18n-3.7.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18n/zope.i18n-3.7.4.tar.gz"; - md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_i18nmessageid pytz setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_componentvocabulary = buildPythonPackage rec { - name = "zope.componentvocabulary-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/zope.componentvocabulary-1.0.1.tar.gz"; - md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_security zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_ofsp = buildPythonPackage rec { - name = "Products.OFSP-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.OFSP/Products.OFSP-2.13.2.zip"; - md5 = "c76d40928753c2ee56db873304e65bd5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol persistence setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_datetime = buildPythonPackage rec { - name = "zope.datetime-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.datetime/zope.datetime-3.4.1.tar.gz"; - md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - experimental_cssselect = buildPythonPackage rec { - name = "experimental.cssselect-0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/e/experimental.cssselect/experimental.cssselect-0.3.zip"; - md5 = "3fecdcf1fbc3ea6025e115a56a262957"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_passwordresettool = buildPythonPackage rec { - name = "Products.PasswordResetTool-2.0.14"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; - md5 = "4267a5fef471d0ebe5ca848e86630702"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_jquerytools = buildPythonPackage rec { - name = "plone.app.jquerytools-1.5.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip"; - md5 = "7a4957a3a8482e4963e49e2d02772e33"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_component zope2 products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_validation = buildPythonPackage rec { - name = "Products.validation-2.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.validation/Products.validation-2.0.zip"; - md5 = "afa217e2306637d1dccbebf337caa8bf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime setuptools zope_i18n acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_registry = buildPythonPackage rec { - name = "plone.registry-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.registry/plone.registry-1.0.1.zip"; - md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface zope_dottedname zope_component zodb3 zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_static = buildPythonPackage rec { - name = "plone.portlet.static-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; - md5 = "ec0dc691b4191a41ff97779b117f9985"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 plone_app_portlets zope_formlib zope_interface setuptools plone_i18n plone_portlets zope_component plone_app_form zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_viewlet = buildPythonPackage rec { - name = "zope.viewlet-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.viewlet/zope.viewlet-3.7.2.tar.gz"; - md5 = "367e03096df57e2f9b74fff43f7901f9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_i18nmessageid zope_publisher zope_interface zope_location zope_security zope_configuration zope_component zope_event setuptools zope_schema zope_traversing zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlet_collection = buildPythonPackage rec { - name = "plone.portlet.collection-2.1.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip"; - md5 = "065f0d9141860229cf66d0ff2ed6d4ea"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_users = buildPythonPackage rec { - name = "plone.app.users-1.2a2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip"; - md5 = "a96e42e34d97162363cb3bbc8483d2ba"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid setuptools zope_site zope_formlib zope_interface plone_app_controlpanel plone_app_layout zope2 zope_component products_statusmessages products_cmfdefault five_formlib plone_protect zodb3 zope_schema products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_querystring = buildPythonPackage rec { - name = "plone.app.querystring-1.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip"; - md5 = "3ad2155da0dd5c6b99643551ad494607"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_i18n zope_publisher setuptools zope_globalrequest plone_app_vocabularies zope_dottedname plone_app_layout datetime plone_registry zope_component plone_app_contentlisting zope_interface zope_schema plone_app_registry products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_i18nmessageid = buildPythonPackage rec { - name = "zope.i18nmessageid-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz"; - md5 = "cb84bf61c2b7353e3b7578057fbaa264"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_folder = buildPythonPackage rec { - name = "plone.app.folder-1.0.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip"; - md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_folder setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zcatalog = buildPythonPackage rec { - name = "Products.ZCatalog-2.13.23"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip"; - md5 = "d425171516dfc70e543a4e2b852301cb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_testing extensionclass missing zope_dottedname restrictedpython datetime record persistence zodb3 documenttemplate setuptools zope_interface zope_schema products_zctextindex zexceptions acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_openid = buildPythonPackage rec { - name = "python-openid-2.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.zip"; - md5 = "f89d9d4f4dccfd33b5ce34eb4725f751"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_autoinclude = buildPythonPackage rec { - name = "z3c.autoinclude-0.3.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip"; - md5 = "6a615ae18c12b459bceb3ae28e8e7709"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_dottedname zope_configuration zc_buildout setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_processlifetime = buildPythonPackage rec { - name = "zope.processlifetime-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.processlifetime/zope.processlifetime-1.0.tar.gz"; - md5 = "69604bfd668a01ebebdd616a8f26ccfe"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_uuid = buildPythonPackage rec { - name = "plone.uuid-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.uuid/plone.uuid-1.0.3.zip"; - md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_browserpage zope_publisher setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_dexterity = buildPythonPackage rec { - name = "plone.dexterity-2.1.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip"; - md5 = "7f6444a2c26488e4068217266fd243b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_synchronize = buildPythonPackage rec { - name = "plone.synchronize-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.synchronize/plone.synchronize-1.0.1.zip"; - md5 = "d25e86ace8daa0816861296c3288c4fb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_traversing = buildPythonPackage rec { - name = "zope.traversing-3.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.traversing/zope.traversing-3.13.2.zip"; - md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_proxy zope_location zope_interface zope_security zope_component setuptools zope_publisher zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - python_gettext = buildPythonPackage rec { - name = "python-gettext-1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip"; - md5 = "cd4201d440126d1296d1d2bc2b4795f3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unittest2 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_securemailhost = buildPythonPackage rec { - name = "Products.SecureMailHost-1.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/Products.SecureMailHost-1.1.2.zip"; - md5 = "7db0f1fa867bd0df972082f502a7a707"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonelanguagetool = buildPythonPackage rec { - name = "Products.PloneLanguageTool-3.2.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; - md5 = "bd9eb6278bf76e8cbce99437ca362164"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - eggtestinfo = buildPythonPackage rec { - name = "eggtestinfo-0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/e/eggtestinfo/eggtestinfo-0.3.tar.gz"; - md5 = "6f0507aee05f00c640c0d64b5073f840"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_recipe_zeoserver = buildPythonPackage rec { - name = "plone.recipe.zeoserver-1.2.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.recipe.zeoserver/plone.recipe.zeoserver-1.2.6.zip"; - md5 = "3e2b1634c850b76b0f485675799d0189"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_mkzeoinstance zopeundo zodb3 zc_buildout setuptools zc_recipe_egg ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mailinglogger = buildPythonPackage rec { - name = "mailinglogger-3.7.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mailinglogger/mailinglogger-3.7.0.tar.gz"; - md5 = "f865f0df6059ce23062b7457d01dbac5"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - missing = buildPythonPackage rec { - name = "Missing-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip"; - md5 = "9823cff54444cbbcaef8fc45d8e42572"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_deferredimport = buildPythonPackage rec { - name = "zope.deferredimport-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.deferredimport/zope.deferredimport-3.5.3.tar.gz"; - md5 = "68fce3bf4f011d4a840902fd763884ee"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_proxy setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_tales = buildPythonPackage rec { - name = "zope.tales-3.5.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz"; - md5 = "a2dbc6e41140c29de81b66a4d703fc3f"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools zope_tal ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zsqlmethods = buildPythonPackage rec { - name = "Products.ZSQLMethods-2.13.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/Products.ZSQLMethods-2.13.4.zip"; - md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass missing zope_interface datetime zope2 record transaction acquisition setuptools zodb3 persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_statusmessages = buildPythonPackage rec { - name = "Products.statusmessages-4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.statusmessages/Products.statusmessages-4.0.zip"; - md5 = "265324b0a58a032dd0ed038103ed0473"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_annotation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_i18n = buildPythonPackage rec { - name = "plone.i18n-2.0.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip"; - md5 = "572c21e86b99316a06dc9998454d7750"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_querywidget = buildPythonPackage rec { - name = "archetypes.querywidget-1.0.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip"; - md5 = "3416b6b4948c624e1b5b8dd8d7e33f59"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_jquerytools plone_app_querystring setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_transformchain = buildPythonPackage rec { - name = "plone.transformchain-1.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.transformchain/plone.transformchain-1.0.3.zip"; - md5 = "f5fb7ca894249e3e666501c4fae52a6c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_pluggableauthservice = buildPythonPackage rec { - name = "Products.PluggableAuthService-1.10.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/Products.PluggableAuthService-1.10.0.tar.gz"; - md5 = "1a1db6b1d9dd34f8b93a8a3104385a37"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_pluginregistry zope2 products_genericsetup setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - borg_localrole = buildPythonPackage rec { - name = "borg.localrole-3.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/b/borg.localrole/borg.localrole-3.0.2.zip"; - md5 = "04082694dfda9ae5cda62747b8ac7ccf"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_deferredimport zope_interface plone_memoize zope_component setuptools products_pluggableauthservice zope_annotation products_cmfcore acquisition products_plonepas ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - archetypes_referencebrowserwidget = buildPythonPackage rec { - name = "archetypes.referencebrowserwidget-2.4.18"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip"; - md5 = "6eff85cbde401ff1566a76323792d514"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_globalrequest = buildPythonPackage rec { - name = "five.globalrequest-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_globalrequest zope2 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_rfc822 = buildPythonPackage rec { - name = "plone.rfc822-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.0.1.zip"; - md5 = "b5b79bb5a9181da624a7e88940a45424"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_component python_dateutil setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plonetheme_sunburst = buildPythonPackage rec { - name = "plonetheme.sunburst-1.4.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip"; - md5 = "f2cb3fdd66ecc14d1a542d2ca76252db"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_portlets = buildPythonPackage rec { - name = "plone.portlets-2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlets/plone.portlets-2.2.zip"; - md5 = "5b7e06bee6e40af83694b82e1fee8c2d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_publisher zope_site zope_container zope_interface plone_memoize zope_component zodb3 setuptools zope_schema zope_annotation zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_proxy = buildPythonPackage rec { - name = "zope.proxy-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-3.6.1.zip"; - md5 = "a400b0a26624b17fa889dbcaa989d440"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_archetypes = buildPythonPackage rec { - name = "Products.Archetypes-1.9.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip"; - md5 = "c2343539f9f3e485f0bc98b46c12cd85"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - initgroups = buildPythonPackage rec { - name = "initgroups-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/i/initgroups/initgroups-2.13.0.zip"; - md5 = "38e842dcab8445f65e701fec75213acd"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_schema = buildPythonPackage rec { - name = "zope.schema-4.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; - md5 = "e7e581af8193551831560a736a53cf58"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_scale = buildPythonPackage rec { - name = "plone.scale-1.3.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip"; - md5 = "584ccbf515aff9fef363c2cc8abac789"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_copy = buildPythonPackage rec { - name = "zope.copy-3.5.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.copy/zope.copy-3.5.0.tar.gz"; - md5 = "a9836a5d36cd548be45210eb00407337"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - roman = buildPythonPackage rec { - name = "roman-1.4.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz"; - md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_event = buildPythonPackage rec { - name = "zope.event-3.5.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz"; - md5 = "6e8af2a16157a74885d4f0d88137cefb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - acquisition = buildPythonPackage rec { - name = "Acquisition-2.13.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_resource = buildPythonPackage rec { - name = "plone.resource-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.resource/plone.resource-1.0.2.zip"; - md5 = "594d41e3acd913ae92f2e9ef96503b9f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ python_dateutil zope_filerepresentation zope2 zope_publisher z3c_caching zope_interface zope_traversing zope_configuration zope_component plone_caching setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_linkintegrity = buildPythonPackage rec { - name = "plone.app.linkintegrity-1.5.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip"; - md5 = "f97c61da9f243391cafdfe3fe1cf6d6c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_resourceregistries = buildPythonPackage rec { - name = "Products.ResourceRegistries-2.2.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip"; - md5 = "8dd4f36eb894d868366b51941f6f0966"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_browserlayer = buildPythonPackage rec { - name = "plone.browserlayer-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip"; - md5 = "bce02f4907a4f29314090c525e5fc28e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_traversing zope_component setuptools products_genericsetup products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - markdown = buildPythonPackage rec { - name = "Markdown-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.zip"; - md5 = "122418893e21e91109edbf6e082f830d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_formwidget_query = buildPythonPackage rec { - name = "z3c.formwidget.query-0.9"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip"; - md5 = "d9f7960b1a5a81d8ba5241530f496522"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid z3c_form zope_interface zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_z3cform = buildPythonPackage rec { - name = "plone.app.z3cform-0.7.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip"; - md5 = "deddc1af36efb26a6792c9803531c665"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_viewletmanager = buildPythonPackage rec { - name = "plone.app.viewletmanager-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.3.zip"; - md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 products_genericsetup zope_site zope_interface zope_component zodb3 acquisition setuptools plone_app_vocabularies zope_viewlet zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentlisting = buildPythonPackage rec { - name = "plone.app.contentlisting-1.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip"; - md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ramcache = buildPythonPackage rec { - name = "zope.ramcache-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ramcache/zope.ramcache-1.0.zip"; - md5 = "87289e15f0e51f50704adda1557c02a7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zodb3 zope_testing setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_vocabularies = buildPythonPackage rec { - name = "plone.app.vocabularies-2.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz"; - md5 = "166a0d6f9a3e3cd753efa56aaef585be"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_site zope_formlib zope_interface zope_component setuptools zope_schema zope_browser zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_discussion = buildPythonPackage rec { - name = "plone.app.discussion-2.2.7"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.7.tar.gz"; - md5 = "47e2713140dbbcd6dd9c3fa6dbd17fd0"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zlog = buildPythonPackage rec { - name = "zLOG-2.11.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zLOG/zLOG-2.11.1.tar.gz"; - md5 = "68073679aaa79ac5a7b6a5c025467147"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zconfig ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone = buildPythonPackage rec { - name = "Plone-4.3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip"; - md5 = "faefd5d2044a9f7660fd18388fd71a4e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_standardcachemanagers = buildPythonPackage rec { - name = "Products.StandardCacheManagers-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/Products.StandardCacheManagers-2.13.0.zip"; - md5 = "c5088b2b62bd26d63d9579a04369cb73"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol zope_component transaction setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_fieldsets = buildPythonPackage rec { - name = "plone.fieldsets-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.fieldsets/plone.fieldsets-2.0.2.zip"; - md5 = "4158c8a1f784fcb5cecbd63deda7222f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_formlib zope_interface zope_component five_formlib setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_monkeypatcher = buildPythonPackage rec { - name = "collective.monkeypatcher-1.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/collective.monkeypatcher-1.0.1.zip"; - md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_zcmlhook = buildPythonPackage rec { - name = "z3c.zcmlhook-1.0b1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/z3c.zcmlhook-1.0b1.tar.gz"; - md5 = "7b6c80146f5930409eb0b355ddf3daeb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_component zope_configuration setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_recipe_zope2instance = buildPythonPackage rec { - name = "plone.recipe.zope2instance-4.2.11"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.11.zip"; - md5 = "ac51fe0566b43866906181134a3c8a9e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_supermodel = buildPythonPackage rec { - name = "plone.supermodel-1.2.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip"; - md5 = "6e829dc362d6ff8e3c7696277e11e322"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_registry = buildPythonPackage rec { - name = "plone.app.registry-1.2.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip"; - md5 = "b2269e10516e8f2faf83545e3d0163d8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_pagetemplate = buildPythonPackage rec { - name = "zope.pagetemplate-3.6.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/zope.pagetemplate-3.6.3.zip"; - md5 = "834a4bf702c05fba1e669677b4dc871f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_interface zope_traversing zope_tales zope_security zope_component setuptools zope_tal zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfformcontroller = buildPythonPackage rec { - name = "Products.CMFFormController-3.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/Products.CMFFormController-3.0.3.zip"; - md5 = "6573df7dcb39e3b63ba22abe2acd639e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_tales products_cmfcore zope2 setuptools zope_structuredtext acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_openid = buildPythonPackage rec { - name = "plone.openid-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip"; - md5 = "d4c36926a6dbefed035ed92c29329ce1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_pluggableauthservice python_openid zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_content = buildPythonPackage rec { - name = "zope.app.content-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.content/zope.app.content-3.5.1.tar.gz"; - md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface zope_componentvocabulary zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_size = buildPythonPackage rec { - name = "zope.size-3.4.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.size/zope.size-3.4.1.tar.gz"; - md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mimetypesregistry = buildPythonPackage rec { - name = "Products.MimetypesRegistry-2.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; - md5 = "898166bb2aaececc8238ad4ee4826793"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_interface zope_contenttype zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_imaging = buildPythonPackage rec { - name = "plone.app.imaging-1.0.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip"; - md5 = "e680c5540021a70266343b935ac732a7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_marshall = buildPythonPackage rec { - name = "Products.Marshall-2.1.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Marshall/Products.Marshall-2.1.2.zip"; - md5 = "bde4d7f75195c1ded8371554b04d2541"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction products_genericsetup zope_interface zope_contenttype datetime extensionclass plone_uuid setuptools zope2 products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_ptresource = buildPythonPackage rec { - name = "zope.ptresource-3.9.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.ptresource/zope.ptresource-3.9.0.tar.gz"; - md5 = "f4645e51c15289d3fdfb4139039e18e9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_pagetemplate zope_interface zope_browserresource zope_security setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfactionicons = buildPythonPackage rec { - name = "Products.CMFActionIcons-2.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/Products.CMFActionIcons-2.1.3.tar.gz"; - md5 = "ab1dc62404ed11aea84dc0d782b2235e"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - multimapping = buildPythonPackage rec { - name = "MultiMapping-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/M/MultiMapping/MultiMapping-2.13.0.zip"; - md5 = "d69c5904c105b9f2f085d4103e0f0586"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_mailhost = buildPythonPackage rec { - name = "Products.MailHost-2.13.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.MailHost/Products.MailHost-2.13.1.zip"; - md5 = "1102e523435d8bf78a15b9ddb57478e1"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - pytz = buildPythonPackage rec { - name = "pytz-2013b"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pytz/pytz-2013b.zip"; - md5 = "c70dc37ffe435dd77e3f967a0dffe928"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_i18n = buildPythonPackage rec { - name = "plone.app.i18n-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.i18n/plone.app.i18n-2.0.2.zip"; - md5 = "a10026573463dfc1899bf4062cebdbf2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_indexer = buildPythonPackage rec { - name = "plone.indexer-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface products_cmfcore setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externalmethod = buildPythonPackage rec { - name = "Products.ExternalMethod-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol extensionclass zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_upgrade = buildPythonPackage rec { - name = "plone.app.upgrade-1.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; - md5 = "1c45e809fba27bec11e8a40f686f0f5b"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserpage = buildPythonPackage rec { - name = "zope.browserpage-3.12.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_pagetemplate zope_interface zope_traversing zope_component zope_security zope_configuration zope_publisher setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_resourceeditor = buildPythonPackage rec { - name = "plone.resourceeditor-1.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; - md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atcontenttypes = buildPythonPackage rec { - name = "Products.ATContentTypes-2.1.13"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip"; - md5 = "093899fc74f5e2a83db464c96d0f5293"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfeditions = buildPythonPackage rec { - name = "Products.CMFEditions-2.2.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; - md5 = "1806f2e17e2527fad9364670b343bd11"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_cmfdifftool zope_copy zope_interface products_genericsetup zope_dottedname products_zopeversioncontrol datetime products_cmfuid zodb3 products_cmfcore setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_interface = buildPythonPackage rec { - name = "zope.interface-3.6.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.7.zip"; - md5 = "9df962180fbbb54eb1875cff9fe436e5"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_content = buildPythonPackage rec { - name = "plone.app.content-2.1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip"; - md5 = "247eb174269b2ab03c05f318915f087e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfquickinstallertool = buildPythonPackage rec { - name = "Products.CMFQuickInstallerTool-3.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/Products.CMFQuickInstallerTool-3.0.6.tar.gz"; - md5 = "af34adb87ddf2b6da48eff8b70ca2989"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 products_genericsetup zope_interface datetime zope_component setuptools zope_annotation products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_autoform = buildPythonPackage rec { - name = "plone.autoform-1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip"; - md5 = "01e5ccb59253bfaaa02c1ab4be3f212f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_contentrules = buildPythonPackage rec { - name = "plone.app.contentrules-3.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip"; - md5 = "518c1e22a9cfe187b6770e62be4f8bd8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - record = buildPythonPackage rec { - name = "Record-2.13.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/R/Record/Record-2.13.0.zip"; - md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_behavior = buildPythonPackage rec { - name = "plone.behavior-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.behavior/plone.behavior-1.0.2.zip"; - md5 = "4459b91287ebc2f2cf4fa38728b2a739"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_configuration zope_component setuptools zope_schema zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_plonetestcase = buildPythonPackage rec { - name = "Products.PloneTestCase-0.9.17"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip"; - md5 = "2a5bfb94220a520961d710abc92280f2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_stringinterp = buildPythonPackage rec { - name = "plone.stringinterp-1.0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; - md5 = "595074e94944ad6860e2105a020a3b9a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_formwidget_namedfile = buildPythonPackage rec { - name = "plone.formwidget.namedfile-1.0.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; - md5 = "afd20f030906a72fca7548876bdcbb48"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_blob = buildPythonPackage rec { - name = "plone.app.blob-1.5.8"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip"; - md5 = "7e575d8df137cd19067cc95845aae604"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale plone_app_imaging zodb3 setuptools archetypes_schemaextender zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfdynamicviewfti = buildPythonPackage rec { - name = "Products.CMFDynamicViewFTI-4.0.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip"; - md5 = "2d31b1700ed8b1441adc737b454af693"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_keyring = buildPythonPackage rec { - name = "plone.keyring-2.0.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.keyring/plone.keyring-2.0.1.zip"; - md5 = "f3970e9bddb2cc65e461a2c62879233f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_container zope_location zodb3 setuptools zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contentprovider = buildPythonPackage rec { - name = "zope.contentprovider-3.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contentprovider/zope.contentprovider-3.7.2.tar.gz"; - md5 = "1bb2132551175c0123f17939a793f812"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_publisher zope_interface zope_location zope_tales zope_component zope_event setuptools zope_schema ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_jquery = buildPythonPackage rec { - name = "plone.app.jquery-1.7.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; - md5 = "e204cf45456d26217263531832b5bdac"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_cmfcore setuptools products_genericsetup ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_atreferencebrowserwidget = buildPythonPackage rec { - name = "Products.ATReferenceBrowserWidget-3.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/Products.ATReferenceBrowserWidget-3.0.zip"; - md5 = "157bdd32155c8353450c17c649aad042"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_deprecation archetypes_referencebrowserwidget setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browserresource = buildPythonPackage rec { - name = "zope.browserresource-3.10.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; - md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface zope_location zope_traversing zope_contenttype zope_configuration zope_publisher setuptools zope_schema zope_i18n zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_caching = buildPythonPackage rec { - name = "plone.caching-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.caching/plone.caching-1.0.zip"; - md5 = "2c2e3b27d13b9101c92dfed222fde36c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid five_globalrequest z3c_caching zope_interface zope2 zope_component setuptools plone_transformchain zope_schema plone_registry ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_locales = buildPythonPackage rec { - name = "zope.app.locales-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.locales/zope.app.locales-3.6.2.tar.gz"; - md5 = "bd2b4c6040e768f33004b1210d3207fa"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_i18nmessageid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_placelesstranslationservice = buildPythonPackage rec { - name = "Products.PlacelessTranslationService-2.0.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.3.zip"; - md5 = "a94635eb712563c5a002520713f5d6dc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zope_publisher zope_deferredimport zope_deprecation zope_interface python_gettext datetime zope_component zodb3 setuptools zope_annotation zope_i18n zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_z3cform = buildPythonPackage rec { - name = "plone.z3cform-0.8.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; - md5 = "bdb23dd162544964d2f8f8f5f002e874"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_component plone_batching zope_i18n z3c_form zope_browserpage setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_lifecycleevent = buildPythonPackage rec { - name = "zope.lifecycleevent-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/zope.lifecycleevent-3.6.2.tar.gz"; - md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_form = buildPythonPackage rec { - name = "zope.app.form-4.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.form/zope.app.form-4.0.2.tar.gz"; - md5 = "3d2b164d9d37a71490a024aaeb412e91"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_browserpage zope_schema transaction zope_datetime zope_browsermenu zope_interface zope_exceptions zope_security zope_configuration zope_publisher zope_component zope_formlib zope_browser setuptools zope_proxy zope_i18n ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_tinymce = buildPythonPackage rec { - name = "Products.TinyMCE-1.3.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip"; - md5 = "e697dfdd72f3b6238e26908bb455d39a"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - collective_z3cform_datetimewidget = buildPythonPackage rec { - name = "collective.z3cform.datetimewidget-1.2.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip"; - md5 = "439117021c93f26c677510504ee245d3"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ z3c_form zope_deprecation zope_i18n setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_form = buildPythonPackage rec { - name = "z3c.form-3.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; - md5 = "f9fa3cf56c83722425b3b1be4467ce46"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_dcworkflow = buildPythonPackage rec { - name = "Products.DCWorkflow-2.2.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz"; - md5 = "c90a16c4f3611015592ba8173a5f1863"; - }; - buildInputs = [ eggtestinfo ]; - propagatedBuildInputs = [ zope2 products_cmfcore setuptools products_genericsetup eggtestinfo ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - mechanize = buildPythonPackage rec { - name = "mechanize-0.2.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.zip"; - md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_iterate = buildPythonPackage rec { - name = "plone.app.iterate-2.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip"; - md5 = "8bd270d8a3c9509e524a06e092a9b4c4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_viewlet zope_i18nmessageid zodb3 products_archetypes zope_interface plone_memoize products_cmfeditions datetime zope_component products_dcworkflow products_statusmessages zope_event setuptools products_cmfplacefulworkflow zope_schema zope_lifecycleevent zope_annotation zope2 plone_locking products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - accesscontrol = buildPythonPackage rec { - name = "AccessControl-3.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip"; - md5 = "a8ce472482adabf9ec969f3971a39a19"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_security zope_testing extensionclass zope_publisher restrictedpython zope_interface zope_deferredimport zope_schema zope_configuration datetime record transaction acquisition zodb3 zope_component zexceptions persistence ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_testing = buildPythonPackage rec { - name = "zope.testing-3.9.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-3.9.7.tar.gz"; - md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_exceptions setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_externaleditor = buildPythonPackage rec { - name = "Products.ExternalEditor-1.1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_app_publication = buildPythonPackage rec { - name = "zope.app.publication-3.12.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.app.publication/zope.app.publication-3.12.0.zip"; - md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_authentication zope_publisher zope_interface zope_location zope_traversing zope_component zope_error zodb3 setuptools zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_filerepresentation = buildPythonPackage rec { - name = "zope.filerepresentation-3.6.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/zope.filerepresentation-3.6.1.tar.gz"; - md5 = "4a7a434094f4bfa99a7f22e75966c359"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_schema zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - six = buildPythonPackage rec { - name = "six-1.2.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz"; - md5 = "2a5d1afc79912832ac78fd38e3d75d7e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_dexterity = buildPythonPackage rec { - name = "plone.app.dexterity-2.0.8"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; - md5 = "2e0ec48224a3a8afd51656c22d574359"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_app_z3cform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content z3c_form plone_app_textfield plone_rfc822 plone_formwidget_namedfile plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_exceptions = buildPythonPackage rec { - name = "zope.exceptions-3.6.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-3.6.2.tar.gz"; - md5 = "d7234d99d728abe3d9275346e8d24fd9"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_layout = buildPythonPackage rec { - name = "plone.app.layout-2.3.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; - md5 = "960665807ad60eb3e12c52a0cf092ceb"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_contenttype = buildPythonPackage rec { - name = "zope.contenttype-3.5.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contenttype/zope.contenttype-3.5.5.zip"; - md5 = "c6ac80e6887de4108a383f349fbdf332"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - five_customerize = buildPythonPackage rec { - name = "five.customerize-1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/f/five.customerize/five.customerize-1.1.zip"; - md5 = "80772212a2d55150a6c070fc4638b0c7"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing transaction zope_publisher zope_site zope_pagetemplate zope_interface zope_traversing zope_dottedname plone_portlets zope_component zope_componentvocabulary setuptools zope_schema zope_lifecycleevent zope2 zope_viewlet acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_subrequest = buildPythonPackage rec { - name = "plone.subrequest-1.6.7"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip"; - md5 = "cc12f68a22565415b10dbeef0020baa4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_globalrequest five_globalrequest setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_site = buildPythonPackage rec { - name = "zope.site-3.9.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.site/zope.site-3.9.2.tar.gz"; - md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_location zope_interface zope_security zope_container zope_event setuptools zope_lifecycleevent zope_annotation zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - wicked = buildPythonPackage rec { - name = "wicked-1.1.10"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; - md5 = "f65611f11d547d7dc8e623bf87d3929d"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_container zope_traversing setuptools zope_lifecycleevent ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_schemaeditor = buildPythonPackage rec { - name = "plone.schemaeditor-1.3.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip"; - md5 = "ab9cb4e929f305063dc8f33e9a33fd21"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope2 zope_publisher zope_container z3c_form zope_interface zope_component setuptools zope_schema zope_lifecycleevent plone_autoform plone_z3cform ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_uuid = buildPythonPackage rec { - name = "plone.app.uuid-1.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip"; - md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_indexer zope_interface zope_publisher plone_uuid setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - unittest2 = buildPythonPackage rec { - name = "unittest2-0.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.zip"; - md5 = "1527fb89e38343945af1166342d851ee"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - persistence = buildPythonPackage rec { - name = "Persistence-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; - md5 = "92693648ccdc59c8fc71f7f06b1d228c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ extensionclass zodb3 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zopeversioncontrol = buildPythonPackage rec { - name = "Products.ZopeVersionControl-1.1.3"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/Products.ZopeVersionControl-1.1.3.zip"; - md5 = "238239102f3ac798ee4f4c53343a561f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ transaction zope_interface datetime zodb3 setuptools zope2 acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_location = buildPythonPackage rec { - name = "zope.location-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-3.9.1.tar.gz"; - md5 = "1684a8f986099d15296f670c58e713d8"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_schema zope_component setuptools zope_proxy ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_browsermenu = buildPythonPackage rec { - name = "zope.browsermenu-3.9.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; - md5 = "a47c7b1e786661c912a1150bf8d1f83f"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_interface zope_traversing zope_component zope_security zope_configuration zope_pagetemplate setuptools zope_schema zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_workflow = buildPythonPackage rec { - name = "plone.app.workflow-2.1.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; - md5 = "b3589b4def82201adc196b3075b54213"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_locking = buildPythonPackage rec { - name = "plone.locking-2.0.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; - md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface datetime zope_component zodb3 setuptools zope_schema zope_annotation zope_viewlet products_cmfcore acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_dottedname = buildPythonPackage rec { - name = "zope.dottedname-3.4.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.dottedname/zope.dottedname-3.4.6.tar.gz"; - md5 = "62d639f75b31d2d864fe5982cb23959c"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_cachedescriptors = buildPythonPackage rec { - name = "zope.cachedescriptors-3.5.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_collection = buildPythonPackage rec { - name = "plone.app.collection-1.0.10"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip"; - md5 = "1042ac059be2311d4758452a3fa4f82e"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_lockfile = buildPythonPackage rec { - name = "zc.lockfile-1.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; - md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - lxml = buildPythonPackage rec { - name = "lxml-2.3.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/l/lxml/lxml-2.3.6.tar.gz"; - md5 = "d5d886088e78b1bdbfd66d328fc2d0bc"; - }; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_contentrules = buildPythonPackage rec { - name = "plone.contentrules-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip"; - md5 = "e743dca41b07b7ac1c2a65b652679201"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_sendmail = buildPythonPackage rec { - name = "zope.sendmail-3.7.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.sendmail/zope.sendmail-3.7.5.tar.gz"; - md5 = "8a513ecf2b41cad849f6607bf16d6818"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_i18nmessageid transaction zope_interface zope_configuration setuptools zope_schema zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_formlib = buildPythonPackage rec { - name = "zope.formlib-4.0.6"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.formlib/zope.formlib-4.0.6.zip"; - md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_schema zope_datetime zope_interface zope_traversing zope_security zope_component pytz zope_event zope_browser setuptools zope_lifecycleevent zope_i18n zope_browserpage ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_caching = buildPythonPackage rec { - name = "plone.app.caching-1.1.4"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip"; - md5 = "bbb46c9dc36f0ac6cc833ee152203a81"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_cmfplone = buildPythonPackage rec { - name = "Products.CMFPlone-4.3.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip"; - md5 = "2fee0c66e0d9bdf28b513bcd6d95a602"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - transaction = buildPythonPackage rec { - name = "transaction-1.1.1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/transaction/transaction-1.1.1.tar.gz"; - md5 = "30b062baa34fe1521ad979fb088c8c55"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_controlpanel = buildPythonPackage rec { - name = "plone.app.controlpanel-2.3.6"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip"; - md5 = "ca5e0e0c8497d9860603e39e0eeba9b8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_redirector = buildPythonPackage rec { - name = "plone.app.redirector-1.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip"; - md5 = "bc0508844f276ac7a7b9556d37281cc8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_memoize setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_component = buildPythonPackage rec { - name = "zope.component-3.9.5"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-3.9.5.tar.gz"; - md5 = "22780b445b1b479701c05978055d1c82"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_event setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zope_broken = buildPythonPackage rec { - name = "zope.broken-3.6.0"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.broken/zope.broken-3.6.0.zip"; - md5 = "eff24d7918099a3e899ee63a9c31bee6"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_interface setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_namedfile = buildPythonPackage rec { - name = "plone.namedfile-2.0.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip"; - md5 = "f6168ab9e38f3a171dc35483527b3e01"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_openid = buildPythonPackage rec { - name = "plone.app.openid-2.0.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.openid/plone.app.openid-2.0.2.tar.gz"; - md5 = "ae0748f91cab0612a498926d405d8edd"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_plonepas zope_i18nmessageid zope2 setuptools plone_openid zope_interface plone_portlets zope_component plone_app_portlets products_cmfcore products_pluggableauthservice ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - z3c_caching = buildPythonPackage rec { - name = "z3c.caching-2.0a1"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.caching/z3c.caching-2.0a1.tar.gz"; - md5 = "17f250b5084c2324a7d15c6810ee628e"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_interface zope_component zope_event setuptools zope_lifecycleevent zope_browser ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - plone_app_textfield = buildPythonPackage rec { - name = "plone.app.textfield-1.2.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip"; - md5 = "f832887a40826d6f68c48b48f071fb9c"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_schema zope_interface zodb3 setuptools zope_component ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - tempstorage = buildPythonPackage rec { - name = "tempstorage-2.12.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; - md5 = "7a2b76b39839e229249b1bb175604480"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_testing zodb3 setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - zc_recipe_egg = buildPythonPackage rec { - name = "zc.recipe.egg-1.3.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/zc.recipe.egg-1.3.2.tar.gz"; - md5 = "1cb6af73f527490dde461d3614a36475"; - }; - buildInputs = [ ]; - propagatedBuildInputs = [ zc_buildout setuptools ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - products_zctextindex = buildPythonPackage rec { - name = "Products.ZCTextIndex-2.13.4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip"; - md5 = "8bbfa5fcd3609246990a9314d6f826b4"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - - extensionclass = buildPythonPackage rec { - name = "ExtensionClass-2.13.2"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; - }; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - doCheck = false; - installCommand = '' - easy_install --always-unzip --no-deps --prefix="$out" . - ''; - - meta = { - description = "UNKNOWN"; - homepage = "UNKNOWN"; - maintainers = [ - stdenv.lib.maintainers.garbas - stdenv.lib.maintainers.iElectric - ]; - }; - }; - -}; in plone43Packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afff21ee292..2a391e3c363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5801,21 +5801,6 @@ let python = pypy; }); - plone41Packages = import ../development/web/plone/4.1.nix { - inherit pkgs; - pythonPackages = python26Packages; - }; - - plone42Packages = import ../development/web/plone/4.2.nix { - inherit pkgs; - pythonPackages = python26Packages; - }; - - plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix { - inherit pkgs; - pythonPackages = python27Packages; - }); - foursuite = callPackage ../development/python-modules/4suite { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; From 7fdf26231fadc52ed642eead7e30eb83dbfee820 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 10 Aug 2013 03:09:04 +0200 Subject: [PATCH 222/332] pypi2nix packaged, Distutils2 added to generated python packages --- pkgs/top-level/python-packages-generated.nix | 711 ++++++++++--------- pkgs/top-level/python-packages.json | 3 + pkgs/top-level/python-packages.nix | 19 + 3 files changed, 388 insertions(+), 345 deletions(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 71da839ada9..c5212fc16bc 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -196,23 +196,23 @@ in }; - "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { - name = "Products.ExternalMethod-2.13.0"; + "plone.app.workflow-2.1.5" = self.buildPythonPackage { + name = "plone.app.workflow-2.1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; + md5 = "b3589b4def82201adc196b3075b54213"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - This package provides support for external Python methods within a Zope 2 environment. + workflow and security settings for Plone ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.workflow"; + license = "GPL version 2"; }; }; @@ -511,23 +511,23 @@ in }; - "plone.app.form-2.2.2" = self.buildPythonPackage { - name = "plone.app.form-2.2.2"; + "Products.CMFEditions-2.2.8" = self.buildPythonPackage { + name = "Products.CMFEditions-2.2.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip"; - md5 = "6101e6a5bd4de6cc8cdef09ced2743eb"; + url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; + md5 = "1806f2e17e2527fad9364670b343bd11"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - zope.formlib integration for Plone + Versioning for Plone ''; - homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + license = "GPL"; }; }; @@ -742,23 +742,23 @@ in }; - "Products.PasswordResetTool-2.0.14" = self.buildPythonPackage { - name = "Products.PasswordResetTool-2.0.14"; + "zope.component-4.1.0" = self.buildPythonPackage { + name = "zope.component-4.1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; - md5 = "4267a5fef471d0ebe5ca848e86630702"; + url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; + md5 = "8e185893699f9fa577bd9ada0a5302fa"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Password reset tool for Plone + Zope Component Architecture ''; - homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/zope.component"; + license = "ZPL 2.1"; }; }; @@ -910,23 +910,23 @@ in }; - "plone.indexer-1.0.2" = self.buildPythonPackage { - name = "plone.indexer-1.0.2"; + "zope.schema-4.3.2" = self.buildPythonPackage { + name = "zope.schema-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; - md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; + url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; + md5 = "b63df4a3035f29113f8130c8ae28bb13"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Hooks to facilitate managing custom index values in Zope 2/CMF applications + zope.interface extension for defining data schemas ''; - homepage = "http://pypi.python.org/pypi/plone.indexer"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/zope.schema"; + license = "ZPL 2.1"; }; }; @@ -973,23 +973,23 @@ in }; - "Products.CMFEditions-2.2.8" = self.buildPythonPackage { - name = "Products.CMFEditions-2.2.8"; + "plone.app.form-2.2.2" = self.buildPythonPackage { + name = "plone.app.form-2.2.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip"; - md5 = "1806f2e17e2527fad9364670b343bd11"; + url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.2.zip"; + md5 = "6101e6a5bd4de6cc8cdef09ced2743eb"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.3" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.10" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Versioning for Plone + zope.formlib integration for Plone ''; - homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/plone.app.form"; + license = "GPL version 2"; }; }; @@ -1036,44 +1036,44 @@ in }; - "zope.component-4.1.0" = self.buildPythonPackage { - name = "zope.component-4.1.0"; + "Products.PasswordResetTool-2.0.14" = self.buildPythonPackage { + name = "Products.PasswordResetTool-2.0.14"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip"; - md5 = "8e185893699f9fa577bd9ada0a5302fa"; + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; + md5 = "4267a5fef471d0ebe5ca848e86630702"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - - meta = { - description = '' - Zope Component Architecture - ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; - }; - }; - - - "zope.browserresource-3.10.3" = self.buildPythonPackage { - name = "zope.browserresource-3.10.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; - md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Browser resources implementation for Zope. + Password reset tool for Plone ''; - homepage = "http://pypi.python.org/pypi/zope.browserresource/"; - license = "UNKNOWN"; + homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool"; + license = "GPL"; + }; + }; + + + "WSGIProxy2-0.2" = self.buildPythonPackage { + name = "WSGIProxy2-0.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.2.tar.gz"; + md5 = "d8c764aa68173e0d4851874ed6021211"; + }; + doCheck = true; + buildInputs = [ ]; + propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/gawel/WSGIProxy2/"; + license = "MIT"; }; }; @@ -1120,23 +1120,23 @@ in }; - "tempstorage-2.12.2" = self.buildPythonPackage { - name = "tempstorage-2.12.2"; + "plone.stringinterp-1.0.10" = self.buildPythonPackage { + name = "plone.stringinterp-1.0.10"; src = fetchurl { - url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; - md5 = "7a2b76b39839e229249b1bb175604480"; + url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; + md5 = "595074e94944ad6860e2105a020a3b9a"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - A RAM-based storage for ZODB + Adaptable string interpolation ''; - homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.stringinterp"; + license = "GPL version 2"; }; }; @@ -1225,6 +1225,27 @@ in }; + "plone.resourceeditor-1.0" = self.buildPythonPackage { + name = "plone.resourceeditor-1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; + md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/plone/plone.resourceeditor"; + license = "GPL"; + }; + }; + + "z3c.form-3.0" = self.buildPythonPackage { name = "z3c.form-3.0"; src = fetchurl { @@ -1543,23 +1564,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.dexterity-2.0.8" = self.buildPythonPackage { - name = "plone.app.dexterity-2.0.8"; + "zope.location-4.0.2" = self.buildPythonPackage { + name = "zope.location-4.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; - md5 = "2e0ec48224a3a8afd51656c22d574359"; + url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; + md5 = "44d865b2c0b1e1cc93898c7df938d353"; }; - doCheck = false; + doCheck = true; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. + Zope Location ''; - homepage = "http://plone.org/products/dexterity"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/zope.location/"; + license = "ZPL 2.1"; }; }; @@ -1711,23 +1732,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "python-dateutil-1.5" = self.buildPythonPackage { - name = "python-dateutil-1.5"; + "Products.MimetypesRegistry-2.0.4" = self.buildPythonPackage { + name = "Products.MimetypesRegistry-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; - md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; + url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; + md5 = "898166bb2aaececc8238ad4ee4826793"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Extensions to the standard python 2.3+ datetime module + MIME type handling for Zope ''; - homepage = "http://labix.org/python-dateutil"; - license = "PSF License"; + homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; + license = "UNKNOWN"; }; }; @@ -1774,22 +1795,43 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.intelligenttext-2.0.2" = self.buildPythonPackage { - name = "plone.intelligenttext-2.0.2"; + "Distutils2-1.0a4" = self.buildPythonPackage { + name = "Distutils2-1.0a4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; - md5 = "51688fa0815b49e00334e3ef948328ba"; + url = "https://pypi.python.org/packages/source/D/Distutils2/Distutils2-1.0a4.tar.gz"; + md5 = "52bc9dffb394970c27e02853ae3a3241"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Python Packaging Library + ''; + homepage = "http://wiki.python.org/moin/Distutils2"; + license = "Python license"; + }; + }; + + + "plone.app.upgrade-1.3.3" = self.buildPythonPackage { + name = "plone.app.upgrade-1.3.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; + md5 = "1c45e809fba27bec11e8a40f686f0f5b"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Provides transforms from text/x-web-intelligent to text/html and vice versa. + Upgrade machinery for Plone. ''; - homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; + homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; license = "GPL version 2"; }; }; @@ -1837,44 +1879,44 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.layout-2.3.5" = self.buildPythonPackage { - name = "plone.app.layout-2.3.5"; + "five.globalrequest-1.0" = self.buildPythonPackage { + name = "five.globalrequest-1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; - md5 = "960665807ad60eb3e12c52a0cf092ceb"; + url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; + md5 = "87f8996bd21d4aa156aa26e7d21b8744"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Layout mechanisms for Plone + Zope 2 integration for zope.globalrequest ''; - homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/five.globalrequest"; + license = "ZPL"; }; }; - "zope.schema-4.3.2" = self.buildPythonPackage { - name = "zope.schema-4.3.2"; + "plone.indexer-1.0.2" = self.buildPythonPackage { + name = "plone.indexer-1.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip"; - md5 = "b63df4a3035f29113f8130c8ae28bb13"; + url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - zope.interface extension for defining data schemas + Hooks to facilitate managing custom index values in Zope 2/CMF applications ''; - homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.indexer"; + license = "BSD"; }; }; @@ -2005,23 +2047,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "mechanize-0.2.5" = self.buildPythonPackage { - name = "mechanize-0.2.5"; + "Products.MIMETools-2.13.0" = self.buildPythonPackage { + name = "Products.MIMETools-2.13.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; - md5 = "32657f139fc2fb75bcf193b63b8c60b2"; + url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; + md5 = "ad5372fc1190599a19493db0864448ec"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Stateful programmatic web browsing. + MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; - homepage = "http://wwwsearch.sourceforge.net/mechanize/"; - license = "BSD"; + homepage = "http://pypi.python.org/pypi/Products.MIMETools"; + license = "ZPL 2.1"; }; }; @@ -2068,23 +2110,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.formwidget.namedfile-1.0.6" = self.buildPythonPackage { - name = "plone.formwidget.namedfile-1.0.6"; + "ExtensionClass-2.13.2" = self.buildPythonPackage { + name = "ExtensionClass-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; - md5 = "afd20f030906a72fca7548876bdcbb48"; + url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Image widget for z3c.form and Plone + Metaclass for subclassable extension types ''; - homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/ExtensionClass"; + license = "ZPL 2.1"; }; }; @@ -2572,6 +2614,27 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.app.jquerytools-1.5.5" = self.buildPythonPackage { + name = "plone.app.jquerytools-1.5.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip"; + md5 = "7a4957a3a8482e4963e49e2d02772e33"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + jQuery Tools integration for Plone plus overlay and AJAX form helpers. + ''; + homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; + license = "GPL version 2"; + }; + }; + + "zope.component__zcml-3.9.5" = self.buildPythonPackage { name = "zope.component__zcml-3.9.5"; src = fetchurl { @@ -2656,23 +2719,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "WSGIProxy2-0.2" = self.buildPythonPackage { - name = "WSGIProxy2-0.2"; + "zope.browserresource-3.10.3" = self.buildPythonPackage { + name = "zope.browserresource-3.10.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.2.tar.gz"; - md5 = "d8c764aa68173e0d4851874ed6021211"; + url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-3.10.3.zip"; + md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; }; - doCheck = true; - buildInputs = [ ]; - propagatedBuildInputs = [ self."six-1.3.0" self."WebOb-1.2.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contenttype-3.5.5" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - UNKNOWN + Browser resources implementation for Zope. ''; - homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + homepage = "http://pypi.python.org/pypi/zope.browserresource/"; + license = "UNKNOWN"; }; }; @@ -2761,23 +2824,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.MimetypesRegistry-2.0.4" = self.buildPythonPackage { - name = "Products.MimetypesRegistry-2.0.4"; + "python-dateutil-1.5" = self.buildPythonPackage { + name = "python-dateutil-1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.4.zip"; - md5 = "898166bb2aaececc8238ad4ee4826793"; + url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz"; + md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.20" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - MIME type handling for Zope + Extensions to the standard python 2.3+ datetime module ''; - homepage = "http://pypi.python.org/pypi/Products.MimetypesRegistry"; - license = "UNKNOWN"; + homepage = "http://labix.org/python-dateutil"; + license = "PSF License"; }; }; @@ -2803,22 +2866,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.upgrade-1.3.3" = self.buildPythonPackage { - name = "plone.app.upgrade-1.3.3"; + "plone.intelligenttext-2.0.2" = self.buildPythonPackage { + name = "plone.intelligenttext-2.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; - md5 = "1c45e809fba27bec11e8a40f686f0f5b"; + url = "https://pypi.python.org/packages/source/p/plone.intelligenttext/plone.intelligenttext-2.0.2.zip"; + md5 = "51688fa0815b49e00334e3ef948328ba"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.4" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.1" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.4" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.MimetypesRegistry-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Upgrade machinery for Plone. + Provides transforms from text/x-web-intelligent to text/html and vice versa. ''; - homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; + homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; license = "GPL version 2"; }; }; @@ -2887,48 +2950,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.theming-1.1.1" = self.buildPythonPackage { - name = "plone.app.theming-1.1.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; - md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - - meta = { - description = '' - Integrates the Diazo theming engine with Plone - ''; - homepage = "http://pypi.python.org/pypi/plone.app.theming"; - license = "GPL"; - }; - }; - - - "ExtensionClass-2.13.2" = self.buildPythonPackage { - name = "ExtensionClass-2.13.2"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip"; - md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - - meta = { - description = '' - Metaclass for subclassable extension types - ''; - homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; - }; - }; - - "zope.globalrequest-1.0" = self.buildPythonPackage { name = "zope.globalrequest-1.0"; src = fetchurl { @@ -2992,23 +3013,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.MIMETools-2.13.0" = self.buildPythonPackage { - name = "Products.MIMETools-2.13.0"; + "plone.locking-2.0.4" = self.buildPythonPackage { + name = "plone.locking-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip"; - md5 = "ad5372fc1190599a19493db0864448ec"; + url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; + md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - MIMETools provides the <!--#mime--> tag for DocumentTemplate. + webdav locking support ''; - homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.locking"; + license = "GPL version 2"; }; }; @@ -3055,23 +3076,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.browsermenu-3.9.1" = self.buildPythonPackage { - name = "zope.browsermenu-3.9.1"; + "WebTest-2.0.7" = self.buildPythonPackage { + name = "WebTest-2.0.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; - md5 = "a47c7b1e786661c912a1150bf8d1f83f"; + url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.7.zip"; + md5 = "4ca4e944a7f5f08b5aebd3bf90699890"; }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + doCheck = true; + buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.2.1" self."six-1.3.0" self."waitress-0.8.5" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - Browser menu implementation for Zope. + Helper to test WSGI applications ''; - homepage = "http://pypi.python.org/pypi/zope.browsermenu/"; - license = "UNKNOWN"; + homepage = "http://webtest.pythonpaste.org/"; + license = "MIT"; }; }; @@ -3160,27 +3181,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { - name = "Products.CMFPlacefulWorkflow-1.5.9"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; - md5 = "9041e1f52eab5b348c0dfa85be438722"; - }; - doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; - installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; - - meta = { - description = '' - Workflow policies for CMF and Plone - ''; - homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; - license = "GPL"; - }; - }; - - "zope.filerepresentation-3.6.1" = self.buildPythonPackage { name = "zope.filerepresentation-3.6.1"; src = fetchurl { @@ -3433,23 +3433,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.workflow-2.1.5" = self.buildPythonPackage { - name = "plone.app.workflow-2.1.5"; + "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { + name = "Products.ExternalMethod-2.13.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; - md5 = "b3589b4def82201adc196b3075b54213"; + url = "https://pypi.python.org/packages/source/P/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; + md5 = "15ba953ef6cb632eb571977651252ea6"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.3" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Persistence-2.13.2" self.setuptools self."ZODB3-3.10.5" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - workflow and security settings for Plone + This package provides support for external Python methods within a Zope 2 environment. ''; - homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; + license = "ZPL 2.1"; }; }; @@ -3559,23 +3559,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.stringinterp-1.0.10" = self.buildPythonPackage { - name = "plone.stringinterp-1.0.10"; + "tempstorage-2.12.2" = self.buildPythonPackage { + name = "tempstorage-2.12.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; - md5 = "595074e94944ad6860e2105a020a3b9a"; + url = "https://pypi.python.org/packages/source/t/tempstorage/tempstorage-2.12.2.zip"; + md5 = "7a2b76b39839e229249b1bb175604480"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ]; + propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Adaptable string interpolation + A RAM-based storage for ZODB ''; - homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/tempstorage"; + license = "ZPL 2.1"; }; }; @@ -3601,23 +3601,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PluginRegistry-1.3" = self.buildPythonPackage { - name = "Products.PluginRegistry-1.3"; + "Acquisition-2.13.8" = self.buildPythonPackage { + name = "Acquisition-2.13.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; - md5 = "5b166193ca1eb84dfb402051f779ebab"; + url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Configure application plugins based on interfaces + Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; - homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + homepage = "http://pypi.python.org/pypi/Acquisition"; + license = "ZPL 2.1"; }; }; @@ -3664,23 +3664,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.location-4.0.2" = self.buildPythonPackage { - name = "zope.location-4.0.2"; + "plone.app.dexterity-2.0.8" = self.buildPythonPackage { + name = "plone.app.dexterity-2.0.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip"; - md5 = "44d865b2c0b1e1cc93898c7df938d353"; + url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; + md5 = "2e0ec48224a3a8afd51656c22d574359"; }; - doCheck = true; + doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.3" self."lxml-2.3.6" self."plone.app.content-2.1.2" self."plone.app.layout-2.3.5" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.3" self."plone.autoform-1.4" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.6" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.0.1" self."plone.schemaeditor-1.3.2" self."plone.supermodel-1.2.2" self."plone.z3cform-0.8.0" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self.setuptools self."z3c.form-3.0" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Location + Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular. ''; - homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + homepage = "http://plone.org/products/dexterity"; + license = "GPL"; }; }; @@ -3706,23 +3706,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "five.globalrequest-1.0" = self.buildPythonPackage { - name = "five.globalrequest-1.0"; + "plone.app.layout-2.3.5" = self.buildPythonPackage { + name = "plone.app.layout-2.3.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/f/five.globalrequest/five.globalrequest-1.0.tar.gz"; - md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; + md5 = "960665807ad60eb3e12c52a0cf092ceb"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.20" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.4" self."plone.app.viewletmanager-2.0.3" self."plone.i18n-2.0.8" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope 2 integration for zope.globalrequest + Layout mechanisms for Plone ''; - homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = "ZPL"; + homepage = "http://pypi.python.org/pypi/plone.app.layout"; + license = "GPL version 2"; }; }; @@ -3748,23 +3748,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.locking-2.0.4" = self.buildPythonPackage { - name = "plone.locking-2.0.4"; + "mechanize-0.2.5" = self.buildPythonPackage { + name = "mechanize-0.2.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.locking/plone.locking-2.0.4.zip"; - md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; + url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz"; + md5 = "32657f139fc2fb75bcf193b63b8c60b2"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.20" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - webdav locking support + Stateful programmatic web browsing. ''; - homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; + homepage = "http://wwwsearch.sourceforge.net/mechanize/"; + license = "BSD"; }; }; @@ -3916,23 +3916,44 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "WebTest-2.0.7" = self.buildPythonPackage { - name = "WebTest-2.0.7"; + "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { + name = "zope.cachedescriptors-3.5.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.7.zip"; - md5 = "4ca4e944a7f5f08b5aebd3bf90699890"; + url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; }; - doCheck = true; - buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.2.1" self."six-1.3.0" self."waitress-0.8.5" self."WebOb-1.2.3" ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Helper to test WSGI applications + Method and property caching decorators ''; - homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; + homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; + license = "ZPL 2.1"; + }; + }; + + + "zope.browsermenu-3.9.1" = self.buildPythonPackage { + name = "zope.browsermenu-3.9.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browsermenu/zope.browsermenu-3.9.1.zip"; + md5 = "a47c7b1e786661c912a1150bf8d1f83f"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + + meta = { + description = '' + Browser menu implementation for Zope. + ''; + homepage = "http://pypi.python.org/pypi/zope.browsermenu/"; + license = "UNKNOWN"; }; }; @@ -4105,23 +4126,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.cachedescriptors-3.5.1" = self.buildPythonPackage { - name = "zope.cachedescriptors-3.5.1"; + "plone.app.theming-1.1.1" = self.buildPythonPackage { + name = "plone.app.theming-1.1.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip"; - md5 = "263459a95238fd61d17e815d97ca49ce"; + url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; + md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self.setuptools ]; + propagatedBuildInputs = [ self."diazo-1.0.3" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.1" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Method and property caching decorators + Integrates the Diazo theming engine with Plone ''; - homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.theming"; + license = "GPL"; }; }; @@ -4378,22 +4399,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.resourceeditor-1.0" = self.buildPythonPackage { - name = "plone.resourceeditor-1.0"; + "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage { + name = "Products.CMFPlacefulWorkflow-1.5.9"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; - md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; + url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip"; + md5 = "9041e1f52eab5b348c0dfa85be438722"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.1" self."Products.GenericSetup-1.7.3" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - UNKNOWN + Workflow policies for CMF and Plone ''; - homepage = "https://github.com/plone/plone.resourceeditor"; + homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow"; license = "GPL"; }; }; @@ -4756,23 +4777,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.jquerytools-1.5.5" = self.buildPythonPackage { - name = "plone.app.jquerytools-1.5.5"; + "plone.formwidget.namedfile-1.0.6" = self.buildPythonPackage { + name = "plone.formwidget.namedfile-1.0.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.5.zip"; - md5 = "7a4957a3a8482e4963e49e2d02772e33"; + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; + md5 = "afd20f030906a72fca7548876bdcbb48"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - jQuery Tools integration for Plone plus overlay and AJAX form helpers. + Image widget for z3c.form and Plone ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile"; + license = "GPL"; }; }; @@ -5134,23 +5155,23 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Acquisition-2.13.8" = self.buildPythonPackage { - name = "Acquisition-2.13.8"; + "Products.PluginRegistry-1.3" = self.buildPythonPackage { + name = "Products.PluginRegistry-1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip"; - md5 = "8c33160c157b50649e2b2b3224622579"; + url = "https://pypi.python.org/packages/source/P/Products.PluginRegistry/Products.PluginRegistry-1.3.tar.gz"; + md5 = "5b166193ca1eb84dfb402051f779ebab"; }; doCheck = false; - buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. + Configure application plugins based on interfaces ''; - homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; }; }; diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index 245638cfe46..79bc08a839e 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -105,5 +105,8 @@ "propagatedBuildInputs": [ "eggtestinfo" ] } } + }, + { "name": "Distutils2" + "doCheck": false } ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f515d436cf6..921af9c7b0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -53,6 +53,25 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python setuptools; }; + pypi2nix = buildPythonPackage rec { + rev = "f0bed8037538de481fab19af0521cb771c148aff"; + name = "pypi2nix-1.0_${rev}"; + + src = fetchurl { + url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "14cabnln65v9s3y23dkmbp0zjhbgniyfwmrragwqv3wzi63bvhhk"; + }; + + propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; + doCheck = false; + + meta = { + homepage = https://github.com/garbas/pypi2nix; + description = ""; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; From 36622f59641ce27763d26af77d26f42840bbffa2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Aug 2013 14:04:46 +0200 Subject: [PATCH 223/332] nixUnstable: Update to 1.6pre3187_3fb7ae0 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index bab89a1145e..4d5eeca12c1 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.6pre3166_15e5ac8"; + name = "nix-1.6pre3187_3fb7ae0"; src = fetchurl { - url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz"; - sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558"; + url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz"; + sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f"; }; nativeBuildInputs = [ perl pkgconfig ]; From adefbee8152f7241e561ee4f23fea34a5eca78c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Aug 2013 14:05:18 +0200 Subject: [PATCH 224/332] Forks::Super: Disable checks --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d74d734d2c6..162a7b6eb37 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2947,6 +2947,7 @@ rec { url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz; sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141"; }; + doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; license = "perl"; From 898a33bef2b29aaa0f544cdc1c3438c930ee1e24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Aug 2013 14:20:26 +0200 Subject: [PATCH 225/332] zabbix: Update to 1.8.17 --- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 0189f3dd8fd..6ee4712ae65 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.15"; + version = "1.8.17"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f"; + sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2"; }; preConfigure = From 7fc87a865e052bf2e7a7af6e597181e7ce14c20f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Aug 2013 14:50:55 +0200 Subject: [PATCH 226/332] openssh: Update to 6.2p2 --- pkgs/tools/networking/openssh/default.nix | 10 +- .../openssh/fix-identity-warnings.patch | 251 ------------------ 2 files changed, 3 insertions(+), 258 deletions(-) delete mode 100644 pkgs/tools/networking/openssh/fix-identity-warnings.patch diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8542580e431..4296ba57f88 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.2p1"; + name = "openssh-6.2p2"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha1 = "8824708c617cc781b2bb29fa20bd905fd3d2a43d"; + sha1 = "c2b4909eba6f5ec6f9f75866c202db47f3b501ba"; }; prePatch = stdenv.lib.optionalString hpnSupport @@ -26,11 +26,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = - [ ./locale_archive.patch - # Upstream fix for gratuitous "no such identity" warnings. - ./fix-identity-warnings.patch - ]; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ]; diff --git a/pkgs/tools/networking/openssh/fix-identity-warnings.patch b/pkgs/tools/networking/openssh/fix-identity-warnings.patch deleted file mode 100644 index c341889b3a4..00000000000 --- a/pkgs/tools/networking/openssh/fix-identity-warnings.patch +++ /dev/null @@ -1,251 +0,0 @@ -https://bugzilla.mindrot.org/show_bug.cgi?id=2084 - -@@ -, +, @@ - - dtucker@cvs.openbsd.org 2013/02/17 23:16:57 - [readconf.c ssh.c readconf.h sshconnect2.c] - Keep track of which IndentityFile options were manually supplied and which - were default options, and don't warn if the latter are missing. - ok markus@ - - dtucker@cvs.openbsd.org 2013/02/22 04:45:09 - [ssh.c readconf.c readconf.h] - Don't complain if IdentityFiles specified in system-wide configs are - missing. ok djm, deraadt. -Index: readconf.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/readconf.c,v ---- a/readconf.c 2 Oct 2011 07:59:03 -0000 1.174 -+++ b/readconf.c 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */ -+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -326,6 +326,26 @@ clear_forwardings(Options *options) - options->tun_open = SSH_TUNMODE_NO; - } - -+void -+add_identity_file(Options *options, const char *dir, const char *filename, -+ int userprovided) -+{ -+ char *path; -+ -+ if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES) -+ fatal("Too many identity files specified (max %d)", -+ SSH_MAX_IDENTITY_FILES); -+ -+ if (dir == NULL) /* no dir, filename is absolute */ -+ path = xstrdup(filename); -+ else -+ (void)xasprintf(&path, "%.100s%.100s", dir, filename); -+ -+ options->identity_file_userprovided[options->num_identity_files] = -+ userprovided; -+ options->identity_files[options->num_identity_files++] = path; -+} -+ - /* - * Returns the number of the token pointed to by cp or oBadOption. - */ -@@ -353,7 +373,7 @@ parse_token(const char *cp, const char * - int - process_config_line(Options *options, const char *host, - char *line, const char *filename, int linenum, -- int *activep) -+ int *activep, int userconfig) - { - char *s, **charptr, *endofnumber, *keyword, *arg, *arg2; - char **cpptr, fwdarg[256]; -@@ -586,9 +606,7 @@ parse_yesnoask: - if (*intptr >= SSH_MAX_IDENTITY_FILES) - fatal("%.200s line %d: Too many identity files specified (max %d).", - filename, linenum, SSH_MAX_IDENTITY_FILES); -- charptr = &options->identity_files[*intptr]; -- *charptr = xstrdup(arg); -- *intptr = *intptr + 1; -+ add_identity_file(options, NULL, arg, userconfig); - } - break; - -@@ -1075,7 +1093,7 @@ parse_int: - - int - read_config_file(const char *filename, const char *host, Options *options, -- int checkperm) -+ int flags) - { - FILE *f; - char line[1024]; -@@ -1085,7 +1103,7 @@ read_config_file(const char *filename, c - if ((f = fopen(filename, "r")) == NULL) - return 0; - -- if (checkperm) { -+ if (flags & SSHCONF_CHECKPERM) { - struct stat sb; - - if (fstat(fileno(f), &sb) == -1) -@@ -1106,7 +1124,8 @@ read_config_file(const char *filename, c - while (fgets(line, sizeof(line), f)) { - /* Update line number counter. */ - linenum++; -- if (process_config_line(options, host, line, filename, linenum, &active) != 0) -+ if (process_config_line(options, host, line, filename, linenum, -+ &active, flags & SSHCONF_USERCONF) != 0) - bad_options++; - } - fclose(f); -@@ -1280,30 +1299,17 @@ fill_default_options(Options * options) - options->protocol = SSH_PROTO_2; - if (options->num_identity_files == 0) { - if (options->protocol & SSH_PROTO_1) { -- len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_IDENTITY, 0); - } - if (options->protocol & SSH_PROTO_2) { -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA); -- -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_RSA, 0); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_DSA, 0); - #ifdef OPENSSL_HAS_ECC -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_ECDSA, 0); - #endif - } - } -Index: readconf.h -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/readconf.h,v ---- a/readconf.h 2 Oct 2011 07:59:03 -0000 1.83 -+++ b/readconf.h 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */ -+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */ - - /* - * Author: Tatu Ylonen -@@ -96,6 +96,7 @@ typedef struct { - - int num_identity_files; /* Number of files for RSA/DSA identities. */ - char *identity_files[SSH_MAX_IDENTITY_FILES]; -+ int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; - Key *identity_keys[SSH_MAX_IDENTITY_FILES]; - - /* Local TCP/IP forward requests. */ -@@ -148,15 +149,20 @@ typedef struct { - #define REQUEST_TTY_YES 2 - #define REQUEST_TTY_FORCE 3 - -+#define SSHCONF_CHECKPERM 1 /* check permissions on config file */ -+#define SSHCONF_USERCONF 2 /* user provided config file not system */ -+ - void initialize_options(Options *); - void fill_default_options(Options *); - int read_config_file(const char *, const char *, Options *, int); - int parse_forward(Forward *, const char *, int, int); - - int --process_config_line(Options *, const char *, char *, const char *, int, int *); -+process_config_line(Options *, const char *, char *, const char *, int, int *, -+ int); - - void add_local_forward(Options *, const Forward *); - void add_remote_forward(Options *, const Forward *); -+void add_identity_file(Options *, const char *, const char *, int); - - #endif /* READCONF_H */ -Index: ssh.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/ssh.c,v ---- a/ssh.c 6 Jul 2012 03:45:01 -0000 1.366 -+++ b/ssh.c 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */ -+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */ - /* - * Author: Tatu Ylonen - * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland -@@ -405,12 +405,7 @@ main(int ac, char **av) - strerror(errno)); - break; - } -- if (options.num_identity_files >= -- SSH_MAX_IDENTITY_FILES) -- fatal("Too many identity files specified " -- "(max %d)", SSH_MAX_IDENTITY_FILES); -- options.identity_files[options.num_identity_files++] = -- xstrdup(optarg); -+ add_identity_file(&options, NULL, optarg, 1); - break; - case 'I': - #ifdef ENABLE_PKCS11 -@@ -584,7 +579,8 @@ main(int ac, char **av) - dummy = 1; - line = xstrdup(optarg); - if (process_config_line(&options, host ? host : "", -- line, "command-line", 0, &dummy) != 0) -+ line, "command-line", 0, &dummy, SSHCONF_USERCONF) -+ != 0) - exit(255); - xfree(line); - break; -@@ -678,14 +674,15 @@ main(int ac, char **av) - * file if the user specifies a config file on the command line. - */ - if (config != NULL) { -- if (!read_config_file(config, host, &options, 0)) -+ if (!read_config_file(config, host, &options, SSHCONF_USERCONF)) - fatal("Can't open user config file %.100s: " - "%.100s", config, strerror(errno)); - } else { - r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, - _PATH_SSH_USER_CONFFILE); - if (r > 0 && (size_t)r < sizeof(buf)) -- (void)read_config_file(buf, host, &options, 1); -+ (void)read_config_file(buf, host, &options, -+ SSHCONF_CHECKPERM|SSHCONF_USERCONF); - - /* Read systemwide configuration file after user config. */ - (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, -Index: sshconnect2.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/sshconnect2.c,v ---- a/sshconnect2.c 20 Mar 2013 01:55:15 -0000 1.184 -+++ b/sshconnect2.c 5 Apr 2013 02:36:07 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ -+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ - /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. - * Copyright (c) 2008 Damien Miller. All rights reserved. -@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt) - id = xcalloc(1, sizeof(*id)); - id->key = key; - id->filename = xstrdup(options.identity_files[i]); -- id->userprovided = 1; -+ id->userprovided = options.identity_file_userprovided[i]; - TAILQ_INSERT_TAIL(&files, id, next); - } - /* Prefer PKCS11 keys that are explicitly listed */ From 5a0c7f30770abde96af19bba79342aae2a5b8b84 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 12 Aug 2013 14:57:00 +0200 Subject: [PATCH 227/332] Added express-form and updates nodejs package --- pkgs/top-level/node-packages-generated.nix | 98 ++++++++++++++++------ pkgs/top-level/node-packages.json | 1 + 2 files changed, 73 insertions(+), 26 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index bab2d932a12..b9714c27797 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -917,8 +917,8 @@ } { name = "connect"; - spec = "2.8.4"; - version = "2.8.4"; + spec = "2.8.5"; + version = "2.8.5"; topLevel = false; dependencies = [ { name = "qs"; spec = "0.6.5"; } @@ -926,22 +926,22 @@ { name = "cookie-signature"; spec = "1.0.1"; } { name = "buffer-crc32"; spec = "0.2.1"; } { name = "cookie"; spec = "0.1.0"; } - { name = "send"; spec = "0.1.3"; } + { name = "send"; spec = "0.1.4"; } { name = "bytes"; spec = "0.2.0"; } - { name = "fresh"; spec = "0.1.0"; } + { name = "fresh"; spec = "0.2.0"; } { name = "pause"; spec = "0.0.1"; } { name = "uid2"; spec = "0.0.2"; } { name = "debug"; spec = "*"; } { name = "methods"; spec = "0.0.1"; } ]; patchLatest = false; - sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656"; - tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz"; + sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz"; } { name = "connect"; spec = "~2"; - version = "2.8.4"; + version = "2.8.5"; topLevel = false; dependencies = [ { name = "qs"; spec = "0.6.5"; } @@ -949,17 +949,17 @@ { name = "cookie-signature"; spec = "1.0.1"; } { name = "buffer-crc32"; spec = "0.2.1"; } { name = "cookie"; spec = "0.1.0"; } - { name = "send"; spec = "0.1.3"; } + { name = "send"; spec = "0.1.4"; } { name = "bytes"; spec = "0.2.0"; } - { name = "fresh"; spec = "0.1.0"; } + { name = "fresh"; spec = "0.2.0"; } { name = "pause"; spec = "0.0.1"; } { name = "uid2"; spec = "0.0.2"; } { name = "debug"; spec = "*"; } { name = "methods"; spec = "0.0.1"; } ]; patchLatest = false; - sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656"; - tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz"; + sha1 = "20572077ba1f626fdb740b0ad7068f9130d701b8"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.8.5.tgz"; } { name = "connect-flash"; @@ -1505,24 +1505,24 @@ { name = "express"; spec = "*"; - version = "3.3.4"; + version = "3.3.5"; topLevel = true; dependencies = [ - { name = "connect"; spec = "2.8.4"; } + { name = "connect"; spec = "2.8.5"; } { name = "commander"; spec = "1.2.0"; } { name = "range-parser"; spec = "0.0.4"; } { name = "mkdirp"; spec = "0.3.5"; } { name = "cookie"; spec = "0.1.0"; } { name = "buffer-crc32"; spec = "0.2.1"; } - { name = "fresh"; spec = "0.1.0"; } + { name = "fresh"; spec = "0.2.0"; } { name = "methods"; spec = "0.0.1"; } - { name = "send"; spec = "0.1.3"; } + { name = "send"; spec = "0.1.4"; } { name = "cookie-signature"; spec = "1.0.1"; } { name = "debug"; spec = "*"; } ]; patchLatest = false; - sha1 = "9abf22017213a8f6f54a421ce22b8ec27b7def62"; - tarball = "http://registry.npmjs.org/express/-/express-3.3.4.tgz"; + sha1 = "3fd077660c9ccae4710fcfb326290a01d1e72566"; + tarball = "http://registry.npmjs.org/express/-/express-3.3.5.tgz"; } { name = "express"; @@ -1568,6 +1568,19 @@ sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7"; tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; } + { + name = "express-form"; + spec = "*"; + version = "0.8.1"; + topLevel = true; + dependencies = [ + { name = "validator"; spec = "0.4.x"; } + { name = "object-additions"; spec = ">= 0.5.0"; } + ]; + patchLatest = false; + sha1 = "14299158646a796fac584cb5980d63e587c02019"; + tarball = "http://registry.npmjs.org/express-form/-/express-form-0.8.1.tgz"; + } { name = "express-partials"; spec = "0.0.6"; @@ -1863,6 +1876,17 @@ sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; } + { + name = "fresh"; + spec = "0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; + tarball = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + } { name = "fs-walk"; spec = "*"; @@ -3941,6 +3965,17 @@ sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; } + { + name = "object-additions"; + spec = ">= 0.5.0"; + version = "0.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4"; + tarball = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz"; + } { name = "once"; spec = "1.1.1"; @@ -5070,17 +5105,17 @@ { name = "send"; spec = "*"; - version = "0.1.3"; + version = "0.1.4"; topLevel = false; dependencies = [ { name = "debug"; spec = "*"; } { name = "mime"; spec = "~1.2.9"; } - { name = "fresh"; spec = "0.1.0"; } + { name = "fresh"; spec = "0.2.0"; } { name = "range-parser"; spec = "0.0.4"; } ]; patchLatest = false; - sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3"; - tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + tarball = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; } { name = "send"; @@ -5099,18 +5134,18 @@ } { name = "send"; - spec = "0.1.3"; - version = "0.1.3"; + spec = "0.1.4"; + version = "0.1.4"; topLevel = false; dependencies = [ { name = "debug"; spec = "*"; } { name = "mime"; spec = "~1.2.9"; } - { name = "fresh"; spec = "0.1.0"; } + { name = "fresh"; spec = "0.2.0"; } { name = "range-parser"; spec = "0.0.4"; } ]; patchLatest = false; - sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3"; - tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + tarball = "http://registry.npmjs.org/send/-/send-0.1.4.tgz"; } { name = "sequence"; @@ -5920,6 +5955,17 @@ sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea"; tarball = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz"; } + { + name = "validator"; + spec = "0.4.x"; + version = "0.4.28"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; + tarball = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; + } { name = "vasync"; spec = "1.3.3"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 6cab338ae14..2d85d28706b 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -6,6 +6,7 @@ , "underscore" , "extend" , "express" +, "express-form" , "s3http" , "aws-sdk" , "nijs" From 287c9ba6d4dbcddbdd3b3ac5b324e5d698407879 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Aug 2013 14:57:27 +0200 Subject: [PATCH 228/332] thunderbird: Update to 17.0.8 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 7d537d3085d..c4a2eed899b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0.7"; in +let version = "17.0.8"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "d6dca3e1cc4293f2e15d6b35056bd8dc319014ee"; + sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812"; }; enableParallelBuilding = false; From e502b3867b435f0c64cb41ba4d254e1141270031 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 12 Aug 2013 15:20:49 +0200 Subject: [PATCH 229/332] express-form needs express, but it does not get extracted by npm2nix. Fixing it manually --- pkgs/top-level/node-packages-generated.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b9714c27797..8b2ff2295e0 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1576,6 +1576,7 @@ dependencies = [ { name = "validator"; spec = "0.4.x"; } { name = "object-additions"; spec = ">= 0.5.0"; } + { name = "express"; spec = "*"; } ]; patchLatest = false; sha1 = "14299158646a796fac584cb5980d63e587c02019"; From 01b483f692c7948ece8b3f4f1a72df31241193e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 12 Aug 2013 18:14:05 +0200 Subject: [PATCH 230/332] Revert "upower: 0.9.19 -> 0.9.21" This reverts commit d10d50132a1f456149d6585f044775cfc3b86752. xfce doesn't support this version api yet --- pkgs/os-specific/linux/upower/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 049bd75aded..8f244c3d645 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.21"; + name = "upower-0.9.19"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1qmjvfdsm6fnmwmdz0mb8nc8i5fnvzz98j37w0ia7482f058xhhk"; + sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; }; buildInputs = @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { [ "--enable-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdutildir=$(out)/lib/systemd/system-sleep" - "--with-udevrulesdir=$(out)/lib/udev/rules.d" ]; preConfigure = From 941055dae9bd78493003c91a3e8e00e6f3697b59 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 8 Aug 2013 18:33:39 +0200 Subject: [PATCH 231/332] curl: Add support for c-ares, asynchronous dns resolver --- pkgs/tools/networking/curl/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 73dcb44269c..40e2d970622 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,12 +3,14 @@ , sslSupport ? false, openssl ? null , scpSupport ? false, libssh2 ? null , gssSupport ? false, gss ? null +, c-aresSupport ? false, c-ares ? null , linkStatic ? false }: assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; +assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { name = "curl-7.30.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with stdenv.lib; optional zlibSupport zlib ++ optional gssSupport gss ++ + optional c-aresSupport c-ares ++ optional sslSupport openssl; preConfigure = '' @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ] + ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afff21ee292..5270cc4cf9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3777,7 +3777,9 @@ let bwidget = callPackage ../development/libraries/bwidget { }; - c-ares = callPackage ../development/libraries/c-ares { }; + c-ares = callPackage ../development/libraries/c-ares { + fetchurl = fetchurlBoot; + }; caelum = callPackage ../development/libraries/caelum { }; From 274f26620abde42edc7c89508a3ebb6aa9e2940f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 13 Aug 2013 01:26:30 +0200 Subject: [PATCH 232/332] json wasnt formatted correctly and updating pypi2nix script --- pkgs/top-level/python-packages.json | 2 +- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index 79bc08a839e..cc345d5c5bc 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -106,7 +106,7 @@ } } }, - { "name": "Distutils2" + { "name": "Distutils2", "doCheck": false } ] diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 921af9c7b0e..20033887f45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -54,13 +54,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; pypi2nix = buildPythonPackage rec { - rev = "f0bed8037538de481fab19af0521cb771c148aff"; + rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; name = "pypi2nix-1.0_${rev}"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "14cabnln65v9s3y23dkmbp0zjhbgniyfwmrragwqv3wzi63bvhhk"; + sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; }; propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; From bea6a51986338a1c0ba137d247580c29beca4c3a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 13 Aug 2013 01:33:51 +0200 Subject: [PATCH 233/332] updated beautifulsoup4 and waitress --- pkgs/top-level/python-packages-generated.nix | 86 ++++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index c5212fc16bc..6a8f080ccac 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -175,6 +175,27 @@ in }; + "waitress-0.8.6" = self.buildPythonPackage { + name = "waitress-0.8.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.6.tar.gz"; + md5 = "eb5a8968780cfbc6b75364683b09f5fe"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ self.setuptools ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Waitress WSGI server + ''; + homepage = "https://github.com/Pylons/waitress"; + license = "ZPL 2.1"; + }; + }; + + "coverage-3.6" = self.buildPythonPackage { name = "coverage-3.6"; src = fetchurl { @@ -1774,6 +1795,27 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "beautifulsoup4-4.3.0" = self.buildPythonPackage { + name = "beautifulsoup4-4.3.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.3.0.tar.gz"; + md5 = "8341b12402d942661bbfcc9f35420529"; + }; + doCheck = false; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + + meta = { + description = '' + Improvements to the lxml tree builder. + ''; + homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; + license = "MIT"; + }; + }; + + "nose-1.3.0" = self.buildPythonPackage { name = "nose-1.3.0"; src = fetchurl { @@ -1921,27 +1963,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "waitress-0.8.5" = self.buildPythonPackage { - name = "waitress-0.8.5"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.5.tar.gz"; - md5 = "7a3094d812c0dffb948d1334ef5fd56f"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self.setuptools ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - - meta = { - description = '' - Waitress WSGI server - ''; - homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; - }; - }; - - "plone.keyring-2.0.1" = self.buildPythonPackage { name = "plone.keyring-2.0.1"; src = fetchurl { @@ -2404,27 +2425,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "beautifulsoup4-4.2.1" = self.buildPythonPackage { - name = "beautifulsoup4-4.2.1"; - src = fetchurl { - url = "https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.2.1.tar.gz"; - md5 = "91ea70ce16a5f1f43e58f2ef05651679"; - }; - doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ ]; - installCommand = ''easy_install --always-unzip --prefix="$out" .''; - - meta = { - description = '' - UNKNOWN - ''; - homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = "MIT"; - }; - }; - - "unittest2-0.5.1" = self.buildPythonPackage { name = "unittest2-0.5.1"; src = fetchurl { @@ -3084,7 +3084,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = true; buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.2" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; - propagatedBuildInputs = [ self."beautifulsoup4-4.2.1" self."six-1.3.0" self."waitress-0.8.5" self."WebOb-1.2.3" ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.3.0" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { From 1adc88661d205390e47a9633732568a129e0fb14 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 13 Aug 2013 05:30:10 +0300 Subject: [PATCH 234/332] nvidia_x11: recover the lost patch --- pkgs/os-specific/linux/nvidia-x11/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9e750629b82..268cdac8505 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,8 @@ let versionNumber = "319.32"; kernel310patch = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia"; + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia&id=415c1daa9ccb1ec46c172b304f40929239d87af8"; + name = "nvidia-linux-3.10.patch"; sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb"; }; From 9ab74cd9778f8420a9b5cd44dea8e9d99c541eca Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 12 Aug 2013 22:14:42 +1000 Subject: [PATCH 235/332] Add expression for flpsed --- pkgs/applications/editors/flpsed/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/editors/flpsed/default.nix diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix new file mode 100644 index 00000000000..ca481f1081d --- /dev/null +++ b/pkgs/applications/editors/flpsed/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, fltk13, ghostscript}: + +stdenv.mkDerivation { + name = "flpsed-0.7.0"; + + src = fetchurl { + url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.0.tar.gz"; + sha1 = "7966fd3b6fb3aa2a376386533ed4421ebb66ad62"; + }; + + buildInputs = [ fltk13 ghostscript ]; + + meta = { + description = "A WYSIWYG PostScript annotator."; + homepage = "http://http://flpsed.org/flpsed.html"; + license = "GPLv3"; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5270cc4cf9c..114a5b13ccb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -828,6 +828,8 @@ let finger_bsd = callPackage ../tools/networking/bsd-finger { }; fio = callPackage ../tools/system/fio { }; + + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; From 1f2ecd08cc28d0d199d7f0304da9d8bbc2ff6239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 8 Aug 2013 10:26:49 +0200 Subject: [PATCH 236/332] Updating netatop to 0.3 (linux 3.10) --- pkgs/os-specific/linux/netatop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 4ca8235f3ae..9a34c503f6d 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernelDev, zlib }: stdenv.mkDerivation { - name = "netatop-${kernelDev.version}-0.2"; + name = "netatop-${kernelDev.version}-0.3"; src = fetchurl { - url = http://www.atoptool.nl/download/netatop-0.2.tar.gz; - sha256 = "0ya4qys2qpw080sbgixyx1kawdx1c3smnxwmqcchn0hg9hhndvc0"; + url = http://www.atoptool.nl/download/netatop-0.3.tar.gz; + sha256 = "0rk873nb1hgfnz040plmv6rm9mcm813n0clfjs53fsqbn8y1lhvv"; }; buildInputs = [ zlib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin $out/share/man/man{4,8} + ensureDir $out/bin $out/sbin $out/share/man/man{4,8} ensureDir $out/lib/modules/${kernelDev.modDirVersion}/extra ''; From 1974c55d9167e2eee63223f16039d4364e8e18a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Aug 2013 11:13:59 +0200 Subject: [PATCH 237/332] add python application substanced and it's dependencies --- .../interpreters/python/2.7/default.nix | 6 + pkgs/lib/licenses.nix | 6 + pkgs/tools/misc/file/python.patch | 11 - pkgs/top-level/python-packages.nix | 301 +++++++++++++++++- 4 files changed, 298 insertions(+), 26 deletions(-) delete mode 100644 pkgs/tools/misc/file/python.patch diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index f5a39a3b242..aea2d21fd8d 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -164,6 +164,12 @@ let deps = [ ncurses ]; }; + crypt = buildInternalPythonModule { + moduleName = "crypt"; + internalName = "crypt"; + deps = [ ]; + }; + gdbm = buildInternalPythonModule { moduleName = "gdbm"; internalName = "gdbm"; diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index fcf7420e425..8f6eb949226 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,6 +4,12 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ + artistic2 = { + shortName = "Artistic 2.0"; + fullName = "Artistic 2.0"; + url = "http://opensource.org/licenses/artistic-license-2.0.php"; + } + agpl3 = { shortName = "AGPLv3"; fullName = "GNU Affero General Public License version 3 only"; diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch deleted file mode 100644 index 8ecbc9a81fd..00000000000 --- a/pkgs/tools/misc/file/python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- file-5.11/python/magic.py 2011-09-22 18:57:41.000000000 +0200 -+++ file-5.11/python/magic.py.1 2012-04-30 15:00:31.750213810 +0200 -@@ -13,7 +13,7 @@ - Loads the shared library through ctypes and returns a library - L{ctypes.CDLL} instance - """ -- return ctypes.cdll.LoadLibrary(find_library('magic')) -+ return ctypes.CDLL('libmagic.so') - - _libraries = {} - _libraries['magic'] = _init() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cfa7b94353..99aa8a66b7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -894,6 +894,102 @@ pythonPackages = modules // rec { propagatedBuildInputs = [ pythonPackages.coverage ]; }; + cryptacular = buildPythonPackage rec { + name = "cryptacular-1.4.1"; + + buildInputs = [ coverage nose ]; + propagatedBuildInputs = [ pbkdf2 modules.crypt ]; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz"; + md5 = "fe12232ac660185186dd8057d8ca7b0e"; + }; + + # TODO: tests fail: TypeError: object of type 'NoneType' has no len() + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + pbkdf2 = buildPythonPackage rec { + name = "pbkdf2-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz"; + md5 = "40cda566f61420490206597243dd869f"; + }; + + # ImportError: No module named test + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + bcrypt = buildPythonPackage rec { + name = "bcrypt-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz"; + md5 = "c5df008669d17dd6eeb5e2042d5e136f"; + }; + + buildInputs = [ cffi pycparser mock pytest py ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + cffi = buildPythonPackage rec { + name = "cffi-0.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; + md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; + }; + + buildInputs = [ pkgs.libffi pycparser ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + pycparser = buildPythonPackage rec { + name = "pycparser-2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pycparser/${name}.tar.gz"; + md5 = "d87aed98c8a9f386aa56d365fe4d515f"; + }; + + # ImportError: No module named test + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + pytest = buildPythonPackage rec { + name = "pytest-2.3.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz"; + md5 = "18f150e7be96b5fe3c388b0e817b8087"; + }; + + buildInputs = [ py ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + cssselect = buildPythonPackage rec { name = "cssselect-0.7.1"; src = fetchurl { @@ -1229,11 +1325,11 @@ pythonPackages = modules // rec { pyramid = buildPythonPackage rec { - name = "pyramid-1.3.4"; + name = "pyramid-1.4.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "967a04fcb2143b31b279c3013a778a2b"; + md5 = "28fabf42cf585ecec7a57b5acc1174e3"; }; buildInputs = [ @@ -1341,6 +1437,176 @@ pythonPackages = modules // rec { }; + raven = buildPythonPackage rec { + name = "raven-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz"; + md5 = "6a9264133bf646149ffb9118d81445be"; + }; + + # way too many dependencies to run tests + # see https://github.com/getsentry/raven-python/blob/master/setup.py + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + hypatia = buildPythonPackage rec { + name = "hypatia-0.1a6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; + md5 = "3a67683c578754cd8f23317db6d28ffd"; + }; + + buildInputs = [ zope_interface zodb3 ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + zope_copy = buildPythonPackage rec { + name = "zope.copy-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip"; + md5 = "36aa2c96dec4cfeea57f54da2b733eb9"; + }; + + buildInputs = [ pkgs.unzip zope_interface zope_location zope_schema ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + statsd = buildPythonPackage rec { + name = "statsd-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/statsd/${name}.tar.gz"; + md5 = "476ef5b9004f6e2cb25c7da440bb53d0"; + }; + + buildInputs = [ ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + pyramid_zodbconn = buildPythonPackage rec { + name = "pyramid_zodbconn-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; + md5 = "22e88cc82cafbbe00274e7378434e5fe"; + }; + + buildInputs = [ pyramid mock ]; + propagatedBuildInputs = [ zodb3 zodburi ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + pyramid_mailer = buildPythonPackage rec { + name = "pyramid_mailer-0.13"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz"; + md5 = "43800c7c894097a23140da58e3638c93"; + }; + + buildInputs = [ pyramid transaction ]; + propagatedBuildInputs = [ repoze_sendmail ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + repoze_sendmail = buildPythonPackage rec { + name = "repoze.sendmail-4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz"; + md5 = "81d15f1f03cc67d6f56f2091c594ef57"; + }; + + buildInputs = [ transaction ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + zodburi = buildPythonPackage rec { + name = "zodburi-2.0b1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; + md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2"; + }; + + buildInputs = [ zodb3 mock ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + substanced = buildPythonPackage rec { + # no release yet + rev = "318a3d6a0324fd43585b8385f456d9d74c212eb8"; + name = "substanced-${rev}"; + + src = fetchgit { + inherit rev; + url = "https://github.com/Pylons/substanced.git"; + }; + + buildInputs = [ mock ]; + + propagatedBuildInputs = [ + pyramid + pytz + zodb3 + venusian + colander + deform + deform_bootstrap + magic + pyyaml + cryptacular + hypatia + zope_copy + zope_component + zope_deprecation + statsd + pyramid_zodbconn + pyramid_mailer + ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.4"; @@ -2454,25 +2720,30 @@ pythonPackages = modules // rec { }); - magic = pkgs.stdenv.mkDerivation rec { - name = "python-${pkgs.file.name}"; + magic = buildPythonPackage rec { + # TODO: wait for release 0.4.3+ + rev = "9f18d2c125b2f0240caec7096625834624cc4c20"; + name = "python-magic-${rev}"; - src = pkgs.file.src; + src = fetchgit { + inherit rev; + url = "https://github.com/ahupp/python-magic.git"; + }; - patches = [ ../tools/misc/file/python.patch ]; - buildInputs = [ python pkgs.file ]; + propagatedBuildInputs = [ pkgs.file ]; - configurePhase = "cd python"; - - buildPhase = "${python}/bin/${python.executable} setup.py build"; - - installPhase = '' - ${python}/bin/${python.executable} setup.py install --prefix=$out + patchPhase = '' + substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')" ''; + # TODO: tests are failing + #checkPhase = '' + # ${python}/bin/${python.executable} ./test.py + #''; + meta = { - description = "A Python wrapper around libmagic"; - homepage = http://www.darwinsys.com/file/; + description = "python-magic is a python interface to the libmagic file type identification library"; + homepage = https://github.com/ahupp/python-magic; }; }; From 388205631322f1f0bf0daa392376efb783c3f43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Aug 2013 12:22:15 +0200 Subject: [PATCH 238/332] typo --- pkgs/lib/licenses.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 8f6eb949226..b88945b9eec 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -8,7 +8,7 @@ shortName = "Artistic 2.0"; fullName = "Artistic 2.0"; url = "http://opensource.org/licenses/artistic-license-2.0.php"; - } + }; agpl3 = { shortName = "AGPLv3"; From ab1c1773e2f8b05701732bdddb0f6602c19e9592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Aug 2013 14:49:42 +0200 Subject: [PATCH 239/332] python: fix alot by having magic and python_magic packages --- pkgs/tools/misc/file/python.patch | 11 +++++++++++ pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/file/python.patch diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch new file mode 100644 index 00000000000..8ecbc9a81fd --- /dev/null +++ b/pkgs/tools/misc/file/python.patch @@ -0,0 +1,11 @@ +--- file-5.11/python/magic.py 2011-09-22 18:57:41.000000000 +0200 ++++ file-5.11/python/magic.py.1 2012-04-30 15:00:31.750213810 +0200 +@@ -13,7 +13,7 @@ + Loads the shared library through ctypes and returns a library + L{ctypes.CDLL} instance + """ +- return ctypes.cdll.LoadLibrary(find_library('magic')) ++ return ctypes.CDLL('libmagic.so') + + _libraries = {} + _libraries['magic'] = _init() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd75cf8439e..80107221022 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1612,7 +1612,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { colander deform deform_bootstrap - magic + python_magic pyyaml cryptacular hypatia @@ -2743,7 +2743,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { }); - magic = buildPythonPackage rec { + python_magic = buildPythonPackage rec { # TODO: wait for release 0.4.3+ rev = "9f18d2c125b2f0240caec7096625834624cc4c20"; name = "python-magic-${rev}"; @@ -2770,6 +2770,28 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; + magic = pkgs.stdenv.mkDerivation rec { + name = "python-${pkgs.file.name}"; + + src = pkgs.file.src; + + patches = [ ../tools/misc/file/python.patch ]; + buildInputs = [ python pkgs.file ]; + + configurePhase = "cd python"; + + buildPhase = "${python}/bin/${python.executable} setup.py build"; + + installPhase = '' + ${python}/bin/${python.executable} setup.py install --prefix=$out + ''; + + meta = { + description = "A Python wrapper around libmagic"; + homepage = http://www.darwinsys.com/file/; + }; + }; + m2crypto = buildPythonPackage rec { version = "0.21.1"; From 558067676dd91ef848dba55e224326709fb62035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 13 Aug 2013 15:13:56 +0200 Subject: [PATCH 240/332] python-magic: git -> 0.4.3 --- pkgs/top-level/python-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80107221022..a8ece22c9cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2744,13 +2744,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { python_magic = buildPythonPackage rec { - # TODO: wait for release 0.4.3+ - rev = "9f18d2c125b2f0240caec7096625834624cc4c20"; - name = "python-magic-${rev}"; + name = "python-magic-0.4.3"; - src = fetchgit { - inherit rev; - url = "https://github.com/ahupp/python-magic.git"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz"; + md5 = "eec9e2b1bcaf43308b7dacb3f2ecd8c1"; }; propagatedBuildInputs = [ pkgs.file ]; From 463029fe91a73f12b81ed7ea83f4fdcd31e3c382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Aug 2013 17:29:17 +0200 Subject: [PATCH 241/332] thunderbird: reenabling parallel building It built fine here. Maybe the previous failure was of a particular version. --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c4a2eed899b..94d1d08b9e4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { sha1 = "4bcbb33f0b3ea050e805723680b5669d80438812"; }; - enableParallelBuilding = false; + enableParallelBuilding = true; buildInputs = [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr From 09e831e29257b0f21fc9e2a15b70acc0b8c6a102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Aug 2013 17:47:27 +0200 Subject: [PATCH 242/332] Updating vim and vim_configurable to 7.4. I change vim_configurable from 'latest' to 'default', as 'default' now is more recent than latest. --- pkgs/applications/editors/vim/configurable.nix | 8 ++++---- pkgs/applications/editors/vim/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 066c8fddd96..b0b340be8d4 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,6 +1,6 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc -args@{source ? "latest", ...}: with args; +args@{source ? "default", ...}: with args; let inherit (args.composableDerivation) composableDerivation edf; in @@ -11,7 +11,7 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "vim_configurable-7.3"; + name = "vim_configurable-7.4"; enableParallelBuilding = true; # test this @@ -20,8 +20,8 @@ composableDerivation { "default" = # latest release args.fetchurl { - url = ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2; - sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; + url = ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2; + sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"; }; "vim-nox" = { diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index a3e40004550..2a2b3dd6be4 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ncurses, gettext, pkgconfig }: stdenv.mkDerivation rec { - name = "vim-7.3"; + name = "vim-7.4"; src = fetchurl { url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2"; - sha256 = "079201qk8g9yisrrb0dn52ch96z3lzw6z473dydw9fzi0xp5spaw"; + sha256 = "1pjaffap91l2rb9pjnlbrpvb3ay5yhhr3g91zabjvw1rqk9adxfh"; }; + + enableParallelBuilding = true; buildInputs = [ ncurses pkgconfig ]; nativeBuildInputs = [ gettext ]; From 2a444fbdee944cab8dd845503b9ac155305b758d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Aug 2013 17:52:07 +0200 Subject: [PATCH 243/332] Marc Weber suggests to drop 'latest' in vim_configurable. --- pkgs/applications/editors/vim/configurable.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index b0b340be8d4..b3992dfec30 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -31,14 +31,7 @@ composableDerivation { name = "vim-nox-hg-2082fc3"; # END }.src; - "latest" = { - # vim latest usually is vim + bug fixes. So it should be very stable - # REGION AUTO UPDATE: { name="vim"; type="hg"; url="https://vim.googlecode.com/hg"; } - src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-hg-7f98896.tar.bz2"; sha256 = "efcb8cc5924b530631a8e5fc2a0622045c2892210d32d300add24aded51866f1"; }); - name = "vim-hg-7f98896"; - # END - }.src; - }; + }; # if darwin support is enabled, we want to make sure we're not building with # OS-installed python framework From b0031380816d5b1f9767bc62a799083790e69a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Aug 2013 20:06:30 +0200 Subject: [PATCH 244/332] libav: major update and refactoring Also leaving 0_8 branch, as it's compatible with older ffmpeg versions. I'm planning that all expressions will be able to switch easily between ffmpeg and libav (whatever default we choose, but I prefer libav). --- pkgs/development/libraries/libav/0.8.x.nix | 12 ++ pkgs/development/libraries/libav/default.nix | 128 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 96 insertions(+), 48 deletions(-) create mode 100644 pkgs/development/libraries/libav/0.8.x.nix diff --git a/pkgs/development/libraries/libav/0.8.x.nix b/pkgs/development/libraries/libav/0.8.x.nix new file mode 100644 index 00000000000..724a43a81e0 --- /dev/null +++ b/pkgs/development/libraries/libav/0.8.x.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, libav_9 }: + +let derivSrc = libav_9.derivSrc // rec { + name = "libav-0.8.8"; + + src = fetchurl { + url = "http://libav.org/releases/${name}.tar.xz"; + sha256 = "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; + }; +}; +in stdenv.mkDerivation derivSrc + diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 3fb1650bf46..705ef9ae5a6 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,59 +1,86 @@ -{ stdenv, fetchurl, pkgconfig, yasm, xz -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? false, libvpx ? null -, x264Support ? false, x264 ? null -, xvidSupport ? true, xvidcore ? null -, faacSupport ? false, faac ? null +{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? true, libvpx ? null +, x264Support ? false, x264 ? null +, xvidSupport ? true, xvidcore ? null +, faacSupport ? false, faac ? null +, vaapiSupport ? false, libva ? null # ToDo: it has huge closure +, vdpauSupport ? true, libvdpau ? null +, freetypeSupport ? true, freetype ? null # it's small and almost everywhere +, SDL # only for avplay in $tools, adds nontrivial closure to it +, enableGPL ? true # ToDo: some additional default stuff may need GPL +, enableUnfree ? faacSupport }: -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert vorbisSupport -> libvorbis != null; -assert vpxSupport -> libvpx != null; -assert x264Support -> x264 != null; -assert xvidSupport -> xvidcore != null; +assert faacSupport -> enableUnfree; + +with { inherit (stdenv.lib) optional optionals; }; + +/* ToDo: + - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools + - maybe do some more splitting into outputs +*/ + +let derivSrc = rec { # derivSrc is exported and re-used by expressions for older versions + name = "libav-9.8"; -stdenv.mkDerivation rec { - name = "libav-0.7"; - src = fetchurl { url = "http://libav.org/releases/${name}.tar.xz"; - sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz"; + sha256 = "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3"; }; - # `--enable-gpl' (as well as the `postproc' and `swscale') mean that - # the resulting library is GPL'ed, so it can only be used in GPL'ed - # applications. - configureFlags = [ - "--enable-gpl" - "--enable-postproc" - "--enable-swscale" - "--disable-ffserver" - "--disable-ffplay" + configureFlags = + assert stdenv.lib.all (x: x!=null) buildInputs; + [ + #"--enable-postproc" # it's now a separate package in upstream + "--disable-avserver" # upstream says it's in a bad state + "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" ] - ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" - ++ stdenv.lib.optional speexSupport "--enable-libspeex" - ++ stdenv.lib.optional theoraSupport "--enable-libtheora" - ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" - ++ stdenv.lib.optional vpxSupport "--enable-libvpx" - ++ stdenv.lib.optional x264Support "--enable-libx264" - ++ stdenv.lib.optional xvidSupport "--enable-libxvid" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; + ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ] + ++ optional mp3Support "--enable-libmp3lame" + ++ optional speexSupport "--enable-libspeex" + ++ optional theoraSupport "--enable-libtheora" + ++ optional vorbisSupport "--enable-libvorbis" + ++ optional vpxSupport "--enable-libvpx" + ++ optional x264Support "--enable-libx264" + ++ optional xvidSupport "--enable-libxvid" + ++ optional faacSupport "--enable-libfaac --enable-nonfree" + ++ optional vaapiSupport "--enable-vaapi" + ++ optional vdpauSupport "--enable-vdpau" + ++ optional freetypeSupport "--enable-libfreetype" + ; - buildInputs = [ pkgconfig lame yasm ] - ++ stdenv.lib.optional mp3Support lame - ++ stdenv.lib.optional speexSupport speex - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional vorbisSupport libvorbis - ++ stdenv.lib.optional vpxSupport libvpx - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional faacSupport faac; + buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] + ++ optional mp3Support lame + ++ optional speexSupport speex + ++ optional theoraSupport libtheora + ++ optional vorbisSupport libvorbis + ++ optional vpxSupport libvpx + ++ optional x264Support x264 + ++ optional xvidSupport xvidcore + ++ optional faacSupport faac + ++ optional vaapiSupport libva + ++ optional vdpauSupport libvdpau + ++ optional freetypeSupport freetype + ; + + enableParallelBuilding = true; + + outputs = [ "out" "tools" ]; + + postInstall = '' + mkdir -p "$tools/bin" + mv "$out/bin/avplay" "$tools/bin" + cp -s "$out"/bin/* "$tools/bin/" + ''; + + doInstallCheck = true; + installCheckTarget = "check"; # tests need to be run *after* installation crossAttrs = { dontSetConfigureCross = true; @@ -65,8 +92,15 @@ stdenv.mkDerivation rec { ]; }; - meta = { + passthru = { inherit derivSrc vdpauSupport; }; + + meta = with stdenv.lib; { homepage = http://libav.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; + license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? + else if enableGPL then gpl2Plus else lgpl21Plus; + platforms = platforms.all; }; -} +}; +in stdenv.mkDerivation derivSrc + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 347f61f5d17..d60275eb055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4457,7 +4457,9 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = callPackage ../development/libraries/libav { }; + libav = libav_9; + libav_9 = callPackage ../development/libraries/libav { }; + libav_0_8 = callPackage ../development/libraries/libav/0.8.x.nix { }; libavc1394 = callPackage ../development/libraries/libavc1394 { }; From c5d81ea3b5ca567aa2644b9da191c53d4d3abc4e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 13 Aug 2013 21:48:26 +0000 Subject: [PATCH 245/332] Update leiningen to 2.3.1. --- .../tools/build-managers/leiningen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index d041dbb5861..4ca362ede0a 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.3.0"; + version = "2.3.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb"; + sha256 = "07z4sr4ssi9lqr1kydxn4gp992n44jsr6llarlvpx0ns8yi4gx0l"; }; jarsrc = fetchurl { url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar"; - sha256 = "04xmnw80f39qs2vfm5ic8bmhks1fvasiwg4snckg2zhfjkhzms05"; + sha256 = "00hmxyvrzxjwa2qz3flnrvg2k2llzvprk9b5szyrh3rv5z5jd4hw"; }; patches = ./lein_2.3.0.patch; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ jdk clojure ]; meta = { - homepage = https://github.com/technomancy/leiningen; + homepage = http://leiningen.org/; description = "Project automation for Clojure"; license = "EPL"; platforms = stdenv.lib.platforms.unix; From 4cbf9f3f1965a97bc385d4d27249cf3386f9aa1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Aug 2013 00:42:54 +0200 Subject: [PATCH 246/332] fix nixpkgs eval --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8ece22c9cd..0d3373881b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5,7 +5,7 @@ isPy26 = python.majorVersion == "2.6"; isPy27 = python.majorVersion == "2.7"; optional = pkgs.lib.optional; optionals = pkgs.lib.optionals; -modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; }; +modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypto = null}; pythonPackages = modules // import ./python-packages-generated.nix { inherit pkgs python; From 4d7d5ba69c89fdbdb429f876b2cbd5b9b7edad83 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 02:30:37 +0200 Subject: [PATCH 247/332] Delete the Intel firmware packages The Debian firmware package (firmwareLinuxNonfree) contains all of these so there is no reason to keep them. --- .../linux/firmware/ipw2100/default.nix | 26 --------------- .../linux/firmware/ipw2200/default.nix | 27 ---------------- .../firmware/iwlwifi-1000-ucode/default.nix | 32 ------------------- .../firmware/iwlwifi-2030-ucode/default.nix | 30 ----------------- .../firmware/iwlwifi-3945-ucode/default.nix | 19 ----------- .../firmware/iwlwifi-4965-ucode/version-2.nix | 32 ------------------- .../firmware/iwlwifi-5000-ucode/default.nix | 30 ----------------- .../firmware/iwlwifi-5150-ucode/default.nix | 30 ----------------- .../firmware/iwlwifi-6000-ucode/default.nix | 30 ----------------- .../iwlwifi-6000g2a-ucode/default.nix | 29 ----------------- .../iwlwifi-6000g2b-ucode/default.nix | 30 ----------------- pkgs/top-level/all-packages.nix | 24 -------------- 12 files changed, 339 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/ipw2100/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/ipw2200/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix deleted file mode 100644 index abc6bf08dac..00000000000 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "ipw2100-fw-1.3"; - - src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz; - sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471"; - }; - - unpackPhase = "tar xvzf $src"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out; cp ipw* LICENSE $out"; - - meta = { - # "... you may transfer a copy of the Software ... provided such - # recipient agrees to be fully bound by the terms hereof." - description = "Firmware for the Intel 2100BG wireless card (requires acceptance of license, see http://ipw2100.sourceforge.net/firmware.php?fid=2)"; - homepage = http://ipw2100.sourceforge.net/firmware.php; - license = http://ipw2100.sourceforge.net/firmware.php?fid=2; - }; -} diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix deleted file mode 100644 index 5c4989b878a..00000000000 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "ipw2200-fw-3.1"; - - src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz; - sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6"; - }; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out; cp * $out"; - - meta = { - # "... you may transfer a copy of the Software ... provided such - # recipient agrees to be fully bound by the terms hereof." - description = "Firmware for the Intel 2200BG wireless card (requires acceptance of license, see http://ipw2200.sourceforge.net/firmware.php?fid=8"; - homepage = http://ipw2200.sourceforge.net/firmware.php; - license = http://ipw2200.sourceforge.net/firmware.php?fid=8; - # See also http://ipw2100.sourceforge.net/firmware_faq.php - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix deleted file mode 100644 index 8acb75c3ed6..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-1000-ucode-128.50.3.1"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 1000 wireless card"; - - longDescription = '' - This package provides version 3 of the Intel wireless card - firmware, for Linux up to 2.6.26. It contains the - `iwlwifi-1000-3.ucode' file, which is loaded by the `iwlagn' - driver found in recent kernels. - ''; - - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix deleted file mode 100644 index bc9c8efe063..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-2030-ucode-18.168.6.1"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 2030 Series wireless card"; - - longDescription = '' - This package provides the Intel 2030 Series wireless card - firmware. It contains the `iwlwifi-2030-6.ucode' file. - ''; - - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix deleted file mode 100644 index 77756e771ae..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "iwlwifi-3945-ucode-15.32.2.9"; - - src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/iwl3945-firmware/iwlwifi-3945-ucode-15.32.2.9.tgz/d99a75ab1305d1532a09471b2f9a547a/iwlwifi-3945-ucode-15.32.2.9.tgz; - sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk"; - }; - - buildPhase = "true"; - - installPhase = "mkdir -p $out; chmod -x *; cp * $out"; - - meta = { - description = "Firmware for the Intel 3945ABG wireless card"; - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix deleted file mode 100644 index 3e15374c65f..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-4965-ucode-228.61.2.24"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=iwlwifi-4965-ucode-228.61.2.24.tgz"; - name = "iwlwifi-4965-ucode-228.61.2.24.tgz"; - sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 4965ABG wireless card, for Linux 2.6.27+"; - - longDescription = '' - This package provides version 2 of the Intel wireless card - firmware, for Linux 2.6.27 and later. It contains the - `iwlwifi-4965-2.ucode' file, which is loaded by the `iwlagn' - driver found in recent kernels. - ''; - - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix deleted file mode 100644 index 8805f1393fb..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-5000-ucode-8.83.5.1-1"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-5000-ucode-8.83.5.1-1.tgz"; - name = "iwlwifi-5000-ucode-8.83.5.1-1.tgz"; - sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 5000 wireless card"; - - longDescription = '' - This package provides version 5 of the Intel wireless card - firmware. It contains the `iwlwifi-5000-5.ucode' file. - ''; - - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix deleted file mode 100644 index dca427cbff5..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-5150-ucode-8.24.2.2"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 5150 wireless card"; - - longDescription = '' - This package provides version 1 of the Intel wireless card - firmware. It contains the `iwlwifi-5150-2.ucode' file. - ''; - - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix deleted file mode 100644 index 2e88f1bba74..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-6000-ucode-9.221.4.1"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 6000 Series wireless card"; - - longDescription = '' - This package provides the Intel 6000 Series wireless card - firmware. It contains the `iwlwifi-6000-4.ucode' file. - ''; - - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix deleted file mode 100644 index ef259b70975..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "iwlwifi-6000g2a-ucode-18.168.6.1"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - description = "Firmware for the Intel 6000 Series Gen2 wireless card"; - - longDescription = '' - This package provides the Intel 6000 Series wireless card - firmware. It contains the `iwlwifi-6000g2a-5.ucode' file. - ''; - }; -} diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix deleted file mode 100644 index 0fee3acd0a3..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-6000g2b-ucode-17.168.5.2"; - - src = fetchurl { - url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - ''; - - meta = { - description = "Firmware for the Intel 6000 Series Gen2 wireless card"; - - longDescription = '' - This package provides the Intel 6000 Series wireless card - firmware. It contains the `iwlwifi-6000g2b-4.ucode' file. - ''; - - homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60275eb055..d09c4810ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6319,30 +6319,8 @@ let iptables = callPackage ../os-specific/linux/iptables { }; - ipw2100fw = callPackage ../os-specific/linux/firmware/ipw2100 { }; - - ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { }; - iw = callPackage ../os-specific/linux/iw { }; - iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { }; - - iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { }; - - iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; - - iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { }; - - iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { }; - - iwlwifi5150ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5150-ucode { }; - - iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { }; - - iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { }; - - iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { }; - jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; @@ -6514,8 +6492,6 @@ let iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - iwlwifi4965ucode = iwlwifi4965ucodeV2; - lttngModules = callPackage ../os-specific/linux/lttng-modules { }; atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; From 0b086080f9c72b94e6fc6f6fc6a831704ef86acb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 02:34:45 +0200 Subject: [PATCH 248/332] Typo fix Doesn't fix evaluation though... --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d3373881b0..6f30e4b5bf2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5,7 +5,7 @@ isPy26 = python.majorVersion == "2.6"; isPy27 = python.majorVersion == "2.7"; optional = pkgs.lib.optional; optionals = pkgs.lib.optionals; -modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypto = null}; +modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypto = null; }; pythonPackages = modules // import ./python-packages-generated.nix { inherit pkgs python; From 40cfa15513ac546d34c147502bddb1c35c41cbb9 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 14 Aug 2013 09:23:15 +0800 Subject: [PATCH 249/332] add tiled-qt 0.9.1 --- .../applications/editors/tiled-qt/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/editors/tiled-qt/default.nix diff --git a/pkgs/applications/editors/tiled-qt/default.nix b/pkgs/applications/editors/tiled-qt/default.nix new file mode 100644 index 00000000000..05020df01a0 --- /dev/null +++ b/pkgs/applications/editors/tiled-qt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, qt }: + +stdenv.mkDerivation rec { + name = "tiled-qt-0.9.1"; + + src = fetchurl { + url = "mirror://sourceforge/tiled/${name}.tar.gz"; + sha256 = "09xm6ry56zsqbfl9fvlvc5kq9ikzdskm283r059q6rlc7crzhs38"; + }; + + buildInputs = [ qt ]; + + preConfigure = "qmake -r PREFIX=$out"; + + meta = { + description = "A free, easy to use and flexible tile map editor"; + homepage = "http://www.mapeditor.org/"; + # libtiled and tmxviewer is licensed under 2-calause BSD license. + # The rest is GPL2 or later. + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60275eb055..c45ee7dc86f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1784,6 +1784,8 @@ let guile = guile_1_8; }; + tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; }; + tinc = callPackage ../tools/networking/tinc { }; tmux = callPackage ../tools/misc/tmux { }; From 5c208844e96ae75ac8c8e59b3cad9de2576be308 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 03:24:58 +0200 Subject: [PATCH 250/332] Remove more duplicate firmware --- .../linux/firmware/bcm43xx/default.nix | 33 ------------------- .../linux/firmware/radeon-juniper/default.nix | 31 ----------------- .../linux/firmware/radeon-r600/default.nix | 19 ----------- .../linux/firmware/radeon-r700/default.nix | 19 ----------- .../linux/firmware/ralink/default.nix | 33 ------------------- .../linux/firmware/rt2860/default.nix | 33 ------------------- .../linux/firmware/rt2870/default.nix | 26 --------------- .../linux/firmware/rtl8168e-2/default.nix | 23 ------------- .../linux/firmware/rtl8192c/default.nix | 17 ---------- pkgs/top-level/all-packages.nix | 16 --------- 10 files changed, 250 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/bcm43xx/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/radeon-juniper/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/radeon-r600/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/radeon-r700/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/ralink/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/rt2860/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/rt2870/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/rtl8192c/default.nix diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix deleted file mode 100644 index fb43c7d67e1..00000000000 --- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl }: - -let - src1 = fetchurl { - url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; - sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3"; - name = "bcm43xx_hdr-0.fw"; - }; - - src2 = fetchurl { - url = "https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e"; - sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797"; - name = "bcm43xx-0.fw"; - }; -in -stdenv.mkDerivation { - name = "bcm43xx-firmware-610.811"; - - unpackPhase = "true"; - - buildPhase = "true"; - - installPhase = '' - mkdir -p $out/brcm - cp ${src1} $out/brcm/${src1.name} - cp ${src2} $out/brcm/${src2.name} - ''; - - meta = { - description = "Firmware for the Broadcom 43xx 802.11 wireless cards"; - homepage = http://linuxwireless.org/; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix deleted file mode 100644 index 53e0fb235a5..00000000000 --- a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-juniper-firmware-2010-04-08"; - - srcPfp = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_pfp.bin"; - sha256 = "1qm910p7qjs6n528q22gkwpprzdh39vbihdliykbpfs1pphrhkjz"; - }; - srcMe = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_me.bin"; - sha256 = "1869dhay3f75hhnsvdjhlrjd4fhdi8d6c3lhk45vp7fhjiw4741q"; - }; - srcRlc = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin"; - sha256 = "0hglq8ab1f3d81mvcb4aikkfdwh6i4a93ps0f9czq1qz5h0q6wlk"; - }; - - unpackPhase = "true"; - installPhase = '' - install -D $srcPfp $out/radeon/JUNIPER_pfp.bin - install -D $srcMe $out/radeon/JUNIPER_me.bin - install -D $srcRlc $out/radeon/JUNIPER_rlc.bin - ''; - - meta = { - description = "Juniper firmware for the RADEON chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix b/pkgs/os-specific/linux/firmware/radeon-r600/default.nix deleted file mode 100644 index 9a298ab96d4..00000000000 --- a/pkgs/os-specific/linux/firmware/radeon-r600/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-r600-firmware-2009-12-09"; - - src = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R600_rlc.bin"; - sha256 = "11bxpivxycigv0ffbck33y9czgira3g8py33840zxzwcwbi59yps"; - }; - - unpackPhase = "true"; - installPhase = "install -D $src $out/radeon/R600_rlc.bin"; - - meta = { - description = "Firmware for the RADEON r600 chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix b/pkgs/os-specific/linux/firmware/radeon-r700/default.nix deleted file mode 100644 index 79b16b1dcea..00000000000 --- a/pkgs/os-specific/linux/firmware/radeon-r700/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "radeon-r700-firmware-2009-12-09"; - - src = fetchurl { - url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin"; - sha256 = "1sbpq39cvjnpfp1iamhq9k9266jkaaywnm8d2pw95ayw56a77976"; - }; - - unpackPhase = "true"; - installPhase = "install -D $src $out/radeon/R700_rlc.bin"; - - meta = { - description = "Firmware for the RADEON r700 chipset"; - homepage = "http://people.freedesktop.org/~agd5f/radeon_ucode"; - license = "GPL"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix deleted file mode 100644 index abf12fd672b..00000000000 --- a/pkgs/os-specific/linux/firmware/ralink/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchsvn }: - -# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git - -stdenv.mkDerivation { - name = "ralink-fw-r17279"; - - src = fetchsvn { - url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; - rev = 17279; - sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; - }; - - unpackPhase = "true"; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = '' - mkdir -p $out - cp $src/*.bin $out - cp $src/LICENSE $out/ralink.LICENSE - ''; - - meta = { - description = "Firmware for the Ralink wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix deleted file mode 100644 index 0a1cb655572..00000000000 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchsvn }: - -# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git - -stdenv.mkDerivation { - name = "rt2860-fw-26"; - - src = fetchsvn { - url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; - rev = 17279; - sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; - }; - - unpackPhase = "true"; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = '' - mkdir -p $out - cp $src/rt2860.bin $out - cp $src/LICENSE $out/rt2860.LICENSE - ''; - - meta = { - description = "Firmware for the Ralink RT2860 wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix deleted file mode 100644 index 15de7c30586..00000000000 --- a/pkgs/os-specific/linux/firmware/rt2870/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - name = "rt2870-fw-22"; - src = fetchurl { - url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D"; - name = "RT2870_Firmware_V22.zip"; - sha256 = "d24591a8529b0a609cc3c626ecee96484bb29b2c020260b82f6025459c11f263"; - }; - - buildInputs = [ unzip ]; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; - - meta = { - description = "Firmware for the Ralink RT2870 wireless cards"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix deleted file mode 100644 index dbd2fa45b7b..00000000000 --- a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl }: - -# http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git -let - src = fetchurl { - url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw"; - sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a"; - name = "rtl8168e-2.fw"; - }; -in -stdenv.mkDerivation { - name = "rtl8168e-2-firmware-2012.01.10"; - - unpackPhase = "true"; - - buildPhase = "true"; - - installPhase = "install -v -D ${src} $out/rtl_nic/${src.name}"; - - meta = { - description = "Firmware for the Realtek Gigabit Ethernet controllers"; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix deleted file mode 100644 index f06fcb149e8..00000000000 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, firmwareLinuxNonfree}: -stdenv.mkDerivation { - name = "rtl8192c-fw"; - src = firmwareLinuxNonfree; - - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/rtlwifi - cp "$src/rtlwifi/rtl8192cfw.bin" "$out/rtlwifi/rtl8192cfw.bin" - ''; - - meta = { - description = "Firmware for the Realtek RTL8192c wireless cards"; - homepage = "http://www.realtek.com"; - license = "non-free"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d09c4810ace..bfd70ea17e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6205,8 +6205,6 @@ let batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { }; - bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez4 = callPackage ../os-specific/linux/bluez { pygobject = pygobject3; }; @@ -6706,10 +6704,6 @@ let radeontools = callPackage ../os-specific/linux/radeontools { }; - radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { }; - radeonR600 = callPackage ../os-specific/linux/firmware/radeon-r600 { }; - radeonJuniper = callPackage ../os-specific/linux/firmware/radeon-juniper { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -6718,18 +6712,8 @@ let rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; - ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; - - rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; - - rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; - rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; - - rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { }; - sdparm = callPackage ../os-specific/linux/sdparm { }; sepolgen = callPackage ../os-specific/linux/sepolgen { }; From b3642c367348d5720bc51cebf560e29959a8c69e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 03:26:04 +0200 Subject: [PATCH 251/332] Move the AMD microcode to the microcode directory --- .../linux/{firmware/amd-ucode/default.nix => microcode/amd.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/os-specific/linux/{firmware/amd-ucode/default.nix => microcode/amd.nix} (100%) diff --git a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix b/pkgs/os-specific/linux/microcode/amd.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/amd-ucode/default.nix rename to pkgs/os-specific/linux/microcode/amd.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfd70ea17e7..d5b1fbb382a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6164,7 +6164,7 @@ let afuse = callPackage ../os-specific/linux/afuse { }; - amdUcode = callPackage ../os-specific/linux/firmware/amd-ucode { }; + amdUcode = callPackage ../os-specific/linux/microcode/amd.nix { }; autofs5 = callPackage ../os-specific/linux/autofs/autofs-v5.nix { }; From d0617613dd8fd41181376692543be8125088d700 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 03:56:07 +0200 Subject: [PATCH 252/332] firmware-linux-nonfree: Update to 0.40 --- .../firmware-linux-nonfree/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) 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 24906f2b0db..952351a9b88 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -3,28 +3,29 @@ # You can either install the complete bundle, or write a separate package for individual # devices that copies the firmware from this package. -{ stdenv, fetchurl, buildEnv, dpkg }: +{ stdenv, fetchurl, dpkg }: let - version = "0.38"; + version = "0.40"; packages = [ - { name = "ipw2x00"; sha256 = "1bdial90l1928sfw3j1fz5cbsav8lz9riv38d02bawq9rzvb5dx0"; } - { name = "bnx2x"; sha256 = "1a8jwwa6yldj2pgnsghhdkb8c0s64wzg0vx8y3cj11lhbh2ag2i7"; } - { name = "linux-nonfree"; sha256 = "0dr91sswvkh0lk80d6byxjavkqcsickqf8xqhdd82j9mm7bjg7ld"; } - { name = "intelwimax"; sha256 = "1156c7a301lk2a4d699dmvwzh4k3rfbxl4fx4raafy8a15lbw8mn"; } - { name = "iwlwifi"; sha256 = "1q6gl2x4lj83hn8acamlj7s4j8vjd02798a6i52f4r7x0042f58a"; } - { name = "bnx2"; sha256 = "0rpsrmywh97azqmsx4qgxyqcvdn5414m9cg92pd7h9xfmm38nscd"; } - { name = "qlogic"; sha256 = "02438jzzybicg0bvl2jc3qnn0r4f1pfpyxbf70cmas9sfxb7s3az"; } - { name = "libertas"; sha256 = "0b8n1igx6hpxlav73xs8r6qs2v95r9hx4lqqzy0h5iy7md9xs9y4"; } - { name = "ivtv"; sha256 = "1vb1jbxdggy2vj1xlncfzyynpra1y62bb3n30ybafjnx88p6f2hi"; } - { name = "linux"; sha256 = "0ijd49rf7cg0lniqm9sqz2g4i9jmc9vyz6wv9jlwrvnbl8hhy5vy"; } - { name = "netxen"; sha256 = "19d5d3ibhb22p4mh22lnl441v8xyb1pyfi5h36vsjpccivzkgd2f"; } - { name = "myricom"; sha256 = "0vq2rvc71j96q684r1bh0528xnrxa1xzh2sdhqfrgip9ihdsp3ml"; } - { name = "atheros"; sha256 = "04zy5j48b83garmnfxiqgmm3yv1pfpbldxp69zm24pfxcwyvx3hm"; } - { name = "brcm80211"; sha256 = "0kgw6q18i46npmjxv4ymww8dr7nn140xrrqjrbnfhzgha3y2yylg"; } - { name = "ralink"; sha256 = "0kbzbc4vpn6mvvkm4q7mfqg0bsj6akfpypxk98s7kbidmyj577q2"; } - { name = "realtek"; sha256 = "1ac9vlrzprp0j2mdmp1zi47wg2i76vmi288sm3vwlvp4s6ymm077"; } + { name = "adi"; sha256 = "0wwks9ff4n772435s57z1fjrffi4xl9nxnfn3v7xfcwdjb395d88"; } + { name = "atheros"; sha256 = "1gj7hfnyclzgyq06scynaclnfajhs6lw5i51j1w1hikv4yh20djz"; } + { name = "bnx2"; sha256 = "15qjj0sfjin5cbkpby29r5czn11xyiyyc4fmhwlqvgfgrnbp0aqk"; } + { name = "bnx2x"; sha256 = "08nvbln94ff47b2q0avxj1aa2wx4qih8sq8knbq54lp46kjf3k0h"; } + { name = "brcm80211"; sha256 = "1ndsw3s6xkr1n39nf9ig1xhnaglx5qvvvm8rh6ah41v644lzha79"; } + { name = "intelwimax"; sha256 = "1qwxmykh90v92asn4ivq0fak761hs7hd2zmz1dpkjidwsycrfyqn"; } + { name = "ipw2x00"; sha256 = "0a2nb17b5n3k1b6y4dbi5i8k1fm19ba2abq2jh2hjjmyyl3y388m"; } + { name = "ivtv"; sha256 = "1239gsjq16f4kd1yn77iq3ar8ndx3pzd16kpqafr1h2y0zwh452r"; } + { name = "iwlwifi"; sha256 = "03kmh5szd02pkbm1nlyz99fr2njhg88wiv73f1fz485m9rvgga43"; } + { name = "libertas"; sha256 = "0qjziwmwqbp83hxrjw7x3ralxg4ib9y23bcbn1g8yb5b6m84ca6b"; } + { name = "linux"; sha256 = "0ypidsrrfx4kvbfisdpgx2fzbil7g2jixgqhnv960iy5l348amrl"; } + { name = "linux-nonfree"; sha256 = "0p9ql3cdxljflh48r6z40kpyisbzp3s3g1qjb9f64n6cppllwjfr"; } + { name = "myricom"; sha256 = "12spfaq7z2bb93cy15zldlic1wx2v6h9sn7ny09nkzy4m26zds4q"; } + { name = "netxen"; sha256 = "03gmda16bdqw8a4x8x11ph41ksjh48hxydv0f0z3gi3czgbh7sn3"; } + { name = "qlogic"; sha256 = "1ah8rrwzi44p1l4q8qkql18djmn5kihsiinpy204xklm1csf3vs1"; } + { name = "ralink"; sha256 = "005549jk0wnyfnb247awv2wncsx5is05m1hdwcd33iq0dlbmm39b"; } + { name = "realtek"; sha256 = "1ai1klzrql8qxmb7945xiqlkfkyz8admrpb10b3r4ixvclkrvfi2"; } ]; fetchPackage = @@ -40,7 +41,7 @@ in stdenv.mkDerivation { inherit srcs; unpackPhase = '' - ensureDir "./firmware" + mkdir -p ./firmware ''; buildPhase = '' @@ -59,7 +60,7 @@ in stdenv.mkDerivation { meta = { description = "Binary firmware collection packaged by Debian"; - homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; + homepage = http://packages.debian.org/sid/firmware-linux-nonfree; license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; priority = 10; # low priority so that other packages can override this big package From f69eb63a1bf4444a5deacdc88282f2a29b87805d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 14 Aug 2013 03:59:38 +0200 Subject: [PATCH 253/332] firmware-linux-nonfree: Install copyright notices Most of the firmwares require that redistribution in binary form reproduces the copyright notice. --- .../linux/firmware/firmware-linux-nonfree/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 952351a9b88..9ddddfde259 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -54,8 +54,10 @@ in stdenv.mkDerivation { buildInputs = [ dpkg ]; installPhase = '' - mkdir -p "$out/" + mkdir -p $out/share cp -r lib/firmware/* "$out/" + cp -r usr/share/doc $out/share/ + find $out/share -name changelog.gz | xargs rm ''; meta = { From ff2338d2a7bc2d2c88d12b36214088d578acb9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Aug 2013 08:17:03 +0200 Subject: [PATCH 254/332] fix evaluation error (for real) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f30e4b5bf2..7dff177beb7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5,7 +5,7 @@ isPy26 = python.majorVersion == "2.6"; isPy27 = python.majorVersion == "2.7"; optional = pkgs.lib.optional; optionals = pkgs.lib.optionals; -modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypto = null; }; +modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; crypt = null; }; pythonPackages = modules // import ./python-packages-generated.nix { inherit pkgs python; From b331056e750eb08a3e67e927fc1e46b6fb5e62b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Aug 2013 08:42:48 +0200 Subject: [PATCH 255/332] python2.6: add crpyt module --- pkgs/development/interpreters/python/2.6/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 61c997206c1..4b55f7150d3 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -149,6 +149,12 @@ let deps = [ db4 ]; }; + crypt = buildInternalPythonModule { + moduleName = "crypt"; + internalName = "crypt"; + deps = [ ]; + }; + curses = buildInternalPythonModule { moduleName = "curses"; deps = [ ncurses ]; From 219e45b5f526a2d76e65fc32b78b462af1b0afb2 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Mon, 12 Aug 2013 11:49:18 +0200 Subject: [PATCH 256/332] Disable tests in Elm Elm does not serve any tests besides a test that always fails. --- pkgs/development/compilers/elm/elm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 95b4b1cd4ec..1c841a9369c 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl pandoc parsec transformers unionFind uniplate ]; + doCheck = false; meta = { homepage = "http://elm-lang.org"; description = "The Elm language module"; From e1379d02cb8006be2250dff4556258a2d738cd66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 10:03:03 +0200 Subject: [PATCH 257/332] xmobar: disable 'wireless' support That particular feature depends on iwlib, which is broken in modern Linux kernels --- pkgs/applications/misc/xmobar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index db2b9eb94e3..42d11308267 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,5 @@ { cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time -, utf8String, wirelesstools, X11, X11Xft +, utf8String, X11, X11Xft }: cabal.mkDerivation (self: { @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { buildDepends = [ filepath mtl parsec regexCompat stm time utf8String X11 X11Xft ]; - extraLibraries = [ libXrandr wirelesstools ]; - configureFlags = "-fwith_xft -fwith_iwlib"; + extraLibraries = [ libXrandr ]; + configureFlags = "-fwith_xft"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From 963bde70bd82b2577e9d7d6af49d453284134254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Aug 2013 10:42:35 +0200 Subject: [PATCH 258/332] Mako: 0.7.3 -> 0.8.1 (python3 support) --- 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 7dff177beb7..3e54eb4d8f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2814,11 +2814,11 @@ pythonPackages = modules // import ./python-packages-generated.nix { Mako = buildPythonPackage rec { - name = "Mako-0.7.3"; + name = "Mako-0.8.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz"; - md5 = "daf7cc50f997533b573f9b40193139a2"; + md5 = "96d962464ce6316004af0cc48495d73e"; }; buildInputs = [ markupsafe nose ]; From c51e9e7fad835dbfb7db127738218cd2b23ecfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 14 Aug 2013 10:52:20 +0200 Subject: [PATCH 259/332] substanced: bump git rev --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e54eb4d8f5..f3ae83a682e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1594,7 +1594,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { substanced = buildPythonPackage rec { # no release yet - rev = "318a3d6a0324fd43585b8385f456d9d74c212eb8"; + rev = "bd8822be62f0f356e4e44d5c614fe14d3fa08f45"; name = "substanced-${rev}"; src = fetchgit { From 48ff02f369093c827d3b6d93b14898b490135c93 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 10:16:15 +0200 Subject: [PATCH 260/332] haskell-monad-par: update to version 0.3.4.4 --- .../libraries/haskell/monad-par/{0.3.4.3.nix => 0.3.4.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.4.3.nix => 0.3.4.4.nix} (90%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix index 22b9d359faf..d682908dcf1 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.4.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.3"; - sha256 = "1yf1s44r2mkqimi26g9y4zxqgs4yizfmigfx9mkfgbqsn2a8sff6"; + version = "0.3.4.4"; + sha256 = "0mqvrg2izqjrgzbmr6pcl9v9827fkr4mwxpdckm3gj1miljsj314"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ace5b0ff308..051346b4245 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1411,8 +1411,8 @@ 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_3 = callPackage ../development/libraries/haskell/monad-par/0.3.4.3.nix {}; - monadPar = self.monadPar_0_3_4_3; + monadPar_0_3_4_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.4.nix {}; + monadPar = self.monadPar_0_3_4_4; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From ce1c694f4e1c24e3ae3546c123232fff990e910f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 10:21:33 +0200 Subject: [PATCH 261/332] haskell-skein: jailbreak to support recent versions of tagged --- pkgs/development/libraries/haskell/skein/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 3db59020b15..4a89019906f 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; + jailbreak = true; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; From be4cb037ff97357cf0d47fe0147b649f22eee66c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:51:54 +0200 Subject: [PATCH 262/332] haskell-monadcryptorandom: fix build with recent versions of tagged --- .../libraries/haskell/monadcryptorandom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index e955bb14a72..bb0514575a8 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -1,10 +1,11 @@ -{ cabal, cryptoApi, mtl, tagged, transformers }: +{ cabal, fetchurl, cryptoApi, mtl, tagged, transformers }: cabal.mkDerivation (self: { pname = "monadcryptorandom"; version = "0.5.2"; sha256 = "0a0qx331c1kvhmwwam7pbbrnq8ky3spfnw6zsz6rz7g1lk1hfawn"; buildDepends = [ cryptoApi mtl tagged transformers ]; + patches = [ (fetchurl { url = "https://github.com/TomMD/monadcryptorandom/pull/5.patch"; sha256 = "1mcil5w40gfy3hjnrpbgzciz65aygqpghgma0hckjb6xa694a71l"; }) ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; description = "A monad for using CryptoRandomGen"; From dff0f73d2539edaaad3d623260c29361f170c8a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 263/332] haskell-elm-server: update to version 0.9.0.2 --- pkgs/development/compilers/elm/elm-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index 5f33b49173e..56924d589f4 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "elm-server"; - version = "0.9"; - sha256 = "1mk2ligv8has1ssmpild2dq23ld84cdayr6bm3ycg11jab0hrbsx"; + version = "0.9.0.2"; + sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr"; isLibrary = false; isExecutable = true; buildDepends = [ From 7147de66c60aa03820565c05be6a83fa6b9ae7e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 264/332] haskell-Elm: update to version 0.9.0.2 --- pkgs/development/compilers/elm/elm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix index 1c841a9369c..2c851ebbf3f 100644 --- a/pkgs/development/compilers/elm/elm.nix +++ b/pkgs/development/compilers/elm/elm.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Elm"; - version = "0.9.0.1"; - sha256 = "0p6sqfrf11xpgj7y81hsjbvsyyyfvc4nzcg6gmfwyqkg3qc3yg6v"; + version = "0.9.0.2"; + sha256 = "0yr395wsj0spi6h9d6lm5hvdryybpf8i1qpv4gz9dk0bwlyc8iwh"; isLibrary = true; isExecutable = true; buildDepends = [ From dbecc86dfdb9b1b41ebee63136827f2bde441934 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 265/332] haskell-clientsession: update to version 0.9.0.2 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index e670ff1a3d1..6cb8d26bd39 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9"; - sha256 = "0cyw34vzvv1j7w094cjcf97g8bki7l9x82s8csaf96y6d9qws308"; + version = "0.9.0.2"; + sha256 = "0vl310nickavp8wkaad1wfnvm8gfsg9jcfw3rgjz7698avynv3ni"; buildDepends = [ base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein tagged From 2272af9994b99abe39aff23f142a502c5731632b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 266/332] haskell-crypto-cipher-tests: update to version 0.0.2 --- .../libraries/haskell/crypto-cipher-tests/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 60b4d3bad8f..3e93912b3a7 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -5,12 +5,16 @@ cabal.mkDerivation (self: { pname = "crypto-cipher-tests"; - version = "0.0.1"; - sha256 = "1g5rxx07s23pr0vam0bjlp3qwxzqa3m6x6gbv88fhkmbqwxiq2fh"; + version = "0.0.2"; + sha256 = "1jzci2a6827jgiklj8sh7pjl7g4igk2j6mim20619i4rk6x0lhgz"; buildDepends = [ byteable cryptoCipherTypes HUnit mtl QuickCheck securemem testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + testDepends = [ + byteable cryptoCipherTypes HUnit mtl QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Generic cryptography cipher tests"; From 0b805ffccc11a8c768985a4b2b2f0b5df8049c18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 267/332] haskell-crypto-cipher-types: update to version 0.0.2 --- .../haskell/crypto-cipher-types/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index daa75817673..378ccf3dbcc 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -1,17 +1,10 @@ -{ cabal, byteable, HUnit, mtl, QuickCheck, securemem, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 -}: +{ cabal, byteable, securemem }: cabal.mkDerivation (self: { pname = "crypto-cipher-types"; - version = "0.0.1"; - sha256 = "0brwb6awni3jm152vi68saz6gla7kgwf2pfjalzqsi8qjpjbzgpj"; + version = "0.0.2"; + sha256 = "1vjf9g1w7ja8x42k6hq6pcw7jvviw9rq512ncdqd7j20411zjbf4"; buildDepends = [ byteable securemem ]; - testDepends = [ - byteable HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Generic cryptography cipher types"; From 2d6f187f4c9fafb82e6f44eceb8171a08ecdfb75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 268/332] haskell-cryptocipher: update to version 0.5.1 --- pkgs/development/libraries/haskell/cryptocipher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 50935a77a64..6efca94a651 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.5.0"; - sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd"; + version = "0.5.1"; + sha256 = "118sabi90qjyqbvfincn737c4mi9mvjij1dzx7k9rsgad47p0753"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 vector ]; meta = { - homepage = "http://github.com/vincenthz/hs-cryptocipher"; + homepage = "http://github.com/vincenthz/hs-crypto-cipher"; description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From b302962acb07127149dce401d550f459cda17694 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 269/332] haskell-gloss: update to version 1.8.0.1 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a5984aef77c..f397a60017f 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.4"; - sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk"; + version = "1.8.0.1"; + sha256 = "17nnmv84pjls1my58yzifbin3pxcnlbpkprglad707rr4lrkkjvv"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { From 5e53bec090d771fe58fa3d477e57fd5984f23bc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:02 +0200 Subject: [PATCH 270/332] haskell-hspec-meta: update to version 1.6.2 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 1e0c9275a24..3b67310e166 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.6.1"; - sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5"; + version = "1.6.2"; + sha256 = "1mw7a4215vl7fivi21kqi139swigzws09jrybmyyns0znv80fpbh"; isLibrary = true; isExecutable = true; buildDepends = [ From f9b89e6f137eb57631f3346aa553e413bb1a81cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 271/332] haskell-hspec: update to version 1.7.0 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 7b06ea9c21c..d7925b41816 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.6.1"; - sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh"; + version = "1.7.0"; + sha256 = "0cw24vmns06z5308wva9bb5czs9i5wm6qdhymgiyl2i47ibxp5bj"; isLibrary = true; isExecutable = true; buildDepends = [ From 3e2857dbae2d2fc40434fb3c34cdb7b901be28e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 272/332] haskell-http-conduit: update to version 1.9.4.2 --- 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 d1cff617a82..f6a06e33515 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.4.1"; - sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4"; + version = "1.9.4.2"; + sha256 = "13qjf3c3qkaqdi7qp1iqywvsbsiqq8brbzwh8idaj1bhl9jizwhx"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From 5c0be3ea6a777c3aa15cedfd6b649f6a13005191 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 273/332] haskell-logict: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/logict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index 0a03ed45fee..9dc4b58797f 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "logict"; - version = "0.6"; - sha256 = "1np4wizvwlx458kq6mmdrh8qcp1794y1bs4mnnz951h6hay5z49f"; + version = "0.6.0.1"; + sha256 = "0sznrnx7l5sqnyvc2xwx1q33b4833qsnhppm06a3scp9gj3y1xp2"; buildDepends = [ mtl ]; meta = { homepage = "http://code.haskell.org/~dolio/logict"; From 3537e15b3163c5512e3cc163d801dc63c3fe89f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 274/332] haskell-mime-mail: update to version 0.4.2.1 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 5b21949d5fa..691029ac5de 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.2"; - sha256 = "1v9qdj53swhg8xg9s2x0m6d6xaff5ya6bpdifya2vsp08fmgn4l9"; + version = "0.4.2.1"; + sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; - testDepends = [ blazeBuilder hspec ]; + testDepends = [ blazeBuilder hspec text ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; From c6a9104810d6922145a73f3c62a36633ab655266 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 275/332] haskell-network-conduit-tls: update to version 1.0.1 --- .../libraries/haskell/network-conduit-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 2785f9c5ab1..2b1a5694044 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.0.3"; - sha256 = "0gaws4spd50dmqjsxdxvjk5n5l0ib4q0brwnxrk725d3b3hanpz1"; + version = "1.0.1"; + sha256 = "0h2svqllm85vambssq0j4ghx2b44cjg0kj04bamp72ly22mcg9d6"; buildDepends = [ aeson certificate conduit cryptoApi cryptoRandomApi network networkConduit pem systemFileio systemFilepath tls tlsExtra From 3c1e499b1694f6053be1d511668aaa7e317af526 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 276/332] haskell-persistent: update to version 1.2.3.0 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 7ccbe145d70..a336ab4fb88 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.2.0"; - sha256 = "18p3yz683ks0gdn1l4qys29jj7iqhlwh7i0s50bkl4x1w0mpa1kh"; + version = "1.2.3.0"; + sha256 = "0bil1932rnh3my9yjyc4sk24g0qwkkgv8b48nrn7fm007vyf173m"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 1493fa028bd03730403c033961d63ff5888c85b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 277/332] haskell-repa-algorithms: update to version 3.2.4.1 --- .../development/libraries/haskell/repa-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index acf9dc712f3..2ec3fb3172e 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "3.2.3.1"; - sha256 = "12w76npa52g7zxa0j9w8q9njacm2dn0hcd8a8386p9r6iy6lpjwc"; + version = "3.2.4.1"; + sha256 = "0xb2r726z73ghiqik39n99q5hal16y7ydk16q2rbycbvc37yq24b"; buildDepends = [ repa vector ]; extraLibraries = [ llvm ]; jailbreak = true; From 7faf783bade5a3151a307e0542674e7fc2e196d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:03 +0200 Subject: [PATCH 278/332] haskell-resourcet: update to version 0.4.7.2 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 4b2defc79d7..3887abad71c 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.7.1"; - sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh"; + version = "0.4.7.2"; + sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; From 54609334b8c7ee10b1e18507e9cb4777379c3007 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 279/332] haskell-tagged: update to version 0.7 --- pkgs/development/libraries/haskell/tagged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index baf9703b161..ee808800c55 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.6.1"; - sha256 = "1n3m1y06lhbsx9rfwwdx5xqnw4ni41b39iyysgj5894iz9rwrrnv"; + version = "0.7"; + sha256 = "1g78hl6sib1mhg016gy3fqw78x72jsgqizsgim8a1pysjzq0y6zm"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; From e2fcb8d67b6ff3cfb2b7558aee03f7f7556712ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 280/332] haskell-wai-extra: update to version 1.3.4.3 --- 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 3192def654e..270ca004c49 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.2"; - sha256 = "14mrvh3av6dn4jx5q06b4lyjw8sr1ynygbncf5fbp3nzn8nmh17s"; + version = "1.3.4.3"; + sha256 = "19vj47awkazn6h4kf37f4sp4g8lhm125wjqnp1wa1wa8zlndp8wy"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes From baf44bfbbfa3f3eb287a7c1e6a8d00e38e0e50e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 281/332] haskell-warp: update to version 1.3.9.1 --- 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 91f51a76e2a..2134077e61a 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.9"; - sha256 = "1gnsikk1z5q1mblwshg9pbaa1ijy64da7vscanzp70lw63jjk7cg"; + version = "1.3.9.1"; + sha256 = "0s8jrgn9pxqkjvdbgvrxd0bnclkhn3hix2mff66hqpx8x4znh0zv"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpAttoparsec httpTypes liftedBase network networkConduit From e63aed801f4035241c57fdd4f9e61f84ab0d54c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 282/332] haskell-xml-conduit: update to version 1.1.0.6 --- .../libraries/haskell/xml-conduit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 98166f80d31..bd21eee5aa9 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,17 +1,17 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault -, failure, hspec, HUnit, monadControl, resourcet, systemFilepath -, text, transformers, xmlTypes +, deepseq, failure, hspec, HUnit, monadControl, resourcet +, systemFilepath, text, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.1.0.5"; - sha256 = "1ryiacx42hdh564zy6dj5vxxl2l8flfffmdw8shb32w3gp11fzmp"; + version = "1.1.0.6"; + sha256 = "08kz982c95hcni6zbrflv8kqvy7wccb19plsmwczhzcsifam5a9k"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - blazeHtml blazeMarkup conduit dataDefault failure monadControl - resourcet systemFilepath text transformers xmlTypes + blazeHtml blazeMarkup conduit dataDefault deepseq failure + monadControl resourcet systemFilepath text transformers xmlTypes ]; testDepends = [ blazeMarkup conduit hspec HUnit text transformers xmlTypes From 3bbe2f54dbc1d288c545798022415b1696f23f1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 283/332] haskell-yaml: update to version 0.8.4.1 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index ee8b28b94cb..1e22f1ae4ba 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.4"; - sha256 = "0kdqhdiyy2mqc3rb3l7aaspalkj4z8jndyzhij8m06n43hfzbhhi"; + version = "0.8.4.1"; + sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From 0cdda690fa33c4aa8dfc4c444d79d2c8ec08399e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 284/332] haskell-yesod-auth: update to version 1.2.1 --- .../libraries/haskell/yesod-auth/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 3327dc1c08c..66ed9df2d20 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,20 +1,20 @@ { 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 +, pureMD5, pwstoreFast, random, resourcet, safe, SHA +, shakespeareCss, shakespeareJs, text, time, transformers +, unorderedContainers, wai, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.0.2"; - sha256 = "1vimv1zcpq167nd8fa3y0mrrwh1hqh2rqwmz5mg9zvqzz95wvhmh"; + version = "1.2.1"; + sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network persistent persistentTemplate pureMD5 pwstoreFast random resourcet - SHA shakespeareCss shakespeareJs text transformers + safe SHA shakespeareCss shakespeareJs text time transformers unorderedContainers wai yesodCore yesodForm yesodPersistent ]; meta = { From 79a6fd35c9075f3bdbd55fda9138c1ae855ea3f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:04 +0200 Subject: [PATCH 285/332] haskell-yesod-bin: update to version 1.2.2.1 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index a7925e82b10..3dfedd471fe 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.2"; - sha256 = "03c53kgiqmjjihszmvqjgkcklq28mvyn4m2lhcbmqqzkkzyjb0rj"; + version = "1.2.2.1"; + sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2"; isLibrary = false; isExecutable = true; buildDepends = [ From 7d5678a51e26cd2cbd92be678a8ae5a07bae9bf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:05 +0200 Subject: [PATCH 286/332] haskell-yesod-core: update to version 1.2.4 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index c725ef53d3d..3fcec1a7d9f 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.3"; - sha256 = "0b7rs5w7s88mv2mwg778dpkvcdwawq10i9r176fqi321g3170iwk"; + version = "1.2.4"; + sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From e47758a1ec45a184f83183b811e31f9b46c1e776 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:05 +0200 Subject: [PATCH 287/332] haskell-yesod-form: update to version 1.3.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d41dcb64b1f..926cba46499 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.0.1"; - sha256 = "02qkx148yx7dm059h05xrrahsifckcjwgcfxfq1kjdiik45j7xiz"; + version = "1.3.1"; + sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From e1461748f52f4a373a8e34fab812d647e32ce968 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:06 +0200 Subject: [PATCH 288/332] haskell-yesod-test: update to version 1.2.1 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index f32e90dab17..c4ad5b29acd 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.0"; - sha256 = "184hfhp62jq2icyn1l6s8kvdcsa6099vmykg2nxrafg9f83lb53q"; + version = "1.2.1"; + sha256 = "1f92q9wjj6npxfsjibw0qlg6pai721mwkjcadh121bwgrancflyr"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 91ad63716cc6ea27598023493b542b086d3bd428 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Aug 2013 11:52:06 +0200 Subject: [PATCH 289/332] haskell-yesod: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index d195d59dd31..fd68a161c68 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.1.1"; - sha256 = "1zx0r02k6znrm62wmhjcdlad3dil93kp6p862rvsvbkazwfy768a"; + version = "1.2.2"; + sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers From 53fe67e74d3eba0a249da96cb1d4abcee91f1e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 14 Aug 2013 19:16:22 +0200 Subject: [PATCH 290/332] ipython: 0.13.2 -> 1.0.0 Release notes: http://ipython.org/ipython-doc/rel-1.0.0/whatsnew/version1.0.html --- pkgs/shells/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index f8fda4f051b..79c61b8ed23 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { - name = "ipython-0.13.2"; + name = "ipython-1.0.0"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1sh0n47i1zxqmbzjv6iqc66c8pdk9spzgzchgmhqscgjvyhyxyqp"; + sha256 = "074i08a1zr7wjpqc7rm0k3rnq0laf0gjrcxlfvvb3qc48wdm41qd"; }; propagatedBuildInputs = [ From a41d0cb6407ba185b78a409ad212a3238fa3d6dd Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 8 Aug 2013 17:52:20 +0200 Subject: [PATCH 291/332] chromium: Drop cups_allow_deprecated.patch. It's no longer needed in current Chromium/CUPS versions. Signed-off-by: aszlig --- .../browsers/chromium/cups_allow_deprecated.patch | 14 -------------- .../networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch diff --git a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch b/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch deleted file mode 100644 index 4fd6a24cc14..00000000000 --- a/pkgs/applications/networking/browsers/chromium/cups_allow_deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/printing/printing.gyp b/printing/printing.gyp -index 19fa1b2..f11d76e 100644 ---- a/printing/printing.gyp -+++ b/printing/printing.gyp -@@ -26,6 +26,9 @@ - 'include_dirs': [ - '..', - ], -+ 'cflags': [ -+ '-Wno-deprecated-declarations', -+ ], - 'sources': [ - 'backend/print_backend.cc', - 'backend/print_backend.h', diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d2c48bc5c7c..0919f30a775 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -127,8 +127,7 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = [ userns_patch ] - ++ optional cupsSupport ./cups_allow_deprecated.patch; + patches = [ userns_patch ]; postPatch = '' sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi From f84d1fe3f51f195e9b60319125f7a7e23d00ee55 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 12:54:49 +0200 Subject: [PATCH 292/332] picard: Update to new upstream version 1.2. Changes since 1.1: - Picard now requires at least Python 2.6 - Removed support for AmpliFIND/PUIDs - Add support for the Ogg Opus file format - It's now possible to download cover images without any plugin. Cover Art Archive images can be downloaded by image type - Improved directory scanning performance - Prefer already-loaded releases of the same RG when matching files - Allow dropping new files onto specific targets - Add basic collections management support (PICARD-84) - Allow adding custom tags in the tag editing dialog (PICARD-349) - Fix replacing of Windows-incompatible characters (PICARD-393) - Save both primary and secondary release types (PICARD-240) - Handle errors from the AcoustID service better (PICARD-391) - Accept HTTPS URLs on drag-and-drop (PICARD-378) Full release announcement can be found here: http://blog.musicbrainz.org/2013/03/31/picard-1-2-released/ Signed-off-by: aszlig --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index dccb6571f4d..eaf31a76e0e 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,11 +4,11 @@ pythonPackages.buildPythonPackage rec { name = "picard-${version}"; namePrefix = ""; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; - md5 = "57abb76632a423760f336ac11da5c149"; + md5 = "d1086687b7f7b0d359a731b1a25e7b66"; }; buildInputs = [ From a3bd1be27b07375ceef0af00fb1e2867d990fc9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 17:16:56 +0200 Subject: [PATCH 293/332] redshift: Update to new upstream version 1.7. Upstream release notes: - Add Geoclue location provider by Mathieu Trudel-Lapierre. - Allow brightness to be adjusted (-b). - Provide option to set color temperature directly (Joe Hillenbrand). - Add option to show program version (-V). - Add configure.ac option to install ubuntu icons. They will no longer be installed by default (Francesco Marella). - config: Look in %userprofile%/.config/redshift.conf on windows platform. - Fix: w32gdi: Obtain a new DC handle on every adjustment. This fixes a bug where redshift stops updating the screen. Signed-off-by: aszlig --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index feced2f4538..e9fe255aea8 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "redshift"; - version = "1.6"; + version = "1.7"; name = "${pname}-${version}"; src = fetchurl { url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi"; + sha256 = "1j0hs0vnlic90cf4bryn11n4ani1x2s5l8z6ll3fmrlw98ykrylv"; }; buildInputs = [ libX11 libXrandr libXxf86vm libxcb pkgconfig python From 213ff4d38cf74411da24a6537b98342f871c7b37 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 17:18:30 +0200 Subject: [PATCH 294/332] chromium: Update beta and dev channels. This introduces the following new versions: beta: 29.0.1547.41 -> 29.0.1547.49 (builds fine, tested) dev: 30.0.1581.2 -> 30.0.1588.0 (builds fine, tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index d99d131def4..a4769d172cd 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "30.0.1581.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1581.2.tar.xz"; - sha256 = "16l0gprinxbhdsx67yaq6qwy45018v6vww0hnyji4wdzd5drkf9r"; + version = "30.0.1588.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1588.0.tar.xz"; + sha256 = "1jwc2pkd75gax8vj8wzahhpzl6ilgrlj3bcbah975yy67m7c8p13"; }; beta = { - version = "29.0.1547.41"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.41.tar.xz"; - sha256 = "0xb2y7n3qyakg08606zdaw6wf60ypx9p61g56sqhxamgd5byfsg1"; + version = "29.0.1547.49"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.49.tar.xz"; + sha256 = "03r64rydi2kbxgi2dcpslmpb716ppadqy1jzrbw39icz5xpgmg3k"; }; stable = { version = "28.0.1500.95"; From d5487fc684200717af7df89823609209683f311d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 18:34:46 +0200 Subject: [PATCH 295/332] chromaprint: Add new package in version 0.7. This is the core component of the AcoustID project and is the library for extracting/querying of audio fingerprints. Signed-off-by: aszlig --- .../libraries/chromaprint/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/chromaprint/default.nix diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix new file mode 100644 index 00000000000..2c712c5c20e --- /dev/null +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, fftw, boost }: + +stdenv.mkDerivation rec { + name = "chromaprint-${version}"; + version = "0.7"; + + src = fetchurl { + url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; + sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf"; + }; + + buildInputs = [ cmake fftw boost ]; + + meta = { + homepage = "http://acoustid.org/chromaprint"; + description = "AcoustID audio fingerprinting library"; + license = stdenv.lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9e0be1e6e..60d3855699c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3814,6 +3814,8 @@ let chmlib = callPackage ../development/libraries/chmlib { }; + chromaprint = callPackage ../development/libraries/chromaprint { }; + cil = callPackage ../development/libraries/cil { }; cilaterm = callPackage ../development/libraries/cil-aterm { From e8eea6c2c0aad111eb00c6f4aab37a137d80494d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 18:36:23 +0200 Subject: [PATCH 296/332] acoustid-fingerprinter: Add new package, v0.6. This is the commandline tool for interacting with the chromaprint library and it's needed for Picard version 1.2 (as it no longer has support for AmpliFIND/PUIDs). Signed-off-by: aszlig --- .../audio/acoustid-fingerprinter/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/audio/acoustid-fingerprinter/default.nix diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix new file mode 100644 index 00000000000..f5d4322ec93 --- /dev/null +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: + +stdenv.mkDerivation rec { + name = "acoustid-fingerprinter-${version}"; + version = "0.6"; + + src = fetchurl { + url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + + "${name}.tar.gz"; + sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; + }; + + buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; + + meta = { + homepage = "http://acoustid.org/fingerprinter"; + description = "Audio fingerprinting tool using chromaprint"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60d3855699c..15590b8448a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -386,6 +386,9 @@ let acct = callPackage ../tools/system/acct { }; + acoustidFingerprinter = callPackage + ../tools/audio/acoustid-fingerprinter { }; + aefs = callPackage ../tools/filesystems/aefs { }; aespipe = callPackage ../tools/security/aespipe { }; From edc4e8086205e9843a28535c26d82f9bdb160015 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 18:39:35 +0200 Subject: [PATCH 297/332] picard: Patch in path of AcoustED fingerprinter. That way we have the fingerprinter preselected in the configuration file and the user doesn't need to search with an "open file" dialog inside the Nix store. Signed-off-by: aszlig --- pkgs/applications/audio/picard/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index eaf31a76e0e..1ce09a6dd88 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pythonPackages, gettext, pyqt4 -, pkgconfig, libdiscid, libofa, ffmpeg }: +, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter +}: pythonPackages.buildPythonPackage rec { name = "picard-${version}"; @@ -11,6 +12,13 @@ pythonPackages.buildPythonPackage rec { md5 = "d1086687b7f7b0d359a731b1a25e7b66"; }; + postPatch = let + fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc"; + in '' + sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \ + picard/ui/options/fingerprinting.py + ''; + buildInputs = [ pkgconfig ffmpeg From 4f62f1603a562d204ad5a32d2e4e799f318595bc Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 20:47:25 +0200 Subject: [PATCH 298/332] uqm: Update video extractor to latest Git version. This updates the 3DO video extractor to the latest Git version, which should fix a too restrictive dependency on base which leads to it not compiling with current nixpkgs. Signed-off-by: aszlig --- pkgs/games/uqm/3dovideo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 4aab9aed42c..361d1d50b82 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -21,8 +21,8 @@ let src = fetchgit { url = "git://github.com/aszlig/uqm3donix.git"; - rev = "97fc4fd736dcf9fe03e6e5a2c347c5bdc71c8366"; - sha256 = "09ws6j21mxkcjx444fxkf8a3q17jj6i7h2i9pf5ky52f6xds1h0j"; + rev = "c4e43b0d2eeb15e4caa93b0ddcf6b886d1cdaf8f"; + sha256 = "15vkgqsnwqn758nb3b55gbk5fw49lakax344sj9gvkpn8vxjn10y"; }; isLibrary = false; From f67392cbca551e62da7917260ad852c212d236a0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 18:50:47 +0200 Subject: [PATCH 299/332] paramiko: Correctly call the test suite. Using setup.py, the test suite isn't run at all, because it's not referenced there. So let's call it directly. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3ae83a682e..4ee2c935fa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3619,6 +3619,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ pycrypto ]; + checkPhase = "python test.py"; + meta = { homepage = "http://www.lag.net/paramiko/"; description = "SSH2 protocol for python"; From 23a53b8dfa6e5e5173f8650e68b7593a3af6e6c6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 14 Aug 2013 18:57:06 +0200 Subject: [PATCH 300/332] windowmaker: New package in version 0.95.4. Packaged this for @devhell sometime ago and adding it here so maybe it's useful for other people using Nix(OS). Signed-off-by: aszlig --- .../window-managers/windowmaker/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/window-managers/windowmaker/default.nix diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix new file mode 100644 index 00000000000..2b146a78cb3 --- /dev/null +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, libX11, libXft, libXmu }: + +stdenv.mkDerivation rec { + name = "windowmaker-${version}"; + version = "0.95.4"; + + src = fetchurl { + url = "http://windowmaker.org/pub/source/release/" + + "WindowMaker-${version}.tar.gz"; + sha256 = "0icffqnmkkjjf412m27wljbf9vxb2ry4aiyi2pqmzw3h0pq9gsib"; + }; + + buildInputs = [ pkgconfig libX11 libXft libXmu ]; + + meta = { + homepage = "http://windowmaker.org/"; + description = "NeXTSTEP-like window manager"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15590b8448a..4694040bf24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8635,6 +8635,8 @@ let }; }; + windowmaker = callPackage ../applications/window-managers/windowmaker { }; + winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { From f15af7c8e6e938ee54dc060b8c77deeb5e7f9fdf Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 14 Aug 2013 23:37:17 +0200 Subject: [PATCH 301/332] avra-1.3.0: Assember for the Atmel AVR microcontroller family Signed-off-by: Moritz Ulrich --- pkgs/development/compilers/avra/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/compilers/avra/default.nix diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix new file mode 100644 index 00000000000..db9fafa42f1 --- /dev/null +++ b/pkgs/development/compilers/avra/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, autoconf, automake }: +stdenv.mkDerivation rec { + name = "avra-1.3.0"; + + src = fetchurl { + url = "mirror://sourceforge/avra/${name}.tar.bz2"; + sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56"; + }; + + buildInputs = [ autoconf automake ]; + + preConfigure = '' + cd src/ + + aclocal + autoconf + + touch NEWS README AUTHORS ChangeLog + automake -a + ''; + + meta = { + description = "Assember for the Atmel AVR microcontroller family"; + homepage = http://avra.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9e0be1e6e..4d0749656dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2107,6 +2107,8 @@ let aspectj = callPackage ../development/compilers/aspectj { }; + avra = callPackage ../development/compilers/avra { }; + bigloo = callPackage ../development/compilers/bigloo { }; chicken = callPackage ../development/compilers/chicken { }; From d46858d5b859a5b70312e9efad2fe9d377871292 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 01:40:09 +0200 Subject: [PATCH 302/332] Propagate failure of aggregate members --- pkgs/build-support/release/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 20dcf2fbd0c..ce5fe44c98c 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -46,7 +46,15 @@ rec { _hydraAggregate = true; } '' - echo $members > $out + mkdir -p $out/nix-support + echo $members > $out/nix-support/hydra-aggregate-members + + # Propagate build failures. + for i in $members; do + if [ -e $i/nix-support/failed ]; then + touch $out/nix-support/failed + fi + done ''; } From 68469ca342a16b1573c2892fad50b15b6bd649e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 02:29:08 +0200 Subject: [PATCH 303/332] =?UTF-8?q?releaseTools.aggregate:=20Rename=20?= =?UTF-8?q?=E2=80=98members=E2=80=99=20to=20=E2=80=98constituents=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/build-support/release/default.nix | 8 ++++---- pkgs/top-level/release.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index ce5fe44c98c..8875a8594dc 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -40,17 +40,17 @@ rec { } // args); aggregate = - { name, members, meta ? { } }: + { name, constituents, meta ? { } }: pkgs.runCommand name - { inherit members meta; + { inherit constituents meta; _hydraAggregate = true; } '' mkdir -p $out/nix-support - echo $members > $out/nix-support/hydra-aggregate-members + echo $constituents > $out/nix-support/hydra-aggregate-constituents # Propagate build failures. - for i in $members; do + for i in $constituents; do if [ -e $i/nix-support/failed ]; then touch $out/nix-support/failed fi diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9734adc3497..1aae2ce4ee2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -25,7 +25,7 @@ let unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs unstable channel"; - members = + constituents = [ jobs.tarball jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux From e822cc9c44e07e7defb273bf5f0550b111921f81 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 15 Aug 2013 13:53:43 +1000 Subject: [PATCH 304/332] p7zip: fix build on darwin --- pkgs/tools/archivers/p7zip/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 767e85d6773..ff51b28f34b 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9"; }; - preConfigure = - '' - makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - ''; + preConfigure = '' + makeFlagsArray=(DEST_HOME=$out) + buildFlags=all3 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_64bits makefile.machine + ''; enableParallelBuilding = true; From 7e2587561d75e70eb91368beb77f3436cb846727 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 09:34:40 +0200 Subject: [PATCH 305/332] uqm: Switch to using fetchurl for uqm3donix. As we now have a tagged first release, it really doesn't make sense to introduce additional dependencies by using fetchgit. Signed-off-by: aszlig --- pkgs/games/uqm/3dovideo.nix | 9 ++++----- pkgs/games/uqm/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/games/uqm/3dovideo.nix index 361d1d50b82..c52cc5ed879 100644 --- a/pkgs/games/uqm/3dovideo.nix +++ b/pkgs/games/uqm/3dovideo.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, writeText, fetchgit, haskellPackages }: +{ stdenv, requireFile, writeText, fetchurl, haskellPackages }: with stdenv.lib; @@ -19,10 +19,9 @@ let pname = "uqm3donix"; version = "0.1.0.0"; - src = fetchgit { - url = "git://github.com/aszlig/uqm3donix.git"; - rev = "c4e43b0d2eeb15e4caa93b0ddcf6b886d1cdaf8f"; - sha256 = "15vkgqsnwqn758nb3b55gbk5fw49lakax344sj9gvkpn8vxjn10y"; + src = fetchurl { + url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz"; + sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb"; }; isLibrary = false; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 1f82c75f9cf..657d3f5b3e2 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -2,15 +2,15 @@ , pkgconfig, mesa , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip , use3DOVideos ? false, requireFile ? null, writeText ? null -, fetchgit ? null, haskellPackages ? null +, haskellPackages ? null }: assert use3DOVideos -> requireFile != null && writeText != null - && fetchgit != null && haskellPackages != null; + && haskellPackages != null; let videos = import ./3dovideo.nix { - inherit stdenv requireFile writeText fetchgit haskellPackages; + inherit stdenv requireFile writeText fetchurl haskellPackages; }; in stdenv.mkDerivation rec { name = "uqm-${version}"; From 5b421a86f6cbc5023fd83111b32e6c9387f9cf21 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 09:42:34 +0200 Subject: [PATCH 306/332] uqm: Convert base16 SHA256 hashes to base32. We want to have shorter SHAs, don't we? :-) Signed-off-by: aszlig --- pkgs/games/uqm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 657d3f5b3e2..e68ac77d871 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -18,22 +18,22 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz"; - sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"; + sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3"; }; content = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm"; - sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf"; + sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq"; }; voice = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm"; - sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979"; + sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w"; }; music = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm"; - sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82"; + sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65"; }; From 80673a70e7e7ec99b32db27ea53226298b6264be Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 10:32:40 +0200 Subject: [PATCH 307/332] uqm: Add an option to use the remix packs. The remix packs are a collection of newly remixed versions of the old music from the PC/3DO versions. By using useRemixPacks these are fetched as well and added to the game. Signed-off-by: aszlig --- pkgs/games/uqm/default.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index e68ac77d871..ef89477ff4d 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,17 +1,34 @@ { stdenv, fetchurl , pkgconfig, mesa , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip + , use3DOVideos ? false, requireFile ? null, writeText ? null , haskellPackages ? null + +, useRemixPacks ? false }: assert use3DOVideos -> requireFile != null && writeText != null && haskellPackages != null; +with stdenv.lib; + let videos = import ./3dovideo.nix { inherit stdenv requireFile writeText fetchurl haskellPackages; }; + + remixPacks = imap (num: sha256: fetchurl rec { + name = "uqm-remix-disc${toString num}.uqm"; + url = "mirror://sourceforge/sc2/${name}"; + inherit sha256; + }) [ + "1s470i6hm53l214f2rkrbp111q4jyvnxbzdziqg32ffr8m3nk5xn" + "1pmsq65k8gk4jcbyk3qjgi9yqlm0dlaimc2r8hz2fc9f2124gfvz" + "07g966ylvw9k5q9jdzqdczp7c5qv4s91xjlg4z5z27fgcs7rzn76" + "1l46k9aqlcp7d3fjkjb3n05cjfkxx8rjlypgqy0jmdx529vikj54" + ]; + in stdenv.mkDerivation rec { name = "uqm-${version}"; version = "0.7.0"; @@ -50,7 +67,9 @@ in stdenv.mkDerivation rec { cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm - '' + stdenv.lib.optionalString use3DOVideos '' + '' + optionalString useRemixPacks (concatMapStrings (disc: '' + cp "${disc}" "uqm-$version/content/addons/${disc.name}" + '') remixPacks) + optionalString use3DOVideos '' ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ''; @@ -84,6 +103,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming ]; }; } From 3fbd3a025d7fd30d96ba396488b8f64fb8086bbd Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 10:37:21 +0200 Subject: [PATCH 308/332] uqm: Symlink addons and packages. Copying these over to the output path of the main derivation will just unnecessarily blow up the size of it with files we already have in the store anyway. Signed-off-by: aszlig --- pkgs/games/uqm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index ef89477ff4d..4d573c691f7 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -64,11 +64,11 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -p uqm-${version}/content/packages mkdir -p uqm-${version}/content/addons - cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm - cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm - cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm + ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm" + ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm" + ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm" '' + optionalString useRemixPacks (concatMapStrings (disc: '' - cp "${disc}" "uqm-$version/content/addons/${disc.name}" + ln -s "${disc}" "uqm-$version/content/addons/${disc.name}" '') remixPacks) + optionalString use3DOVideos '' ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ''; From e76a755517bb1a995b121e5a84a28bf4ba298abc Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 10:40:35 +0200 Subject: [PATCH 309/332] uqm: Add myself to the maintainers list. Signed-off-by: aszlig --- pkgs/games/uqm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 4d573c691f7..07055c41558 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -103,6 +103,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; - maintainers = with maintainers; [ jcumming ]; + maintainers = with maintainers; [ jcumming aszlig ]; }; } From 9faad8f2743388a2d597323468ace90cd3496204 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 15 Aug 2013 11:08:26 +0200 Subject: [PATCH 310/332] chromium: Fix meta.description attribute. The description now no longer contains the package name itself. Thanks to nixpkgs-lint for noticing :-) Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0919f30a775..df2a8ca5ce7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -215,7 +215,7 @@ in stdenv.mkDerivation rec { ''; meta = { - description = "Chromium, an open source web browser"; + description = "An open source web browser from Google"; homepage = http://www.chromium.org/; maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; From e2baa14addbe91d620792c02cc8a1b80b25dd0ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Aug 2013 12:25:03 +0200 Subject: [PATCH 311/332] xxdiff: update to version 4.0 --- .../development/tools/misc/xxdiff/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index ac1bc2f1abc..36047210a92 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchhg, qt4, flex, bison, docutils }: +{ stdenv, fetchurl, qt4, flex, bison, docutils }: -stdenv.mkDerivation { - name = "xxdiff-2013.03.08"; +stdenv.mkDerivation rec { + name = "xxdiff-4.0"; - src = fetchhg { - name = "xxdiff"; - tag = "6a86d8353eef"; - url = https://hg.furius.ca/public/xxdiff; - sha256 = "1c1krgmf1cfkrmg48w6zw61wgy01xm171ifkkh6givm8v6c8i340"; + src = fetchurl { + url = "mirror://sourceforge/xxdiff/${name}.tar.bz2"; + sha256 = "0c0k8cwxyv5byw7va1n9iykvypv435j0isvys21rkj1bx121al4i"; }; nativeBuildInputs = [ flex bison qt4 docutils ]; @@ -16,14 +14,16 @@ stdenv.mkDerivation { QMAKE = "qmake"; - configurePhase = - '' - cd src - make -f Makefile.bootstrap - ''; + configurePhase = "cd src; make -f Makefile.bootstrap"; installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; - meta.platforms = stdenv.lib.platforms.linux; + meta = { + homepage = "http://furius.ca/xxdiff/"; + description = "graphical file and directories comparator and merge tool"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = []; + }; } From b85984d8401b19c93bf1731f915725889bf4cc9e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 15 Aug 2013 14:05:43 +0200 Subject: [PATCH 312/332] linux-3.10: upgrade to 3.10.7 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index ef36e63fa07..be77c02d0a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.5"; + version = "3.10.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0p1nmk5mikvqi2b6wzlbb0fnrv30p5qazgnqlxgifsf4pmh1x279"; + sha256 = "15f7f7hgiryxvqnmyan1r6j4klfgm2r3jfqb4a00j14jiqyn7ni1"; }; features.iwlwifi = true; From 48e89259b10dde643e07b9fbc760f0223e739545 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 15 Aug 2013 14:32:25 +0200 Subject: [PATCH 313/332] pypi2nix should only be avaliable for python27 --- pkgs/top-level/python-packages.nix | 42 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ee2c935fa0..358d90591fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -53,25 +53,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { inherit python setuptools; }; - pypi2nix = buildPythonPackage rec { - rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; - name = "pypi2nix-1.0_${rev}"; - - src = fetchurl { - url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; - }; - - propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; - doCheck = false; - - meta = { - homepage = https://github.com/garbas/pypi2nix; - description = ""; - maintainers = [ stdenv.lib.maintainers.garbas ]; - }; - }; # packages defined elsewhere blivet = callPackage ../development/python-modules/blivet { }; @@ -6987,4 +6968,27 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; +# python2.7 specific eggs +} // pkgs.lib.optionalAttrs (python.majorVersion == "2.7") { + + pypi2nix = pythonPackages.buildPythonPackage rec { + rev = "e231db7e8874d4543a6f0fffc46c0fffbe6108c5"; + name = "pypi2nix-1.0_${rev}"; + + src = pkgs.fetchurl { + url = "https://github.com/garbas/pypi2nix/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "0wqk6milnagr0b0v8igjp8p25d5y63pki3pkdy7hbgjxvyw8wril"; + }; + + propagatedBuildInputs = [ pythonPackages."Distutils2-1.0a4" ]; + doCheck = false; + + meta = { + homepage = https://github.com/garbas/pypi2nix; + description = ""; + maintainers = [ pkgs.stdenv.lib.maintainers.garbas ]; + }; + }; + }; in pythonPackages From 63d096bc46dc8664f26c5277f46458f68bf453b8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 15 Aug 2013 09:23:00 -0400 Subject: [PATCH 314/332] libjson: Update to 7.6.1 Signed-off-by: Shea Levy --- pkgs/development/libraries/libjson/default.nix | 15 +++++++++------ .../libraries/libjson/install-fix.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/libjson/install-fix.patch diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index f49c885c066..a22ae64dfde 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,13 +1,16 @@ { stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "libjson-7.4.0"; +let + version = "7.6.1"; +in stdenv.mkDerivation rec { + name = "libjson-${version}"; src = fetchurl { - url = "mirror://sourceforge/libjson/libjson_7.4.0.zip"; - sha256 = "0rd6m3r3acm7xq6f0mbyyhc3dnwmiga60cws29yjl6nx2f9h3r0x"; + url = "mirror://sourceforge/libjson/libjson_${version}.zip"; + sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; }; + patches = [ ./install-fix.patch ]; buildInputs = [ unzip ]; - makeFlags = "prefix=$out"; + makeFlags = [ "prefix=$(out)" ]; + preInstall = "mkdir -p $out/lib"; meta = { homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/development/libraries/libjson/install-fix.patch new file mode 100644 index 00000000000..f074c8ba3aa --- /dev/null +++ b/pkgs/development/libraries/libjson/install-fix.patch @@ -0,0 +1,12 @@ +diff -Naur libjson-orig/makefile libjson/makefile +--- libjson-orig/makefile 2012-05-30 05:15:42.000000000 -0400 ++++ libjson/makefile 2013-08-15 09:17:41.154245534 -0400 +@@ -266,7 +266,7 @@ + cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir) + chmod -R a+r $(include_path)/$(libname_hdr) + find $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \; +- cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir) ++ cp -rv $(srcdir)/../Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir)/.. + @echo "Install header files: Done." + + clean: banner From ddb8b7f83136f64cff21adb3dcd300b742f4443f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 15 Aug 2013 09:57:07 -0400 Subject: [PATCH 315/332] Make all node packages available at the top level via their real name/version Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 5719967c4c5..13316e28d73 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -15,7 +15,10 @@ let else []; in depsOr; all = pkgs.lib.fold (pkg: { top-level, full }: { - top-level = top-level ++ pkgs.lib.optional pkg.topLevel { + top-level = top-level ++ [ { + name = "${pkg.name}-${pkg.version}"; + value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full); + } ] ++ pkgs.lib.optional pkg.topLevel { name = pkg.name; value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full); }; From 47c9825c2dbfb21596d69088149d2bb9ccd0194e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 15 Aug 2013 16:01:36 +0200 Subject: [PATCH 316/332] Update boto to 2.9.9 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 358d90591fa..421efb6de5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -536,11 +536,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { boto = buildPythonPackage rec { - name = "boto-2.6.0"; + name = "boto-${version}"; + version = "2.9.9"; src = fetchurl { - url = "https://github.com/downloads/boto/boto/${name}.tar.gz"; - sha256 = "1wnzs9frf44mrnw7l2vijc5anbcvcqqrv7237gjn27v0ja76slff"; + url = "https://github.com/boto/boto/archive/${version}.tar.gz"; + sha256 = "18wqpzd1zf8nivcn2rl1wnladf7hhyy5p75b5l6kafynm4l9j6jq"; }; # The tests seem to require AWS credentials. From a218b2d3cb1ba9c450b2513cfe7e2f85998144b5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 16:10:34 +0200 Subject: [PATCH 317/332] xfce: Fix missing icons Xfce didn't have a default value for its icon theme, so most icons were missing until the user explicitly selected an icon theme in the appearance settings. Example: http://hydra.nixos.org/build/5717570/download/1/screen.png This patch sets the Rodent theme as the default (which used to be the case on NixOS). http://lists.freebsd.org/pipermail/freebsd-ports/2012-June/076349.html http://www.freebsd.org/cgi/query-pr.cgi?pr=168688 --- .../core/xfce4-settings-default-icon-theme.patch | 12 ++++++++++++ pkgs/desktops/xfce/core/xfce4-settings.nix | 6 +++++- pkgs/desktops/xfce/default.nix | 2 -- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch new file mode 100644 index 00000000000..51ac265dcb1 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' xfce4-settings-4.10.1/xfsettingsd/xsettings.xml xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml +--- xfce4-settings-4.10.1/xfsettingsd/xsettings.xml 2013-05-05 18:12:54.000000000 +0200 ++++ xfce4-settings-4.10.1-new/xfsettingsd/xsettings.xml 2013-08-15 15:57:48.538586286 +0200 +@@ -7,7 +7,7 @@ + + + +- ++ + + + diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index d597237e32b..2e76b22510f 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; sha256 = "1m8k9s7qihwkkbjrrkmk103a6iwahxdfq65aswrsbqshx9cnk2hi"; }; + name = "${p_name}-${ver_maj}.${ver_min}"; + patches = [ ./xfce4-settings-default-icon-theme.patch ]; + buildInputs = [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon - #gtk libxfce4util libxfcegui4 libwnck dbus_glib + #gtk libxfce4util libxfcegui4 libwnck dbus_glib #xfconf libglade xorg.iceauth ]; + configureFlags = "--enable-pluggable-dialogs --enable-sound-settings"; meta = { diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index e5daaca9d52..7ac61abb87b 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -48,12 +48,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; - #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; From 91bb940160427792d4515391c55fde2b4c108cb0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 16:37:30 +0200 Subject: [PATCH 318/332] mousepad: Don't segfault at startup --- pkgs/desktops/xfce/applications/mousepad.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 9bc9634469c..5248d6567d2 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -12,10 +12,14 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ - pkgconfig intltool libxfce4util libxfcegui4 - gtk gtksourceview dbus dbus_glib - ]; + buildInputs = + [ pkgconfig intltool libxfce4util libxfcegui4 + gtk gtksourceview dbus dbus_glib + ]; + + # Propagate gtksourceview into $XDG_DATA_DIRS to provide syntax + # highlighting (in fact Mousepad segfaults without it). + propagatedUserEnvPkgs = [ gtksourceview ]; meta = { homepage = http://www.xfce.org/; From 50b2e52988feae91c6ea81db03fb9277e9350211 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 16:53:40 +0200 Subject: [PATCH 319/332] hicolor-icon-theme: Move to data/icons --- pkgs/data/{misc => icons}/hicolor-icon-theme/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/data/{misc => icons}/hicolor-icon-theme/default.nix (100%) diff --git a/pkgs/data/misc/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix similarity index 100% rename from pkgs/data/misc/hicolor-icon-theme/default.nix rename to pkgs/data/icons/hicolor-icon-theme/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e37c4ba00f..578022c4f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6975,7 +6975,7 @@ let inherit (gnome3) gsettings_desktop_schemas; - hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { }; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; From 3a008f7a1d723a3b701cc525da46aa01f2baeb8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Aug 2013 18:01:16 +0200 Subject: [PATCH 320/332] tango-icon-theme: Add --- pkgs/data/icons/tango-icon-theme/default.nix | 22 ++++++++++++ .../icons/tango-icon-theme/rsvg-convert.patch | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 pkgs/data/icons/tango-icon-theme/default.nix create mode 100644 pkgs/data/icons/tango-icon-theme/rsvg-convert.patch diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix new file mode 100644 index 00000000000..57a6718669b --- /dev/null +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg }: + +stdenv.mkDerivation rec { + name = "tango-icon-theme-0.8.90"; + + src = fetchurl { + url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f"; + }; + + patches = [ ./rsvg-convert.patch ]; + + buildInputs = [ intltool pkgconfig iconnamingutils imagemagick librsvg ]; + + configureFlags = "--enable-png-creation"; + + meta = { + description = "A basic set of icons"; + homepage = http://tango.freedesktop.org/Tango_Icon_Library; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch b/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch new file mode 100644 index 00000000000..ee3d00ccf3e --- /dev/null +++ b/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch @@ -0,0 +1,34 @@ +Based on https://build.opensuse.org/package/view_file?file=tango-icon-theme-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3A12.2&rev=faf71bf8278d5df6ec8a31726e5b8542 + +diff -ru -x '*~' tango-icon-theme-0.8.90/configure tango-icon-theme-0.8.90-new/configure +--- tango-icon-theme-0.8.90/configure 2009-02-26 04:08:00.000000000 +0100 ++++ tango-icon-theme-0.8.90-new/configure 2013-08-15 17:54:24.167065399 +0200 +@@ -6554,7 +6554,7 @@ + enable_large_bitmaps=no + fi + if test "x$enable_large_bitmaps" = "xyes"; then +- svgconvert_prog="rsvg" ++ svgconvert_prog="rsvg-convert" + else + svgconvert_prog="ksvgtopng" + fi +diff -ru -x '*~' tango-icon-theme-0.8.90/svg2png.sh.in tango-icon-theme-0.8.90-new/svg2png.sh.in +--- tango-icon-theme-0.8.90/svg2png.sh.in 2007-02-16 21:04:29.000000000 +0100 ++++ tango-icon-theme-0.8.90-new/svg2png.sh.in 2013-08-15 17:54:08.275084837 +0200 +@@ -9,12 +9,14 @@ + + ICONFILE=`basename ${3}` + ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"` +-if test `basename $SVGCONVERT` = "rsvg"; then ++if test `basename $SVGCONVERT` = "rsvg-convert"; then + OPTIONS="-w ${1} -h ${1}" ++ OUTPUT="-o" + else + OPTIONS="${1} ${1}" ++ OUTPUT="" + fi + + echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png" +-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png ++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578022c4f6c..cd1f609a9c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7021,6 +7021,8 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; + themes = name: import (../data/misc/themes + ("/" + name + ".nix")) { inherit fetchurl; }; From cf24550e9110ca87aa866312c9fbbddd840190ec Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 15 Aug 2013 23:14:36 +0200 Subject: [PATCH 321/332] Update inotool and fix `ino upload'. 0.3.5 is just a patch-release (no code changes). More important is the patch to the upload-command. It now uses the nix-supplied avrdude instead of some random avrdude it finds (in the arduino distribution or wherever). Signed-off-by: Moritz Ulrich --- pkgs/development/arduino/ino/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 100b3aa87f1..95afc8f708f 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, minicom , avrdude, arduino_core, avrgcclibc }: -buildPythonPackage { - name = "ino-0.3.4"; +buildPythonPackage rec { + name = "ino-0.3.5"; namePrefix = ""; src = fetchurl { - url = "http://pypi.python.org/packages/source/i/ino/ino-0.3.4.tar.gz"; + url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz"; sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; }; @@ -23,12 +23,17 @@ buildPythonPackage { requirements.txt sed -i -e 's@from ordereddict@from collections@' \ ino/environment.py ino/utils.py + + # Patch the upload command so it uses the correct avrdude + substituteInPlace ino/commands/upload.py \ + --replace "self.e['avrdude']" "'${avrdude}/bin/avrdude'" \ + --replace "'-C', self.e['avrdude.conf']," "" ''; meta = { description = "Command line toolkit for working with Arduino hardware"; homepage = http://inotool.org/; - license = "MIT"; - maintainers = [ stdenv.lib.maintainers.antono ]; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; }; } From a0d4c09445bbe752dbe691c382bbe5a2961b2172 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Aug 2013 11:52:10 +0200 Subject: [PATCH 322/332] Fix Nixpkgs evaluation http://hydra.nixos.org/build/5722962 --- 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 cd1f609a9c7..b6073b6c0d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8597,7 +8597,7 @@ let # so that we can use gccApple if we're building on darwin inherit stdenvAdapters gccApple; }; - vimLatest = lowPrio (vim_configurable.override { source = "latest"; }); + vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; From 5cb688eb52d680d22be2b4f84827eb80afd957e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Aug 2013 12:05:42 +0200 Subject: [PATCH 323/332] linux: Update to 3.4.58 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 1300f74f216..74304f5239c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.56"; + version = "3.4.58"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1br23nmfrd8r13ad5n79qlndl8s0db89hjp8zrhdz8nzf9jabsjp"; + sha256 = "11kcxlchiz7ks61yqj29dy2mnncfxcc7qr563wby1k58rvwf8g74"; }; features.iwlwifi = true; From bf1c37494eccdcb9e40e8d4a0d6154d6b6dc0e18 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 16 Aug 2013 13:20:59 +0200 Subject: [PATCH 324/332] Moved reference to iPhone SDKs to the wrapper that proxies to Xcode --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 3 +-- pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 03ed90c40d5..7c98ce76a1a 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,7 +1,6 @@ {stdenv, xcodewrapper}: { name, appName ? null, app , device ? "iPhone", baseDir ? "" -, sdkRoot ? "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" , sdkVersion ? "6.1" }: @@ -16,7 +15,7 @@ stdenv.mkDerivation { #! ${stdenv.shell} -e cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot '${sdkRoot}/iPhoneSimulator${sdkVersion}.sdk' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk" EOF chmod +x $out/bin/run-test-simulator ''; diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 77d2c4c867e..1cbab99e365 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation { ln -s /usr/bin/security ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + cd .. + ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" + # Check if we have the xcodebuild version that we want if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ] then From 617595427191e6a3bf3d5c418dae4a258f8686a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Aug 2013 13:37:05 +0200 Subject: [PATCH 325/332] Revert "libav: major update and refactoring" This reverts commit b0031380816d5b1f9767bc62a799083790e69a7e because it breaks Nixpkgs evaluation with "error: attribute `cross.config' missing". http://hydra.nixos.org/build/5725600 --- pkgs/development/libraries/libav/0.8.x.nix | 12 -- pkgs/development/libraries/libav/default.nix | 128 +++++++------------ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 48 insertions(+), 96 deletions(-) delete mode 100644 pkgs/development/libraries/libav/0.8.x.nix diff --git a/pkgs/development/libraries/libav/0.8.x.nix b/pkgs/development/libraries/libav/0.8.x.nix deleted file mode 100644 index 724a43a81e0..00000000000 --- a/pkgs/development/libraries/libav/0.8.x.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, libav_9 }: - -let derivSrc = libav_9.derivSrc // rec { - name = "libav-0.8.8"; - - src = fetchurl { - url = "http://libav.org/releases/${name}.tar.xz"; - sha256 = "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; - }; -}; -in stdenv.mkDerivation derivSrc - diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 705ef9ae5a6..3fb1650bf46 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -1,86 +1,59 @@ -{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib -, mp3Support ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, vorbisSupport ? true, libvorbis ? null -, vpxSupport ? true, libvpx ? null -, x264Support ? false, x264 ? null -, xvidSupport ? true, xvidcore ? null -, faacSupport ? false, faac ? null -, vaapiSupport ? false, libva ? null # ToDo: it has huge closure -, vdpauSupport ? true, libvdpau ? null -, freetypeSupport ? true, freetype ? null # it's small and almost everywhere -, SDL # only for avplay in $tools, adds nontrivial closure to it -, enableGPL ? true # ToDo: some additional default stuff may need GPL -, enableUnfree ? faacSupport +{ stdenv, fetchurl, pkgconfig, yasm, xz +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? false, x264 ? null +, xvidSupport ? true, xvidcore ? null +, faacSupport ? false, faac ? null }: -assert faacSupport -> enableUnfree; - -with { inherit (stdenv.lib) optional optionals; }; - -/* ToDo: - - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools - - maybe do some more splitting into outputs -*/ - -let derivSrc = rec { # derivSrc is exported and re-used by expressions for older versions - name = "libav-9.8"; +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +stdenv.mkDerivation rec { + name = "libav-0.7"; + src = fetchurl { url = "http://libav.org/releases/${name}.tar.xz"; - sha256 = "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3"; + sha256 = "04pl6y53xh6xmwzz0f12mg5vh62ylp5zwwinj6dxzd8pnbjg4lsz"; }; - configureFlags = - assert stdenv.lib.all (x: x!=null) buildInputs; - [ - #"--enable-postproc" # it's now a separate package in upstream - "--disable-avserver" # upstream says it's in a bad state - "--enable-avplay" + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffserver" + "--disable-ffplay" "--enable-shared" "--enable-runtime-cpudetect" ] - ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ] - ++ optional mp3Support "--enable-libmp3lame" - ++ optional speexSupport "--enable-libspeex" - ++ optional theoraSupport "--enable-libtheora" - ++ optional vorbisSupport "--enable-libvorbis" - ++ optional vpxSupport "--enable-libvpx" - ++ optional x264Support "--enable-libx264" - ++ optional xvidSupport "--enable-libxvid" - ++ optional faacSupport "--enable-libfaac --enable-nonfree" - ++ optional vaapiSupport "--enable-vaapi" - ++ optional vdpauSupport "--enable-vdpau" - ++ optional freetypeSupport "--enable-libfreetype" - ; + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 SDL ] - ++ optional mp3Support lame - ++ optional speexSupport speex - ++ optional theoraSupport libtheora - ++ optional vorbisSupport libvorbis - ++ optional vpxSupport libvpx - ++ optional x264Support x264 - ++ optional xvidSupport xvidcore - ++ optional faacSupport faac - ++ optional vaapiSupport libva - ++ optional vdpauSupport libvdpau - ++ optional freetypeSupport freetype - ; - - enableParallelBuilding = true; - - outputs = [ "out" "tools" ]; - - postInstall = '' - mkdir -p "$tools/bin" - mv "$out/bin/avplay" "$tools/bin" - cp -s "$out"/bin/* "$tools/bin/" - ''; - - doInstallCheck = true; - installCheckTarget = "check"; # tests need to be run *after* installation + buildInputs = [ pkgconfig lame yasm ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional faacSupport faac; crossAttrs = { dontSetConfigureCross = true; @@ -92,15 +65,8 @@ let derivSrc = rec { # derivSrc is exported and re-used by expressions for older ]; }; - passthru = { inherit derivSrc vdpauSupport; }; - - meta = with stdenv.lib; { + meta = { homepage = http://libav.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; - license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? - else if enableGPL then gpl2Plus else lgpl21Plus; - platforms = platforms.all; }; -}; -in stdenv.mkDerivation derivSrc - +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6073b6c0d5..28346be2505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4471,9 +4471,7 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = libav_9; - libav_9 = callPackage ../development/libraries/libav { }; - libav_0_8 = callPackage ../development/libraries/libav/0.8.x.nix { }; + libav = callPackage ../development/libraries/libav { }; libavc1394 = callPackage ../development/libraries/libavc1394 { }; From 330219d0c4778413ec2b68d9b655316ceeb48ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 16 Aug 2013 13:56:54 +0200 Subject: [PATCH 326/332] add thunar-archive-plugin --- pkgs/desktops/xfce/common.nix | 12 ++++++---- .../xfce/core/thunar-archive-plugin.nix | 23 +++++++++++++++++++ pkgs/desktops/xfce/default.nix | 1 + 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/xfce/core/thunar-archive-plugin.nix diff --git a/pkgs/desktops/xfce/common.nix b/pkgs/desktops/xfce/common.nix index 8be4ac09e14..a7e64707f91 100644 --- a/pkgs/desktops/xfce/common.nix +++ b/pkgs/desktops/xfce/common.nix @@ -52,11 +52,13 @@ #### APPLICATIONS #TODO: correct links; more stuff - xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; }; - gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; }; - xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; }; - mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; }; - thunar_volman = callPackage ./core/thunar-volman.nix { }; + xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { v= "0.2.2"; h= "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; }; + gigolo = callPackage ./applications/gigolo.nix { v= "0.4.1"; h= "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; }; + xfce4taskmanager = callPackage ./applications/xfce4-taskmanager.nix { v= "1.0.0"; h= "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; }; + mousepad = callPackage ./applications/mousepad.nix { v= "0.3.0"; h= "0v84zwhjv2xynvisn5vmp7dbxfj4l4258m82ks7hn3adk437bwhh"; }; + thunar_volman = callPackage ./core/thunar-volman.nix { }; + thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; + #### ART diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix new file mode 100644 index 00000000000..62b04caaa34 --- /dev/null +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }: + +stdenv.mkDerivation rec { + name = "thunar-archive-plugin-${version}"; + maj_ver = "0.3"; + version = "${maj_ver}.1"; + + src = fetchurl { + url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2"; + sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; + }; + + buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ]; + enableParallelBuilding = true; + + meta = { + homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; + description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 7ac61abb87b..a6107d0a870 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -24,6 +24,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now + thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; From eb97daf88d1153823e8b7ecf0063fcc1b180966e Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Wed, 14 Aug 2013 13:00:59 +0200 Subject: [PATCH 327/332] networking: Add bwm-ng expression. --- pkgs/tools/networking/bwm-ng/default.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/networking/bwm-ng/default.nix diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix new file mode 100644 index 00000000000..88460d86730 --- /dev/null +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "bwm-ng-0.6"; + + src = fetchurl { + url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; + sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; + }; + + buildInputs = [ ncurses ]; + + meta = with stdenv.lib; { + description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor."; + homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; + license = licenses.gpl2; + platforms = platforms.unix; + + longDescription = '' + Features + + supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, devstat and libstatgrab + unlimited number of interfaces/devices supported + interfaces/devices are added or removed dynamically from list + white-/blacklist of interfaces/devices + output of KB/s, Kb/s, packets, errors, average, max and total sum + output in curses, plain console, CSV or HTML + configfile + + Short list of changes since 0.5 (for full list read changelog): + + curses2 output, a nice bar chart + disk input for bsd/macosx/linux/solaris + win32 network bandwidth support + moved to autotools + alot fixes + + Info + This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. + + I actually dont know if netstat input is usefull at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. + + (from homepage) + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28346be2505..74334d9c6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -525,6 +525,8 @@ let btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; + byobu = callPackage ../tools/misc/byobu { }; catdoc = callPackage ../tools/text/catdoc { }; From a7a9676e60a8aa0d06d3aefdd6c191c374aa47ef Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Fri, 16 Aug 2013 17:55:34 +0200 Subject: [PATCH 328/332] Add unix-bytestring haskell library --- .../libraries/haskell/unix-bytestring/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unix-bytestring/default.nix diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix new file mode 100644 index 00000000000..49022b12a29 --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unix-bytestring"; + version = "0.3.6"; + sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap"; + meta = { + homepage = "http://code.haskell.org/~wren/"; + description = "Unix/Posix-specific functions for ByteStrings"; + 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 051346b4245..e63b2b00694 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1996,6 +1996,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; + unixBytestring = callPackage ../development/libraries/haskell/unix-bytestring {}; + unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {}; From d169b3600f75da58bbc8748ab4e19b2d1c425010 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Fri, 16 Aug 2013 18:18:19 +0200 Subject: [PATCH 329/332] Fix HFuse compilation with GHC 7.6.3 --- pkgs/development/libraries/haskell/HFuse/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 64943d5e1c1..67e3a4157b7 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -8,6 +8,11 @@ cabal.mkDerivation (self: { preConfigure = '' sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal + sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc + sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc + sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc + sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc + sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc ''; meta = { From a8185ff379d9ef6252c79c91e51e5f6ef64c2c37 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 16 Aug 2013 22:26:34 +0300 Subject: [PATCH 330/332] ino: fix hash --- pkgs/development/arduino/ino/default.nix | 2 +- .../libraries/libkolab/default.nix | 25 +++++++++++++++++++ .../libraries/libkolabxml/default.nix | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libkolab/default.nix create mode 100644 pkgs/development/libraries/libkolabxml/default.nix diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 95afc8f708f..e77c2251b36 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchurl { url = "http://pypi.python.org/packages/source/i/ino/${name}.tar.gz"; - sha256 = "1v7z3da31cv212k28aci269qkg92p377fm7i76rymjjpjra7payv"; + sha256 = "1j2qzcjp6r2an1v431whq9l47s81d5af6ni8j87gv294f53sl1ab"; }; # TODO: add avrgcclibc, it must be rebuild with C++ support diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix new file mode 100644 index 00000000000..3475b22d26d --- /dev/null +++ b/pkgs/development/libraries/libkolab/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, + cmake, qt4, clucene_core, librdf_redland, libiodbc +, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libkolab-0.4.2"; + + src = fetchurl { + url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz"; + sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6"; + }; + + # We disable the Java backend, since we do not need them and they make the closure size much bigger +# buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; + + nativeBuildInputs = [ cmake ]; + + meta = { + homepage = http://soprano.sourceforge.net/; + description = "An object-oriented C++/Qt4 framework for RDF data"; + license = "LGPL"; + maintainers = with stdenv.lib.maintainers; [ phreedo ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix new file mode 100644 index 00000000000..c0217abd786 --- /dev/null +++ b/pkgs/development/libraries/libkolabxml/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4 +#, qt4, clucene_core, librdf_redland, libiodbc +, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libkolabxml-0.8.4"; + + src = fetchurl { + url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz"; + sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q"; + }; + + buildInputs = [ boost curl xercesc ]; +# buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; + + nativeBuildInputs = [ cmake ]; + + meta = { + homepage = http://soprano.sourceforge.net/; + description = "An object-oriented C++/Qt4 framework for RDF data"; + license = "LGPL"; + maintainers = with stdenv.lib.maintainers; [ phreedo ]; + inherit (qt4.meta) platforms; + }; +} From 595b8dbab91bc94d2e08dcf4b6408a2d2891de41 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Aug 2013 15:24:59 -0400 Subject: [PATCH 331/332] Revert "Make all node packages available at the top level via their real name/version" This makes attributes visible to nix-env that can't actually be specified with -A, which is why there is a separate top-level in the first place, duh. This reverts commit ddb8b7f83136f64cff21adb3dcd300b742f4443f. Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 13316e28d73..5719967c4c5 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -15,10 +15,7 @@ let else []; in depsOr; all = pkgs.lib.fold (pkg: { top-level, full }: { - top-level = top-level ++ [ { - name = "${pkg.name}-${pkg.version}"; - value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full); - } ] ++ pkgs.lib.optional pkg.topLevel { + top-level = top-level ++ pkgs.lib.optional pkg.topLevel { name = pkg.name; value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full); }; From a94065196899a1d401c8ef68c571186686cdf553 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Aug 2013 22:45:12 +0200 Subject: [PATCH 332/332] liblapack: add myself as a maintainer and enable Hydra builds (in stdenv-updates) --- .../development/libraries/science/math/liblapack/default.nix | 5 ++++- pkgs/top-level/release-small.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index e54eaba4f15..f1c99397452 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -38,7 +38,10 @@ stdenv.mkDerivation { meta = { description = "Linear Algebra PACKage"; - license = "revised-BSD"; homepage = "http://www.netlib.org/lapack/"; + license = "revised-BSD"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index f7fc9932f67..bad99175714 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -93,6 +93,7 @@ with (import ./release-lib.nix); qemu_kvm = linux; less = all; lftp = all; + liblapack = linux; libtool = all; libtool_2 = all; libxml2 = all;