From afcda36c4653ac3e1aea2e842a9e71f3fdbe07e8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 26 Aug 2013 19:16:18 +0000 Subject: [PATCH 001/193] mplayer: add fontconfig support --- pkgs/applications/video/mplayer/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 2051590a819..6d8780d6cf4 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, freetype, pkgconfig, yasm, freefont_ttf +{ stdenv, fetchurl, pkgconfig, freetype, yasm +, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -22,6 +23,8 @@ , useUnfreeCodecs ? false }: +assert fontconfigSupport -> (fontconfig != null); +assert (!fontconfigSupport) -> (freefont_ttf != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); @@ -95,7 +98,8 @@ stdenv.mkDerivation rec { ''; buildInputs = with stdenv.lib; - [ freetype pkgconfig ] + [ pkgconfig freetype ] + ++ optional fontconfigSupport fontconfig ++ optionals x11Support [ libX11 libXext mesa ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv @@ -125,6 +129,8 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; '' + --enable-freetype + ${if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig"} ${if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl"} ${if xineramaSupport then "--enable-xinerama" else "--disable-xinerama"} ${if xvSupport then "--enable-xv" else "--disable-xv"} @@ -144,7 +150,6 @@ stdenv.mkDerivation rec { ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} - --enable-freetype --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc @@ -153,14 +158,17 @@ stdenv.mkDerivation rec { --disable-ossaudio ''; - NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + NIX_LDFLAGS = with stdenv.lib; + optional fontconfigSupport "-lfontconfig" + ++ optionals x11Support [ "-lX11" "-lXext" ] + ; installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; enableParallelBuilding = true; - # Provide a reasonable standard font. Maybe we should symlink here. - postInstall = + # Provide a reasonable standard font when not using fontconfig. Maybe we should symlink here. + postInstall = stdenv.lib.optionalString (!fontconfigSupport) '' mkdir -p $out/share/mplayer cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf From c183c7b3ec282c56b3b9943ce0496281f3b15cec Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Mon, 2 Sep 2013 18:47:20 +0200 Subject: [PATCH 002/193] coreutils: Make it build on OSX 10.0.8 Take patch from: https://lists.gnu.org/archive/html/bug-coreutils/2013-01/msg00119.html --- pkgs/tools/misc/coreutils/8.19.nix | 2 ++ pkgs/tools/misc/coreutils/stpncpy.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/misc/coreutils/stpncpy.patch diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix index 23db167f307..59602e69d1d 100644 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ b/pkgs/tools/misc/coreutils/8.19.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; }; + patches = [ ./stpncpy.patch ]; + nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl diff --git a/pkgs/tools/misc/coreutils/stpncpy.patch b/pkgs/tools/misc/coreutils/stpncpy.patch new file mode 100644 index 00000000000..d4a0e0ee0e1 --- /dev/null +++ b/pkgs/tools/misc/coreutils/stpncpy.patch @@ -0,0 +1,11 @@ +--- coreutils-8.19/lib/stpncpy.c.orig 2013-09-02 18:20:00.000000000 +0200 ++++ coreutils-8.19/lib/stpncpy.c 2013-09-02 18:20:31.000000000 +0200 +@@ -31,7 +31,7 @@ + /* Copy no more than N bytes of SRC to DST, returning a pointer past the + last non-NUL byte written into DST. */ + char * +-__stpncpy (char *dest, const char *src, size_t n) ++(__stpncpy) (char *dest, const char *src, size_t n) + { + char c; + char *s = dest; From 76ca653d7b280287c875b67a5476ead6d33307a7 Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Sat, 7 Sep 2013 16:30:23 +0200 Subject: [PATCH 003/193] coreutils: 8.20 does build on Darwin Where gcc is: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00) --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f64684c8a3e..3bb5373dd2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -665,11 +665,7 @@ let convmv = callPackage ../tools/misc/convmv { }; - coreutils = (if stdenv.isDarwin then - # 8.20 doesn't build on Darwin - callPackage ../tools/misc/coreutils/8.19.nix - else - callPackage ../tools/misc/coreutils) + coreutils = callPackage ../tools/misc/coreutils { # TODO: Add ACL support for cross-Linux. aclSupport = crossSystem == null && stdenv.isLinux; From 14109047bdda9d3522a1968b59d75e5520c11775 Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Sat, 7 Sep 2013 16:36:10 +0200 Subject: [PATCH 004/193] gettext: Guard against compiler not supporting __builtin_stpncpy From https://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html: 5) Building with a compiler that doesn't support newer __builtins If your port uses MacPorts compilers rather than the default compiler, you may run into trouble with string functions. You'll see errors at link time about undefined __builtin_* functions. If this happens, you may want to compile with -D_FORTIFY_SOURCE=0 to tell the headers to use unfortified versions which do not use compiler builtins. --- pkgs/development/libraries/gettext/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 5468c9f2336..dbc17ffa1bb 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation (rec { "--config-cache" ]); + makeFlags = stdenv.lib.optionalString stdenv.isDarwin + "CFLAGS=-D_FORTIFY_SOURCE=0"; + # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its # own wchar.h file, which does not cope well with the system's From 123ab78ee037f80a7ed98010f95168c48b2aa78b Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Sat, 7 Sep 2013 16:42:04 +0200 Subject: [PATCH 005/193] coreutils: Remove 8.19 reference --- pkgs/tools/misc/coreutils/8.19.nix | 72 ------------------------- pkgs/tools/misc/coreutils/stpncpy.patch | 11 ---- 2 files changed, 83 deletions(-) delete mode 100644 pkgs/tools/misc/coreutils/8.19.nix delete mode 100644 pkgs/tools/misc/coreutils/stpncpy.patch diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix deleted file mode 100644 index 59602e69d1d..00000000000 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, perl, gmp ? null -, aclSupport ? false, acl ? null -, selinuxSupport? false, libselinux ? null, libsepol ? null -}: - -assert aclSupport -> acl != null; -assert selinuxSupport -> libselinux != null && libsepol != null; - -stdenv.mkDerivation rec { - name = "coreutils-8.19"; - - src = fetchurl { - url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; - }; - - patches = [ ./stpncpy.patch ]; - - nativeBuildInputs = [ perl ]; - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; - - crossAttrs = ({ - buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; - - # Needed for fstatfs() - # I don't know why it is not properly detected cross building with glibc. - configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; - doCheck = false; - } - - // - - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - })); - - # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), - # and {Open,Free}BSD. - doCheck = stdenv ? glibc; - - enableParallelBuilding = true; - - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - meta = { - homepage = http://www.gnu.org/software/coreutils/; - description = "The basic file, shell and text manipulation utilities of the GNU operating system"; - - longDescription = '' - The GNU Core Utilities are the basic file, shell and text - manipulation utilities of the GNU operating system. These are - the core utilities which are expected to exist on every - operating system. - ''; - - license = "GPLv3+"; - - maintainers = [ ]; - }; -} - diff --git a/pkgs/tools/misc/coreutils/stpncpy.patch b/pkgs/tools/misc/coreutils/stpncpy.patch deleted file mode 100644 index d4a0e0ee0e1..00000000000 --- a/pkgs/tools/misc/coreutils/stpncpy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- coreutils-8.19/lib/stpncpy.c.orig 2013-09-02 18:20:00.000000000 +0200 -+++ coreutils-8.19/lib/stpncpy.c 2013-09-02 18:20:31.000000000 +0200 -@@ -31,7 +31,7 @@ - /* Copy no more than N bytes of SRC to DST, returning a pointer past the - last non-NUL byte written into DST. */ - char * --__stpncpy (char *dest, const char *src, size_t n) -+(__stpncpy) (char *dest, const char *src, size_t n) - { - char c; - char *s = dest; From 055e646bfc1fc0b06ac61ee88f1d31b1698f287f Mon Sep 17 00:00:00 2001 From: Danie Roux Date: Sun, 8 Sep 2013 02:04:43 +0200 Subject: [PATCH 006/193] coreutils: Guard against compiler not supporting __builtin_stpncpy_chk From https://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html: 5) Building with a compiler that doesn't support newer __builtins If your port uses MacPorts compilers rather than the default compiler, you may run into trouble with string functions. You'll see errors at link time about undefined __builtin_* functions. If this happens, you may want to compile with -D_FORTIFY_SOURCE=0 to tell the headers to use unfortified versions which do not use compiler builtins. --- pkgs/tools/misc/coreutils/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index da3e8d09a23..c4066c89d1d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -59,6 +59,9 @@ let NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; + makeFlags = stdenv.lib.optionalString stdenv.isDarwin + "CFLAGS=-D_FORTIFY_SOURCE=0"; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; From 961c2fe7c3cb5410b747c258bc29328c0433a264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Sep 2013 14:56:10 +0200 Subject: [PATCH 007/193] coreutils,gettext: don't change hash except for darwin Also some style cleanup. Note that defining an empty-string variable *does* change the hash. I would like to change this behaviour one day (clean up attrs when compiling the derivation). --- .../development/libraries/gettext/default.nix | 25 +++++++++--------- pkgs/tools/misc/coreutils/default.nix | 26 +++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index dbc17ffa1bb..4908662591c 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, libiconv }: +{ stdenv, fetchurl, libiconvOrEmpty }: + +with { inherit (stdenv.lib) optionals optionalAttrs; }; stdenv.mkDerivation (rec { name = "gettext-0.18.1.1"; - + src = fetchurl { url = "mirror://gnu/gettext/${name}.tar.gz"; sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k"; @@ -11,7 +13,7 @@ stdenv.mkDerivation (rec { patches = [ ./no-gets.patch ]; configureFlags = [ "--disable-csharp" ] - ++ (stdenv.lib.optionals stdenv.isCygwin + ++ (optionals stdenv.isCygwin [ # We have a static libiconv, so we can only build the static lib. "--disable-shared" "--enable-static" @@ -19,9 +21,6 @@ stdenv.mkDerivation (rec { "--config-cache" ]); - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CFLAGS=-D_FORTIFY_SOURCE=0"; - # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its # own wchar.h file, which does not cope well with the system's @@ -33,12 +32,12 @@ stdenv.mkDerivation (rec { fi ''; - buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - + buildInputs = libiconvOrEmpty; + enableParallelBuilding = true; - + crossAttrs = { - buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + buildInputs = optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.crossDrv; # Gettext fails to guess the cross compiler configureFlags = "CXX=${stdenv.cross.config}-g++"; @@ -73,9 +72,11 @@ stdenv.mkDerivation (rec { }; } -// +// optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; +} -stdenv.lib.optionalAttrs stdenv.isCygwin { +// optionalAttrs stdenv.isCygwin { patchPhase = # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. # This fixes: diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c4066c89d1d..65a3bec555e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -6,8 +6,11 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; + +with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; + let - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation (rec { name = "coreutils-8.21"; src = fetchurl { @@ -17,16 +20,14 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; + ++ optional aclSupport acl + ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + ++ optional aclSupport acl.crossDrv + ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] + ++ optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.crossDrv; buildPhase = '' @@ -57,10 +58,7 @@ let enableParallelBuilding = true; - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CFLAGS=-D_FORTIFY_SOURCE=0"; + NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -77,6 +75,8 @@ let maintainers = [ ]; }; - }; + } // optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + }); in self From 8d001c1a08f2f4d39a7dff13183efed5a589c504 Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Tue, 10 Sep 2013 14:47:43 +0200 Subject: [PATCH 008/193] Darwin support for Go 1.1 (close #952) --- pkgs/development/compilers/go/1.1-darwin.nix | 74 ++++++++++++++++++++ pkgs/lib/maintainers.nix | 1 + pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/go/1.1-darwin.nix diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix new file mode 100644 index 00000000000..2cbb8d49611 --- /dev/null +++ b/pkgs/development/compilers/go/1.1-darwin.nix @@ -0,0 +1,74 @@ +{ stdenv, fetchurl, bison, bash, makeWrapper }: + +stdenv.mkDerivation { + name = "go-1.1.2"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.1.2.src.tar.gz; + sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz"; + }; + + buildInputs = [ bison bash makeWrapper ]; + + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable some tests + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + + ''; + + # Unfortunately we have to use Mac OS X's own GCC + preBuild = '' + export PATH=/usr/bin:$PATH + ''; + + #patches = [ ./cacert.patch ]; + + GOOS = "darwin"; + GOARCH = if stdenv.system == "x86_64-darwin" then "amd64" else "386"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go + done + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ zef ]; + platforms = stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index cd4242b170f..a6ef3b9c07f 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -58,4 +58,5 @@ vizanto = "Danny Wilson "; winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; + zef = "Zef Hemel "; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb5373dd2b..6086f255d14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2692,7 +2692,11 @@ let go_1_0 = callPackage ../development/compilers/go { }; - go_1_1 = callPackage ../development/compilers/go/1.1.nix { }; + go_1_1 = + if stdenv.isDarwin then + callPackage ../development/compilers/go/1.1-darwin.nix { } + else + callPackage ../development/compilers/go/1.1.nix { }; go = go_1_1; From 5bfb4a4f30f110833a5477b43a1a060c2cd04dab Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 7 Sep 2013 10:49:38 +1000 Subject: [PATCH 009/193] fail2ban: fix build on darwin (close #933) --- pkgs/development/libraries/gamin/default.nix | 11 ++++ pkgs/tools/security/fail2ban/default.nix | 55 ++++++++++---------- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index b61101654ba..55f802d069a 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -17,4 +17,15 @@ stdenv.mkDerivation rec { configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix); + + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile + ''; + + meta = with stdenv.lib; { + homepage = https://people.gnome.org/~veillard/gamin/; + description = "A file and directory monitoring system"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index df4917e803d..dd869714e05 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -7,8 +7,8 @@ pythonPackages.buildPythonPackage { namePrefix = ""; src = fetchurl { - url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; - name = "fail2ban-${version}.zip"; + url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; + name = "fail2ban-${version}.zip"; sha256 = "0lbanfshr8kasa1bb7861w3mrm2d0c1bvv4s5703265s8zp5m284"; }; @@ -16,38 +16,37 @@ pythonPackages.buildPythonPackage { pythonPath = [ gamin ]; - preConfigure = - '' - substituteInPlace setup.cfg \ - --replace /usr $out + preConfigure = '' + substituteInPlace setup.cfg \ + --replace /usr $out - substituteInPlace setup.py \ - --replace /etc $out/etc \ - --replace /var $TMPDIR/var \ + substituteInPlace setup.py \ + --replace /etc $out/etc \ + --replace /var $TMPDIR/var \ - for i in fail2ban-client fail2ban-regex fail2ban-server; do - substituteInPlace $i \ - --replace /usr/share/fail2ban $out/share/fail2ban - done - - for i in config/action.d/sendmail*.conf; do - substituteInPlace $i \ - --replace /usr/sbin/sendmail sendmail \ - --replace /usr/bin/whois whois - done - ''; + for i in fail2ban-client fail2ban-regex fail2ban-server; do + substituteInPlace $i \ + --replace /usr/share/fail2ban $out/share/fail2ban + done + + for i in config/action.d/sendmail*.conf; do + substituteInPlace $i \ + --replace /usr/sbin/sendmail sendmail \ + --replace /usr/bin/whois whois + done + ''; doCheck = false; - installCommand = - '' - python setup.py install --prefix=$out - ''; + installCommand = '' + python setup.py install --prefix=$out + ''; - meta = { - homepage = http://www.fail2ban.org/; + meta = with stdenv.lib; { + homepage = http://www.fail2ban.org/; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.unix; }; } From ad454f3511deadfaeaf0f5235b9be2d269e585d4 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 7 Sep 2013 10:28:03 +1000 Subject: [PATCH 010/193] emacs24: fix build on darwin (clos #932) --- .../applications/editors/emacs-24/default.nix | 36 ++++++++++--------- pkgs/top-level/all-packages.nix | 7 ++-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index bdb7c2a565a..ad42cc7cf33 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib +, alsaLib, cairo , withX ? true }: @@ -14,27 +14,31 @@ stdenv.mkDerivation rec { builder = ./builder.sh; src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; + url = "mirror://gnu/emacs/${name}.tar.xz"; sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; }; buildInputs = [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX [ - x11 libXaw Xaw3d libXpm libpng libjpeg libungif - libtiff librsvg libXft imagemagick gtk - ]; + ++ stdenv.lib.optionals withX + [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft + imagemagick gtk ] + ++ stdenv.lib.optional stdenv.isDarwin cairo; configureFlags = - (if withX then - [ "--with-x-toolkit=gtk" "--with-xft"] - else - [ "--with-x=no --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no" ]) + ( if withX then + [ "--with-x-toolkit=gtk" "--with-xft"] + else + [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" + "--with-gif=no" "--with-tiff=no" ] ) # On NixOS, help Emacs find `crt*.o'. ++ stdenv.lib.optional (stdenv ? glibc) [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) + "-I${cairo}/include/cairo"; + postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el < Date: Sat, 7 Sep 2013 10:09:11 +1000 Subject: [PATCH 011/193] djvulibre: fix build on darwin (close #931) --- pkgs/applications/misc/djvulibre/default.nix | 6 +++-- .../gnome-3/core/libcroco/default.nix | 5 +++- pkgs/development/libraries/libgsf/default.nix | 23 +++++++++++-------- .../development/libraries/librsvg/default.nix | 15 ++++++++---- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 4a51ec2d1ac..59dfd2d891e 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libtiff, librsvg }: +{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }: stdenv.mkDerivation rec { name = "djvulibre-3.5.25.3"; @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9"; }; - buildInputs = [ libjpeg libtiff librsvg ]; + buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; meta = { description = "A library and viewer for the DJVU file format for scanned images"; diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 70c1db8c027..079a6f169b2 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libxml2, glib}: +{ stdenv, fetchurl, pkgconfig, libxml2, glib }: stdenv.mkDerivation rec { name = "libcroco-0.6.6"; # 3.6.2 release @@ -7,5 +7,8 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j"; }; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + buildInputs = [ pkgconfig libxml2 glib ]; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 249e9291fa3..9253468b8df 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconvOrEmpty -}: +, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; @@ -8,28 +7,32 @@ stdenv.mkDerivation rec { name = "libgsf-1.14.26"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; + url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; }; nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] + ++ libiconvOrEmpty + ++ libintlOrEmpty; doCheck = true; - meta = { - homepage = http://www.gnome.org/projects/libgsf; - license = "LGPLv2"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; + homepage = http://www.gnome.org/projects/libgsf; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for dealing with different structured file formats. ''; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 13385dfb65c..15e9b5aa6e9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo -, libxml2, libgsf, bzip2, libcroco +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf +, bzip2, libcroco , gtk2 ? null, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -9,15 +9,22 @@ stdenv.mkDerivation rec { name = "librsvg-2.36.4"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; + url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; + propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; - configureFlags = ["--enable-introspection=auto"]; + configureFlags = [ "--enable-introspection=auto" ] + ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + NIX_CFLAGS_COMPILE + = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the From 2a73189a9c4bb0c98c6d4bc89e363ebce4ce5e0d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 7 Sep 2013 08:09:34 +1000 Subject: [PATCH 012/193] deluge: fix build on darwin (close #930) --- pkgs/desktops/gnome-2/platform/libglade/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 93490007692..5e5bae4d181 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -11,4 +11,6 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7fe9e36889..74f89506fbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4919,7 +4919,12 @@ let libtommath = callPackage ../development/libraries/libtommath { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { + # fix "unrecognized option -arch" error + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; libtunepimp = callPackage ../development/libraries/libtunepimp { }; From d3c6bd45ca5dec3e897cb5261f63d08ca81fb908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Sep 2013 15:30:27 +0200 Subject: [PATCH 013/193] emacs24: fix license typo, change indentation Note that the double-quote "indented strings" strip indentation, so this ugly style was pointless. --- pkgs/applications/editors/emacs-24/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index ad42cc7cf33..0dcb585e12e 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el < Date: Sat, 7 Sep 2013 10:31:37 +1000 Subject: [PATCH 014/193] enscript: fix build on darwin (close #933, really this time) --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74f89506fbb..fd791972a0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -802,7 +802,12 @@ let encfs = callPackage ../tools/filesystems/encfs { }; - enscript = callPackage ../tools/text/enscript { }; + enscript = callPackage ../tools/text/enscript { + # fix syntax errors + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; ethtool = callPackage ../tools/misc/ethtool { }; From 39bc57f35f29599ccc868febdb3fc6a183066617 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 12 Sep 2013 23:12:16 -0700 Subject: [PATCH 015/193] ImageMagick: update 6.7.5-3 -> 6.8.6-9 (close #960) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index b96d1bc84f7..a5d8b22c784 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -17,14 +17,14 @@ }: let - version = "6.7.5-3"; + version = "6.8.6-9"; in stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { url = "mirror://imagemagick/${name}.tar.xz"; - sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs"; + sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; }; configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' From 16040297a7603f00ddd5858abad820988bf627b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Sep 2013 16:52:01 +0200 Subject: [PATCH 016/193] gamin: don't change hashes on non-darwin Sorry, I didn't realize this is "fam" which is used in glib. --- pkgs/development/libraries/gamin/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 55f802d069a..22a4597abbe 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pkgconfig, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix); - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile - ''; meta = with stdenv.lib; { homepage = https://people.gnome.org/~veillard/gamin/; @@ -29,3 +26,10 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } + +// stdenv.lib.optionalAttrs stdenv.isDarwin { + preBuild = '' + sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile + ''; +}) + From 7f7c1969129df60149e29c569c836a7db04e8355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Sep 2013 21:18:55 +0200 Subject: [PATCH 017/193] libffi: disable tests on FreeBSD as well There are strange build failures of expect. Ikwildrpepper says the bash eats all CPU, but the build is stuck. --- pkgs/development/libraries/libffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 807fe54c27e..7cd8972672c 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" ]; # no detection of -march= or -mtune= - doCheck = !stdenv.isDarwin; # until we solve dejagnu problems on darwin + doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. From 784bda6d3026e234181ec6463463bfd09aca1294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 14 Sep 2013 21:49:28 +0200 Subject: [PATCH 018/193] libreoffice: don't build all languages until we use multiple-outputs to minimize disk usage --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e07fe69b70c..5e010fef496 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -15,7 +15,7 @@ , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven -, langs ? [ "ALL" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] }: let From cf9601dff75ed40bbe71bba328384f7e4f73c432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Sep 2013 00:38:09 +0200 Subject: [PATCH 019/193] libreoffice: fix build --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 5e010fef496..2f2a50bf9cb 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -160,6 +160,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" + "--with-lang=${langsSpaces}" ); ''; @@ -198,7 +199,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-lang=${langsSpaces}" "--with-vender=NixOS" # Without these, configure does not finish From c537d07f2162cd16fb4b19433abc57039e145a7b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 14 Sep 2013 17:34:03 +0100 Subject: [PATCH 020/193] haskellPackages.snapletAcidState: New Expression (close #966) --- .../haskell/snaplet-acid-state/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/snaplet-acid-state/default.nix diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix new file mode 100644 index 00000000000..838f45eccaa --- /dev/null +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -0,0 +1,15 @@ +{ cabal, acidState, snap, text }: + +cabal.mkDerivation (self: { + pname = "snaplet-acid-state"; + version = "0.2.5"; + sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + buildDepends = [ acidState snap text ]; + meta = { + homepage = "https://github.com/mightybyte/snaplet-acid-state"; + description = "acid-state snaplet for Snap Framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6ce4593717d..e15b045a022 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1845,6 +1845,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; From af8a83c378192ce0ec4a76cdeacfd626026f401f Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 14 Sep 2013 17:31:30 +0100 Subject: [PATCH 021/193] haskellPackages.amqp: New expression. Close #965. --- .../libraries/haskell/amqp/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/amqp/default.nix diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix new file mode 100644 index 00000000000..00878a12874 --- /dev/null +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -0,0 +1,17 @@ +{ cabal, binary, dataBinaryIeee754, network, text, xml }: + +cabal.mkDerivation (self: { + pname = "amqp"; + version = "0.5.0"; + sha256 = "1i02pp184r1iq40mz16m9qh8i3h1jmf3ykpg67j3i1732cks8n8w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary dataBinaryIeee754 network text xml ]; + meta = { + homepage = "https://github.com/hreinhardt/amqp"; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + mantainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e15b045a022..0c8ad7639fd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -530,6 +530,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {}; + amqp = callPackage ../development/libraries/haskell/amqp {}; + appar = callPackage ../development/libraries/haskell/appar {}; ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; From 1ac7ba823daaf96ff59246be08ed7afeff1813b0 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 13 Sep 2013 05:10:02 +0200 Subject: [PATCH 022/193] tinc: Update to 1.0.22 close #957 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index dd6bfb82aab..c2b25e863f2 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.21"; + version = "1.0.22"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "12v1x9p4f8y9967ypwxhkr10q6pk4cdallr0k4lic0kcfsmmxhba"; + sha256 = "0b2w5jic0zs8smfq2a9w99ql7lspb7jph3psmqaflw0hq4gdsfa7"; }; buildInputs = [ lzo openssl zlib ]; From 3036e8628491c9471a5927ec8539e232b21361b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Sep 2013 07:55:19 +0200 Subject: [PATCH 023/193] libffi on FreeBSD: remove unsupported "-r" option to ln Done without changing hashes on other platforms. Sometimes I forget that GNU's not UNIX. --- pkgs/development/libraries/libffi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 7cd8972672c..9db9b801952 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = # Install headers in the right place. - '' ln -srv "$out/lib/"libffi*/include "$out/include" + '' ln -s${if stdenv.isFreeBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include" ''; meta = { From 953eecb0fcbaaa14ace17f1b10788adadbae25f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 9 Sep 2013 21:13:10 +0200 Subject: [PATCH 024/193] ssvnc: The Enhanced TightVNC Viewer, SSVNC, adds encryption security to VNC connections. Close #950. --- .../networking/remote/ssvnc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/remote/ssvnc/default.nix diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix new file mode 100644 index 00000000000..b2c9b7c3e73 --- /dev/null +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, imake, zlib, openjdk, libX11, libXt, libXmu, libXaw, libXext, libXpm, openjpeg, openssl }: + +let version = "1.0.29"; in +stdenv.mkDerivation rec { + name = "ssvnc-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/ssvnc/${name}.src.tar.gz"; + sha256 = "74df32eb8eaa68b07c9693a232ebe42154617c7f3cbe1d4e68d3fe7c557d618d"; + }; + + buildInputs = [ imake zlib openjdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ]; + + configurePhase = "makeFlags=PREFIX=$out"; + + meta = { + description = "VNC viewer that adds encryption security to VNC connections"; + homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd791972a0c..b8ff9c19f78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8465,6 +8465,8 @@ let skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + st = callPackage ../applications/misc/st { conf = config.st.conf or null; }; From 513dad6527239cdd2b41fad23c3261c6b6a1a85e Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 10 May 2013 19:17:36 +0200 Subject: [PATCH 025/193] colord, gusb: package. Part of #517. --- pkgs/development/libraries/gusb/default.nix | 30 +++++++++++ pkgs/tools/misc/colord/default.nix | 57 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 93 insertions(+) create mode 100644 pkgs/development/libraries/gusb/default.nix create mode 100644 pkgs/tools/misc/colord/default.nix diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix new file mode 100644 index 00000000000..0534df821cc --- /dev/null +++ b/pkgs/development/libraries/gusb/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, fetchgit +, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt +, glib, systemd, libusb1 +}: +stdenv.mkDerivation { + name = "gusb-git"; + enableParallelBuilding = true; + + src = fetchgit { + url = git://gitorious.org/gusb/gusb.git; + rev = "53226a15a627b20fde38303c2141a17985d741ae"; + sha256 = "01daf09f663e27bdd92532e3e2a3e87de895e9cc1f150d4e0fc75b0dc489fccf"; + }; + + preConfigure = "./autogen.sh"; + + buildInputs = [ + pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt + systemd libusb1 + glib + ]; + + meta = { + description = "GLib libusb wrapper"; + homepage = http://gitorious.org/gusb; + license = stdenv.lib.licenses.lgpl21; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix new file mode 100644 index 00000000000..e6787ec76c8 --- /dev/null +++ b/pkgs/tools/misc/colord/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, fetchgit +, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus + +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection +, version ? "git" +}: + +# colord wants to write to the etc/colord.conf and var/run/colord/mapping.db +# thus they get symlinked to /etc and /var + +stdenv.mkDerivation (stdenv.lib.mergeAttrsByVersion "colord" version { + "0.1.33" = { + name = "colord-0.1.33"; + src = fetchurl { + url = http://www.freedesktop.org/software/colord/releases/colord-0.1.32.tar.xz; + sha256 = "1smbkh4z1c2jjwxg626f12sslv7ff3yzak1zqrc493cl467ll0y7"; + }; + }; + "git" = { + name = "colord-git-11dca"; + src = fetchgit { + url = "https://github.com/hughsie/colord.git"; + rev = "11dcaba034edff3955ceff53795df82c57c34adc"; + sha256 = "1280q7zbfm5wqql872kcxmk5rmwjs7cv7cgz8nx0i9g4ac8j2mrf"; + }; + + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ automake autoconf libtool gtk_doc which gobjectIntrospection ]; + }; +} { + + enableParallelBuilding = true; + + preConfigure = '' + configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d --with-systemdsystemunitdir=$out/lib/udev/rules.d" + ''; + + buildInputs = [glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus]; + + postInstall = '' + sed -i '/usb_id\|usb-db/d' $out/lib/udev/rules.d/69-cd-sensors.rules + mv $out/etc/colord.conf{,.default} + ln -s /etc/colord.conf $out/etc/colord.conf + rm -fr $out/var/lib/colord + ln -s /var/lib/colord $out/var/lib/colord + ''; + + meta = { + description = "system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices"; + homepage = http://www.freedesktop.org/software/colord/intro.html; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8ff9c19f78..411d5b583d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -633,6 +633,8 @@ let ciopfs = callPackage ../tools/filesystems/ciopfs { }; + colord = callPackage ../tools/misc/colord { }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { }; @@ -4269,6 +4271,10 @@ let gnonlin = callPackage ../development/libraries/gstreamer/gnonlin {}; + gusb = callPackage ../development/libraries/gusb { + inherit (gnome) gtkdoc; + }; + qt_gstreamer = callPackage ../development/libraries/gstreamer/qt-gstreamer {}; gnet = callPackage ../development/libraries/gnet { }; From 50a1eb53ffa397418c27db493d52cad7c3d206e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 16 Aug 2013 17:42:32 +0200 Subject: [PATCH 026/193] Navit update to current svn --- pkgs/applications/misc/navit/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 576647555ab..ef1e777f55f 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,24 +1,19 @@ { stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, -libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, autoconf, automake, libtool, cvs }: +libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; src = fetchsvn { - url = https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit; - rev = 3537; - sha256 = "1ajd439i7z8xm16kqh20qalvafy9miyy4accc8j7w30c4qgc2bb7"; + url = svn://svn.code.sf.net/p/navit/code/trunk/navit; + rev = 5576; + sha256 = "1xx62l5srfhh9cfi7n3pxj8hpcgr1rpa0hzfmbrqadzv09z36723"; }; # 'cvs' is only for the autogen buildInputs = [ pkgconfig gtk SDL fontconfig freetype imlib2 SDL_image mesa - libXmu freeglut python gettext quesoglc gd postgresql - autoconf automake libtool cvs ]; + libXmu freeglut python gettext quesoglc gd postgresql cmake qt4 SDL_ttf fribidi ]; - preConfigure = '' - sh ./autogen.sh - ''; - - configureFlags = [ "--disable-samplemap" ]; + cmakeFlags = [ "-DSAMPLE_MAP=n" ]; meta = { homepage = http://www.navit-project.org/; From 8361e0b1420f6115e058d0aa5064d8b7cc725b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 31 Aug 2013 17:05:11 +0200 Subject: [PATCH 027/193] openjpeg: update to 2.0.0 --- pkgs/development/libraries/openjpeg/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index a47cacd62bc..75999f18d62 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, cmake, glib/*passthru only*/ }: stdenv.mkDerivation rec { - name = "openjpeg-1.5.1"; + name = "openjpeg-2.0.0"; passthru = { - incDir = "openjpeg-1.5"; + incDir = "openjpeg-2.0"; }; src = fetchurl { url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; - sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; + sha1 = "0af78ab2283b43421458f80373422d8029a9f7a7"; }; + buildInputs = [ cmake ]; nativebuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway From 9dcca4e3f504f76dede1947ac2548650cfbfc9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 31 Aug 2013 17:05:24 +0200 Subject: [PATCH 028/193] Adding bird-1.3.11 --- pkgs/servers/bird/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/servers/bird/default.nix diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix new file mode 100644 index 00000000000..ae50091add1 --- /dev/null +++ b/pkgs/servers/bird/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, flex, bison, readline }: + +stdenv.mkDerivation rec { + name = "bird-1.3.11"; + + src = fetchurl { + url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; + sha256 = "15c4d9cyd6l8jdlrvmzvwmpga81llm8zxqvbsir9gvwgzn6zbmna"; + }; + + buildInputs = [ flex bison readline ]; + + meta = { + description = ""; + homepage = http://bird.network.cz; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} From 00abf42fc6641a8513fe1148dbac821e2671e383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 15 Sep 2013 11:38:52 +0200 Subject: [PATCH 029/193] Adding the reference to bird --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 411d5b583d0..998846aa18a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5988,6 +5988,8 @@ let bind = callPackage ../servers/dns/bind { }; + bird = callPackage ../servers/bird { }; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; }; From 41e95c68b35c06b0f03d0ad6d17408b359910368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 15 Sep 2013 11:57:52 +0200 Subject: [PATCH 030/193] go: adding an option to remove external references in godoc godoc pages point to googleapis and google plus URLs, for every visit in your local godoc. I added an option to disable that (the hard way, it takes out the references). I don't think it removes any feature of godoc. --- pkgs/development/compilers/go/1.1.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 5aeb053e110..dfb545bb368 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc +, removeGodocExternals ? false }: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -50,6 +51,8 @@ stdenv.mkDerivation { sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + '' + stdenv.lib.optionalString removeGodocExternals '' + sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html ''; patches = [ ./cacert.patch ]; From 656184f89cf700f59963916a5157b73955324f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Sep 2013 12:17:38 +0200 Subject: [PATCH 031/193] FlexGet: 1.0.3353 -> 1.1.121 --- pkgs/top-level/python-packages.nix | 56 ++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dea65b5fe51..975d9c0aa5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2189,17 +2189,18 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }; - - flexget = buildPythonPackage (rec { - name = "FlexGet-1.0.3353"; + flexget = buildPythonPackage rec { + name = "FlexGet-1.1.121"; src = fetchurl { - url = "http://download.flexget.com/archive/${name}.tar.gz"; - md5 = "cffc4e51b5c5efddb339d265524e46b8"; + url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; + md5 = "44521bcbc2c1e941b656ecfa358adcaa"; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ]; + propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil + beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge + python_tvrage jsonschema ]; meta = { homepage = http://flexget.com/; @@ -2207,8 +2208,51 @@ pythonPackages = modules // import ./python-packages-generated.nix { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; + }; + + python_tvrage = buildPythonPackage (rec { + version = "0.4.1"; + name = "tvrage-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-tvrage/python-tvrage-${version}.tar.gz"; + md5 = "cdfec252158c5047b626861900186dfb"; + }; + + # has mostly networking dependent tests + doCheck = false; + propagatedBuildInputs = [ beautifulsoup ]; + + meta = { + homepage = https://github.com/ckreutzer/python-tvrage; + description = "Client interface for tvrage.com's XML-based api feeds"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; }); + jsonschema = buildPythonPackage (rec { + version = "2.0.0"; + name = "jsonschema-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz"; + md5 = "1793d97a668760ef540fadd342aa08e5"; + }; + + buildInputs = [ nose mock ]; + + checkPhase = '' + nosetests + ''; + + meta = { + homepage = https://github.com/Julian/jsonschema; + description = "An implementation of JSON Schema validation for Python"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); flup = buildPythonPackage (rec { name = "flup-1.0.2"; From 22b7f00423219769a0a52253e07980f48e0aa19d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 14 Sep 2013 10:35:31 +0200 Subject: [PATCH 032/193] libvirt: update to 1.1.2 --- .../development/libraries/libvirt/default.nix | 9 ++++-- .../libraries/libvirt/securtyfs_userns.patch | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libvirt/securtyfs_userns.patch diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 06ead3ca23f..380ec08c00c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils +, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng }: -let version = "1.1.1"; in +let version = "1.1.2"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "1hi27d5pld925g1azx8jq0wv557wpkd6xrq6lzm91cdr2lg1wvyw"; + md5 = "1835bbfa492099bce12e2934870e5611"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper + libcap_ng ]; + patches = [ ./securtyfs_userns.patch ]; + preConfigure = '' PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch new file mode 100644 index 00000000000..2723334f94a --- /dev/null +++ b/pkgs/development/libraries/libvirt/securtyfs_userns.patch @@ -0,0 +1,30 @@ +--- a/src/lxc/lxc_container.c ++++ b/src/lxc/lxc_container.c +@@ -750,7 +750,7 @@ err: + } + + +-static int lxcContainerMountBasicFS(void) ++static int lxcContainerMountBasicFS(bool userns_enabled) + { + const struct { + const char *src; +@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) + continue; + #endif + ++ if (STREQ(mnts[i].src, "securityfs") && userns_enabled) ++ continue; ++ + if (virFileMakePath(mnts[i].dst) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), +@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, + goto cleanup; + + /* Mounts the core /proc, /sys, etc filesystems */ +- if (lxcContainerMountBasicFS() < 0) ++ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) + goto cleanup; + + /* Mounts /proc/meminfo etc sysinfo */ From 39d359b4d72ae28a1b265dcdc7fb13b553aa2673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 15 Sep 2013 12:37:24 +0200 Subject: [PATCH 033/193] libvirt: note patch source --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 380ec08c00c..ce81c1b2e8c 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { libcap_ng ]; + # see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html patches = [ ./securtyfs_userns.patch ]; preConfigure = From 9c533f4745c74c8e98948fcf8a6013fc23ea982e Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sun, 15 Sep 2013 14:34:22 +0200 Subject: [PATCH 034/193] python-ipdbplugin: update to version 1.14 --- 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 fc54f79ebb3..c4488fe191b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2553,10 +2553,10 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; ipdbplugin = buildPythonPackage { - name = "ipdbplugin-1.2"; + name = "ipdbplugin-1.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz"; - md5 = "39169b00a2186b99469249c5b0613753"; + url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; + md5 = "f9a41512e5d901ea0fa199c3f648bba7"; }; propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipython ]; }; From 6dfd36781f9df3af1374539b426273ab36e09cd9 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sun, 15 Sep 2013 17:23:23 +0100 Subject: [PATCH 035/193] haskellPackages.esqueleto: New expression --- .../libraries/haskell/esqueleto/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/esqueleto/default.nix diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix new file mode 100644 index 00000000000..4e0abd3c34f --- /dev/null +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -0,0 +1,25 @@ +{ cabal, conduit, hspec, HUnit, monadControl, monadLogger +, persistent, persistentSqlite, persistentTemplate, QuickCheck +, resourcet, tagged, text, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "esqueleto"; + version = "1.3.4.2"; + sha256 = "1gp0jy8ra11ansari659wqvwafw1pi2svl3w16wa5dv9xk3v9pr6"; + buildDepends = [ + conduit monadLogger persistent resourcet tagged text transformers + unorderedContainers + ]; + testDepends = [ + conduit hspec HUnit monadControl monadLogger persistent + persistentSqlite persistentTemplate QuickCheck text transformers + ]; + meta = { + homepage = "https://github.com/meteficha/esqueleto"; + description = "Bare bones, type-safe EDSL for SQL queries on persistent backends"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8947945abb4..0dec37d1fcc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -934,6 +934,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x either = callPackage ../development/libraries/haskell/either {}; + esqueleto = callPackage ../development/libraries/haskell/esqueleto {}; + exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {}; From 6b2379f43fe74d27fc20a61af73b436f2bf8a562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Sep 2013 18:13:26 +0200 Subject: [PATCH 036/193] imagemagick: add link for $out/include/ImageMagick For transition. Fixes calibre build, at least. --- pkgs/applications/graphics/ImageMagick/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a5d8b22c784..1c3bff2e36d 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { sha256 = "1bpj8676mph5cvyjsdgf27i6yg2iw9iskk5c69mvpxkyawgjw1vg"; }; + preConfigure = if tetex != null then + '' + export DVIDecodeDelegate=${tetex}/bin/dvips + '' else ""; + configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib @@ -41,10 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ tetex graphviz ]; - preConfigure = if tetex != null then - '' - export DVIDecodeDelegate=${tetex}/bin/dvips - '' else ""; + postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; meta = { homepage = http://www.imagemagick.org/; From ce07819201611f2836310ecb446fe0c1a4967570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 15 Sep 2013 18:16:58 +0200 Subject: [PATCH 037/193] PerlMagick: fix build via update (broken by imagemagick update) I found nothing in Changelog, hopefully OK. --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 870f5fa67b9..7c47bcc3b1a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6168,11 +6168,11 @@ rec { }; }; - PerlMagick = buildPerlPackage { - name = "PerlMagick-6.77"; + PerlMagick = buildPerlPackage rec { + name = "PerlMagick-6.86"; src = fetchurl { - url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz; - sha256 = "0axbj3n5avjxvlxradjs9zxiv84i00drmnjsb7hq9sjn9fzggngg"; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/${name}.tar.gz"; + sha256 = "18xgh8r9pjxg9yi119gnsln1r4p4sk1r8bxd3iy0qj77frmksisi"; }; buildInputs = [pkgs.imagemagick]; preConfigure = From 986b34580de5e5fe51b95077acbd6d4e8a0fb829 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sun, 15 Sep 2013 14:22:27 +0200 Subject: [PATCH 038/193] add mathematica version 9.0.0 Wolfram Mathematica based on the makeself archive found on the Mathematica installation DVD. --- .../science/math/mathematica/default.nix | 126 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 127 insertions(+) create mode 100644 pkgs/applications/science/math/mathematica/default.nix diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix new file mode 100644 index 00000000000..d0429a45190 --- /dev/null +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -0,0 +1,126 @@ +{ stdenv +, coreutils +, patchelf +, requireFile +, alsaLib +, fontconfig +, freetype +, gcc +, glib +, libpng +, ncurses +, opencv +, openssl +, unixODBC +, xlibs +, zlib +}: + +let + platform = + if stdenv.system == "i686-linux" then + "Linux" + else if stdenv.system == "x86_64-linux" then + "Linux-x86-64" + else + abort "Mathematica requires i686-linux or x86_64 linux"; +in +stdenv.mkDerivation rec { + + name = "mathematica-9.0.0"; + + src = requireFile rec { + name = "Mathematica_9.0.0_LINUX.sh"; + message = '' + This nix expression requires that Mathematica_9.0.0_LINUX.sh is + already part of the store. Find the file on your Mathematica CD + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q"; + }; + + buildInputs = [ + coreutils + patchelf + alsaLib + coreutils + fontconfig + freetype + gcc.gcc + gcc.libc + glib + ncurses + opencv + openssl + unixODBC + ] ++ (with xlibs; [ + libX11 + libXext + libXtst + libXi + libXmu + libXrender + libxcb + ]); + + ldpath = stdenv.lib.makeLibraryPath buildInputs + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + (":" + stdenv.lib.makeSearchPath "lib64" buildInputs); + + phases = "unpackPhase installPhase fixupPhase"; + + unpackPhase = '' + echo "=== Extracting makeself archive ===" + # find offset from file + offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) + dd if="$src" ibs=$offset skip=1 | tar -xf - + cd Unix + ''; + + installPhase = '' + cd Installer + # don't restrict PATH, that has already been done + sed -i -e 's/^PATH=/# PATH=/' MathInstaller + + echo "=== Running MathInstaller ===" + ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent + ''; + + preFixup = '' + echo "=== PatchElfing away ===" + find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do + type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') + if [ -z "$type" ]; then + : + elif [ "$type" == "EXEC" ]; then + echo "patching $f executable <<" + patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ldpath}" \ + "$f" + patchelf --shrink-rpath "$f" + elif [ "$type" == "DYN" ]; then + echo "patching $f library <<" + patchelf \ + --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ + "$f" \ + && patchelf --shrink-rpath "$f" \ + || echo unable to patch ... ignoring 1>&2 + else + echo "not patching $f <<: unknown elf type" + fi + done + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = { + description = "Wolfram Mathematica computational software system"; + homepage = "http://www.wolfram.com/mathematica/"; + license = "unfree"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 998846aa18a..f9a51883721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9526,6 +9526,7 @@ let openblas = callPackage ../development/libraries/science/math/openblas { }; + mathematica = callPackage ../applications/science/math/mathematica { }; ### SCIENCE/MOLECULAR-DYNAMICS From b882b820339ca68c57e4b1db72ce69e6c571e399 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Sun, 15 Sep 2013 21:00:36 +0200 Subject: [PATCH 039/193] Disable tests for perlPackages.ack --- pkgs/top-level/perl-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c47bcc3b1a..c8df9d31cd5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -40,10 +40,8 @@ rec { maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; }; - # t/swamp/{0,perl-without-extension} are datafiles for the test - # t/ack-show-types.t, but the perl generic builder confuses them - # for scripts and purifies them, making the test fail. - preCheck = "sed -i '1s,.*,#!/usr/bin/perl -w,' t/swamp/0 t/swamp/perl-without-extension"; + # tests fails on nixos and hydra because of different purity issues + doCheck = false; }; AlgorithmAnnotate = buildPerlPackage { From 75c5fc541da269a37273f4a562670d81b17d0989 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Sep 2013 21:36:18 +0200 Subject: [PATCH 040/193] pkgs/desktops/gnome-2/desktop/libgweather: remove dubious assertion Fix assertion failure from http://hydra.nixos.org/build/5985506/nixlog/1/raw for some suitable definition of "fixing". Let's see what happens now. --- pkgs/desktops/gnome-2/desktop/libgweather/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index 736857fca93..dc8057ff0f5 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -1,8 +1,5 @@ {stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp}: -#Is this really necessary? -assert stdenv ? glibc; - stdenv.mkDerivation rec { name = "libgweather-2.30.3"; src = fetchurl { From c3cd36192751e7940dcd7fc0fba22673c273de0f Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 16 Sep 2013 00:39:17 +0200 Subject: [PATCH 041/193] virt-viewer: fix build, add libcap-ng to build inputs, needed after libvirt update to 1.1.2 --- pkgs/applications/virtualization/virt-viewer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 51ef6c5b39e..d2e608ba3fa 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1 - , gnupg, libgcrypt, perl, nettle, yajl + , gnupg, libgcrypt, perl, nettle, yajl, libcap_ng , ...}: builderDefsPackage (a : From b0976dcdfcc37583acb5b939783fdaab948043aa Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sun, 15 Sep 2013 17:52:03 +0200 Subject: [PATCH 042/193] ffmpeg_1: update to version 1.2.3 --- pkgs/development/libraries/ffmpeg/1.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 9f731d118bc..be9f1c56d97 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -29,11 +29,11 @@ assert x11grabSupport -> libXext != null && libXfixes != null; assert playSupport -> SDL != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2"; + name = "ffmpeg-1.2.3"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; + sha256 = "0nvilgwaivzvikgp9lpvrwi4p1clxl4w8j961599bg0r2v7n4x6r"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that From 11b2added0a86508e8b007e56c27e65b3a5007a2 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sun, 15 Sep 2013 17:55:33 +0200 Subject: [PATCH 043/193] librsvg: move cairo dependency into propagatedBuildInputs the pkgconfig description file of librsvg states cairo as a build requirement. and with cairo being propagated, vlc now picks up librsvg as available. --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 15e9b5aa6e9..15e07af9f1e 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] + buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; nativeBuildInputs = [ pkgconfig ]; From 786ff721c835821dfeced493c97f2cb70f20c715 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Sun, 15 Sep 2013 18:01:06 +0200 Subject: [PATCH 044/193] vlc: update to version 2.0.8a this new release together with an updated ffmpeg solves segfaults errors, i was having for some videos. --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 714a2882d5f..412d03daa2e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - name = "vlc-${version}"; + name = "vlc-${version}a"; version = "2.0.8"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "00hpbm0v424yhfzqyxrvrvfjkbvf3f43yqk6h1qhwmnl8n1z4am0"; + sha256 = "1lilj14il52731h7qvrjcss0zivghcxv8jmmxf23qwl7qhs5y885"; }; buildInputs = From 122b19c429bc9561141b06050b0854ec0ec31fa8 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 15 Sep 2013 22:54:57 -0700 Subject: [PATCH 045/193] netatalk-3.0.5 --- pkgs/tools/filesystems/netatalk/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/filesystems/netatalk/default.nix diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix new file mode 100644 index 00000000000..21a93774758 --- /dev/null +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv, pkgconfig, db48, libgcrypt, avahi, libiconv, pam, openssl }: + +stdenv.mkDerivation rec { + name = "netatalk-3.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2"; + sha256 = "1adlcj509czxsx60r1s96qlznspp5nz7dxc5fws11danidr4fhl8"; + }; + + buildInputs = [ pkgconfig db48 libgcrypt avahi libiconv pam openssl ]; + + configureFlags = [ + "--with-bdb=${db48}" + "--with-openssl=${openssl}" + ]; + + enableParallelBuild = true; + + meta = { + description = "Apple File Protocl Server"; + homepage = http://netatalk.sourceforge.net/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 998846aa18a..1644848afe0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1326,6 +1326,8 @@ let nbd = callPackage ../tools/networking/nbd { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; + netcdf = callPackage ../development/libraries/netcdf { }; nc6 = callPackage ../tools/networking/nc6 { }; From 9c45b910024d8087a485c942f7f1c67c86905f5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Sep 2013 11:34:45 +0200 Subject: [PATCH 046/193] lua-5: update default version from 5.1.4 to 5.1.5 and add version 5.2.2 --- pkgs/development/interpreters/lua-5/5.1.nix | 2 +- pkgs/development/interpreters/lua-5/5.2.nix | 66 +++++++++++++++++++ .../interpreters/lua-5/default.nix | 51 -------------- pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 pkgs/development/interpreters/lua-5/5.2.nix delete mode 100644 pkgs/development/interpreters/lua-5/default.nix diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 8b1e1529095..e161683daf6 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline}: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix new file mode 100644 index 00000000000..0ae4fbe322a --- /dev/null +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, readline }: + +let + dsoPatch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/liblua.so.patch?h=packages/lua"; + sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; + name = "lua-arch.patch"; + }; +in +stdenv.mkDerivation rec { + name = "lua-${version}"; + version = "5.2.2"; + + src = fetchurl { + url = "http://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz"; + }; + + buildInputs = [ readline ]; + + patches = [ dsoPatch ]; + + configurePhase = '' + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.2" INSTALL_DATA='cp -d' ) + ''; + + postInstall = '' + mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" + mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" + rmdir $out/{share,lib}/lua/5.2 $out/{share,lib}/lua + mkdir -p "$out/lib/pkgconfig" + cat >"$out/lib/pkgconfig/lua.pc" < Date: Mon, 16 Sep 2013 11:50:15 +0200 Subject: [PATCH 047/193] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d565c25ca0..1218d19884d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -266,7 +266,7 @@ let buildEnv = import ../build-support/buildenv { inherit (pkgs) runCommand perl; }; - + buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv { inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils; inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk; @@ -9148,7 +9148,7 @@ let stardust = callPackage ../games/stardust {}; steam = callPackage_i686 ../games/steam {}; - + steamChrootEnv = callPackage_i686 ../games/steam/chrootenv.nix { zenity = gnome2.zenity; }; From 72c42d898738a29e2f132bc9eff6d6178457e2f7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 16 Sep 2013 12:11:11 +0200 Subject: [PATCH 048/193] Added js-yaml node package + update node packages --- pkgs/top-level/node-packages-generated.nix | 738 +++++++++++---------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 384 insertions(+), 355 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 15c01748a44..ce70a5475a0 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2,33 +2,33 @@ { full."CSSselect"."0.x" = lib.makeOverridable self.buildNodePackage { - name = "CSSselect-0.3.5"; + name = "CSSselect-0.3.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.5.tgz"; - sha1 = "b85cae765678432aa54be73c140e3d4de78938a1"; + url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.3.10.tgz"; + sha1 = "f139d09a1ec1e1104f717c1661d44e0bccd597d1"; }) ]; buildInputs = (self.nativeDeps."CSSselect"."0.x" or []); deps = [ - self.full."CSSwhat"."0.3" + self.full."CSSwhat"."0.4" self.full."domutils"."1" ]; peerDependencies = [ ]; passthru.names = [ "CSSselect" ]; }; - full."CSSwhat"."0.3" = lib.makeOverridable self.buildNodePackage { - name = "CSSwhat-0.3.0"; + full."CSSwhat"."0.4" = lib.makeOverridable self.buildNodePackage { + name = "CSSwhat-0.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.3.0.tgz"; - sha1 = "44e93c6a50dab70f59575a539cb09f4016e188ae"; + url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.0.tgz"; + sha1 = "563bf7a0ba373e28271ff147e5e893b67e4c4bac"; }) ]; buildInputs = - (self.nativeDeps."CSSwhat"."0.3" or []); + (self.nativeDeps."CSSwhat"."0.4" or []); deps = [ ]; peerDependencies = [ @@ -165,40 +165,6 @@ passthru.names = [ "almond" ]; }; "almond" = self.full."almond"."*"; - full."ambi"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "ambi-2.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ambi/-/ambi-2.0.0.tgz"; - sha1 = "42c2bf98e8d101aa4da28a812678a5dbe36ada66"; - }) - ]; - buildInputs = - (self.nativeDeps."ambi"."~2.0.0" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ambi" ]; - }; - full."ambi"."~2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ambi-2.1.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ambi/-/ambi-2.1.1.tgz"; - sha1 = "254ea79bf4203ed74a7038632e176e64640bb91d"; - }) - ]; - buildInputs = - (self.nativeDeps."ambi"."~2.1.0" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "ambi" ]; - }; full."amdefine"."*" = lib.makeOverridable self.buildNodePackage { name = "amdefine-0.0.8"; src = [ @@ -644,11 +610,11 @@ passthru.names = [ "async" ]; }; full."aws-sdk"."*" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.5.1"; + name = "aws-sdk-1.6.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz"; - sha1 = "5927d9539c9c82116501aed0747a2073375dfacd"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz"; + sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed"; }) ]; buildInputs = @@ -663,11 +629,11 @@ }; "aws-sdk" = self.full."aws-sdk"."*"; full."aws-sdk".">=1.2.0 <2" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-1.5.1"; + name = "aws-sdk-1.6.0"; src = [ (self.patchLatest { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.5.1.tgz"; - sha1 = "5927d9539c9c82116501aed0747a2073375dfacd"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.6.0.tgz"; + sha1 = "7541e3057a0a7bf9d749ddf2c10fffc7c24997ed"; }) ]; buildInputs = @@ -746,28 +712,6 @@ ]; passthru.names = [ "backoff" ]; }; - full."bal-util"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "bal-util-2.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bal-util/-/bal-util-2.0.5.tgz"; - sha1 = "b5a3b78e520b17892dfa051d2a819e8a48455b9c"; - }) - ]; - buildInputs = - (self.nativeDeps."bal-util"."~2.0.0" or []); - deps = [ - self.full."ambi"."~2.0.0" - self.full."eachr"."~2.0.2" - self.full."extendr"."~2.0.1" - self.full."safefs"."~3.0.1" - self.full."taskgroup"."~3.1.1" - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "bal-util" ]; - }; full."base64id"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "base64id-0.1.0"; src = [ @@ -785,11 +729,11 @@ passthru.names = [ "base64id" ]; }; full."bcrypt"."*" = lib.makeOverridable self.buildNodePackage { - name = "bcrypt-0.7.6"; + name = "bcrypt-0.7.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.6.tgz"; - sha1 = "97eae4472baf2352699f5fd1662e77e63d0cd0aa"; + url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.7.tgz"; + sha1 = "966a2e709b8cf62c2e05408baf7c5ed663b3c868"; }) ]; buildInputs = @@ -886,6 +830,22 @@ ]; passthru.names = [ "block-stream" ]; }; + full."blueimp-md5"."~1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "blueimp-md5-1.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.0.3.tgz"; + sha1 = "932f8fa56652701823cee46cecc0477c88333ab2"; + }) + ]; + buildInputs = + (self.nativeDeps."blueimp-md5"."~1.0.3" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "blueimp-md5" ]; + }; full."boom"."0.3.x" = lib.makeOverridable self.buildNodePackage { name = "boom-0.3.8"; src = [ @@ -2212,19 +2172,18 @@ ]; passthru.names = [ "connect" ]; }; - full."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.8.8"; + full."connect"."2.9.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; - sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; + sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; }) ]; buildInputs = - (self.nativeDeps."connect"."2.8.8" or []); + (self.nativeDeps."connect"."2.9.0" or []); deps = [ self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" self.full."cookie-signature"."1.0.1" self.full."buffer-crc32"."0.2.1" self.full."cookie"."0.1.0" @@ -2235,24 +2194,24 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" + self.full."multiparty"."2.1.8" ]; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; full."connect"."~2" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.8.8"; + name = "connect-2.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.8.8.tgz"; - sha1 = "b9abf8caf0bd9773cb3dea29344119872582446d"; + url = "http://registry.npmjs.org/connect/-/connect-2.9.0.tgz"; + sha1 = "ecf478b6f2723e72cf9a19d1c7d19d0b37b53746"; }) ]; buildInputs = (self.nativeDeps."connect"."~2" or []); deps = [ self.full."qs"."0.6.5" - self.full."formidable"."1.0.14" self.full."cookie-signature"."1.0.1" self.full."buffer-crc32"."0.2.1" self.full."cookie"."0.1.0" @@ -2263,6 +2222,7 @@ self.full."uid2"."0.0.2" self.full."debug"."*" self.full."methods"."0.0.1" + self.full."multiparty"."2.1.8" ]; peerDependencies = [ ]; @@ -2543,11 +2503,11 @@ passthru.names = [ "couch-login" ]; }; full."coveralls"."*" = lib.makeOverridable self.buildNodePackage { - name = "coveralls-2.2.0"; + name = "coveralls-2.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/coveralls/-/coveralls-2.2.0.tgz"; - sha1 = "9bfe310447895b5665fee55bfee0743cc47fa4e4"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.3.0.tgz"; + sha1 = "9eda569c115214acb7f58ca3a28401e866485144"; }) ]; buildInputs = @@ -2563,6 +2523,23 @@ passthru.names = [ "coveralls" ]; }; "coveralls" = self.full."coveralls"."*"; + full."crossroads"."~0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "crossroads-0.12.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz"; + sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e"; + }) + ]; + buildInputs = + (self.nativeDeps."crossroads"."~0.12.0" or []); + deps = [ + self.full."signals"."<2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "crossroads" ]; + }; full."cryptiles"."0.1.x" = lib.makeOverridable self.buildNodePackage { name = "cryptiles-0.1.3"; src = [ @@ -2919,16 +2896,16 @@ ]; passthru.names = [ "di" ]; }; - full."diff"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.2"; + full."diff"."1.0.7" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz"; - sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = - (self.nativeDeps."diff"."1.0.2" or []); + (self.nativeDeps."diff"."1.0.7" or []); deps = [ ]; peerDependencies = [ @@ -2936,11 +2913,11 @@ passthru.names = [ "diff" ]; }; full."diff"."~1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.6"; + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz"; - sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = @@ -2952,11 +2929,11 @@ passthru.names = [ "diff" ]; }; full."diff"."~1.0.4" = lib.makeOverridable self.buildNodePackage { - name = "diff-1.0.6"; + name = "diff-1.0.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.6.tgz"; - sha1 = "987bbd1ed596bd2f0c61d57ba2d9eb27b34f7e50"; + url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz"; + sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4"; }) ]; buildInputs = @@ -3017,11 +2994,11 @@ passthru.names = [ "domhandler" ]; }; full."domutils"."1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.1.4"; + name = "domutils-1.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz"; - sha1 = "14b774276187066c76f80141f7eac47a22f77248"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.1.5.tgz"; + sha1 = "6d3f86d1444993951afdd228a46f73cb2f688328"; }) ]; buildInputs = @@ -3051,11 +3028,11 @@ passthru.names = [ "domutils" ]; }; full."domutils"."1.1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.1.4"; + name = "domutils-1.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.1.4.tgz"; - sha1 = "14b774276187066c76f80141f7eac47a22f77248"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.1.5.tgz"; + sha1 = "6d3f86d1444993951afdd228a46f73cb2f688328"; }) ]; buildInputs = @@ -3083,23 +3060,6 @@ ]; passthru.names = [ "dtrace-provider" ]; }; - full."eachr"."~2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "eachr-2.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/eachr/-/eachr-2.0.2.tgz"; - sha1 = "f1100c5bb1619f6ee86a0661fe604e3a9ad7559d"; - }) - ]; - buildInputs = - (self.nativeDeps."eachr"."~2.0.2" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "eachr" ]; - }; full."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { name = "editor-0.0.4"; src = [ @@ -3428,17 +3388,17 @@ passthru.names = [ "events.node" ]; }; full."express"."*" = lib.makeOverridable self.buildNodePackage { - name = "express-3.3.8"; + name = "express-3.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz"; - sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd"; + url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; + sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; }) ]; buildInputs = (self.nativeDeps."express"."*" or []); deps = [ - self.full."connect"."2.8.8" + self.full."connect"."2.9.0" self.full."commander"."1.2.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" @@ -3510,17 +3470,17 @@ passthru.names = [ "express" ]; }; full."express"."3.x" = lib.makeOverridable self.buildNodePackage { - name = "express-3.3.8"; + name = "express-3.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.3.8.tgz"; - sha1 = "8e98ac30d81f4c95b85d71d2af6cf84f62ef19bd"; + url = "http://registry.npmjs.org/express/-/express-3.4.0.tgz"; + sha1 = "6ed289da0d5f55ac30997cf832e5fc36f784071e"; }) ]; buildInputs = (self.nativeDeps."express"."3.x" or []); deps = [ - self.full."connect"."2.8.8" + self.full."connect"."2.9.0" self.full."commander"."1.2.0" self.full."range-parser"."0.0.4" self.full."mkdirp"."0.3.5" @@ -3600,11 +3560,11 @@ passthru.names = [ "express-partials" ]; }; full."extend"."*" = lib.makeOverridable self.buildNodePackage { - name = "extend-1.2.0"; + name = "extend-1.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.2.0.tgz"; - sha1 = "da1a81af472a5a3e7fd607f85cdeaf69c169294d"; + url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }) ]; buildInputs = @@ -3616,23 +3576,6 @@ passthru.names = [ "extend" ]; }; "extend" = self.full."extend"."*"; - full."extendr"."~2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "extendr-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/extendr/-/extendr-2.0.1.tgz"; - sha1 = "d8ab375fcbb833e4ba2cd228540f04e4aa07de90"; - }) - ]; - buildInputs = - (self.nativeDeps."extendr"."~2.0.1" or []); - deps = [ - self.full."typechecker"."~2.0.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "extendr" ]; - }; full."extsprintf"."1.0.0" = lib.makeOverridable self.buildNodePackage { name = "extsprintf-1.0.0"; src = [ @@ -3698,17 +3641,17 @@ passthru.names = [ "eyes" ]; }; full."faye-websocket"."*" = lib.makeOverridable self.buildNodePackage { - name = "faye-websocket-0.6.1"; + name = "faye-websocket-0.7.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.6.1.tgz"; - sha1 = "43a54b2ab807761d7ec335d12f48eb69ec4ab61c"; + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.0.tgz"; + sha1 = "c16c50ec0d483357a8eafd1ec6fcc313d027f5be"; }) ]; buildInputs = (self.nativeDeps."faye-websocket"."*" or []); deps = [ - self.full."websocket-driver".">=0.2.0" + self.full."websocket-driver".">=0.3.0" ]; peerDependencies = [ ]; @@ -4376,11 +4319,11 @@ passthru.names = [ "generator-mocha" ]; }; full."generator-webapp"."*" = lib.makeOverridable self.buildNodePackage { - name = "generator-webapp-0.4.1"; + name = "generator-webapp-0.4.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.1.tgz"; - sha1 = "b2d3f1b3ea83fbbc0043c81fdf82a3fe725b6001"; + url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.2.tgz"; + sha1 = "41a856064a00ad952f9cbca79b176da9ab0aa969"; }) ]; buildInputs = @@ -4446,20 +4389,20 @@ ]; passthru.names = [ "glob" ]; }; - full."glob"."3.2.1" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.1"; + full."glob"."3.2.3" = lib.makeOverridable self.buildNodePackage { + name = "glob-3.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.1.tgz"; - sha1 = "57af70ec73ba2323bfe3f29a067765db64c5d758"; + url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; }) ]; buildInputs = - (self.nativeDeps."glob"."3.2.1" or []); + (self.nativeDeps."glob"."3.2.3" or []); deps = [ self.full."minimatch"."~0.2.11" - self.full."graceful-fs"."~1.2.0" - self.full."inherits"."1" + self.full."graceful-fs"."~2.0.0" + self.full."inherits"."2" ]; peerDependencies = [ ]; @@ -4591,11 +4534,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -4687,11 +4630,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."~2" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -4703,11 +4646,11 @@ passthru.names = [ "graceful-fs" ]; }; full."graceful-fs"."~2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-2.0.0"; + name = "graceful-fs-2.0.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; - sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.1.tgz"; + sha1 = "7fd6e0a4837c35d0cc15330294d9584a3898cf84"; }) ]; buildInputs = @@ -5098,6 +5041,23 @@ ]; passthru.names = [ "has-color" ]; }; + full."hasher"."~1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "hasher-1.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hasher/-/hasher-1.1.4.tgz"; + sha1 = "cb0a6c480bfa402adfbd4208452c64c684da9490"; + }) + ]; + buildInputs = + (self.nativeDeps."hasher"."~1.1.4" or []); + deps = [ + self.full."signals".">0.7 <2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hasher" ]; + }; full."hat"."*" = lib.makeOverridable self.buildNodePackage { name = "hat-0.0.3"; src = [ @@ -5731,11 +5691,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.2"; + name = "inquirer-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz"; - sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz"; + sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896"; }) ]; buildInputs = @@ -5751,11 +5711,11 @@ passthru.names = [ "inquirer" ]; }; full."inquirer"."~0.3.1" = lib.makeOverridable self.buildNodePackage { - name = "inquirer-0.3.2"; + name = "inquirer-0.3.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.2.tgz"; - sha1 = "a061f2ad3488bd2b38e5ac237c059a79f160bdd4"; + url = "http://registry.npmjs.org/inquirer/-/inquirer-0.3.3.tgz"; + sha1 = "476dfc4b32c24010f4fdf5479dc59368264f2896"; }) ]; buildInputs = @@ -5809,16 +5769,17 @@ passthru.names = [ "intersect" ]; }; full."ironhorse"."*" = lib.makeOverridable self.buildNodePackage { - name = "ironhorse-0.0.7"; + name = "ironhorse-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.7.tgz"; - sha1 = "5217f2cced8caffe15df95033492f8582e44e5ef"; + url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.8.tgz"; + sha1 = "b0c9c0908e6e22f7a48001be48533f12227c7980"; }) ]; buildInputs = (self.nativeDeps."ironhorse"."*" or []); deps = [ + self.full."underscore"."~1.5.2" self.full."winston"."*" self.full."nconf"."*" self.full."fs-walk"."*" @@ -5982,6 +5943,25 @@ passthru.names = [ "jayschema" ]; }; "jayschema" = self.full."jayschema"."*"; + full."js-yaml"."*" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-2.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + }) + ]; + buildInputs = + (self.nativeDeps."js-yaml"."*" or []); + deps = [ + self.full."argparse"."~ 0.1.11" + self.full."esprima"."~ 1.0.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "js-yaml" ]; + }; + "js-yaml" = self.full."js-yaml"."*"; full."js-yaml"."0.3.x" = lib.makeOverridable self.buildNodePackage { name = "js-yaml-0.3.7"; src = [ @@ -7068,6 +7048,22 @@ ]; passthru.names = [ "lru-cache" ]; }; + full."lru-cache"."~2.3.1" = lib.makeOverridable self.buildNodePackage { + name = "lru-cache-2.3.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }) + ]; + buildInputs = + (self.nativeDeps."lru-cache"."~2.3.1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "lru-cache" ]; + }; full."mailcomposer".">= 0.1.27" = lib.makeOverridable self.buildNodePackage { name = "mailcomposer-0.2.1"; src = [ @@ -7497,11 +7493,11 @@ passthru.names = [ "minimatch" ]; }; full."minimist"."~0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.2"; + name = "minimist-0.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.2.tgz"; - sha1 = "3297e0500be195b8fcb56668c45b925bc9bca7ab"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.3.tgz"; + sha1 = "a7a2ef8fbafecbae6c1baa4e56ad81e77acacb94"; }) ]; buildInputs = @@ -7690,11 +7686,11 @@ passthru.names = [ "mkdirp" ]; }; full."mocha"."*" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.12.1"; + name = "mocha-1.13.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.12.1.tgz"; - sha1 = "5212e3f5914eef8c0888ae344e6a7dd2e5ac294a"; + url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz"; + sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c"; }) ]; buildInputs = @@ -7703,10 +7699,10 @@ self.full."commander"."0.6.1" self.full."growl"."1.7.x" self.full."jade"."0.26.3" - self.full."diff"."1.0.2" + self.full."diff"."1.0.7" self.full."debug"."*" self.full."mkdirp"."0.3.5" - self.full."glob"."3.2.1" + self.full."glob"."3.2.3" ]; peerDependencies = [ ]; @@ -7865,11 +7861,11 @@ passthru.names = [ "mongoose" ]; }; full."mongoose"."3.6.x" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.6.18"; + name = "mongoose-3.6.19"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.18.tgz"; - sha1 = "cdf41325433ea795a1b3632ef1d7591db487d224"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.19.tgz"; + sha1 = "87eec5e7dd78ffaf7db6a0b6f2dc4c7b7d76dfa8"; }) ]; buildInputs = @@ -8057,6 +8053,24 @@ ]; passthru.names = [ "msgpack" ]; }; + full."multiparty"."2.1.8" = lib.makeOverridable self.buildNodePackage { + name = "multiparty-2.1.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/multiparty/-/multiparty-2.1.8.tgz"; + sha1 = "35a31834323578ee65f5d870568097914739cf4e"; + }) + ]; + buildInputs = + (self.nativeDeps."multiparty"."2.1.8" or []); + deps = [ + self.full."readable-stream"."~1.0.2" + self.full."stream-counter"."~0.1.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "multiparty" ]; + }; full."muri"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "muri-0.3.1"; src = [ @@ -8295,11 +8309,11 @@ passthru.names = [ "nib" ]; }; full."nijs"."*" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.10"; + name = "nijs-0.0.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.10.tgz"; - sha1 = "79d09c5c9a2f1f3e96708c9dc6b4547b89cf8177"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.11.tgz"; + sha1 = "386894330e53135a84e1c42c317b0384c0f48b7a"; }) ]; buildInputs = @@ -8330,11 +8344,11 @@ }; "node-expat" = self.full."node-expat"."*"; full."node-gyp"."*" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = @@ -8359,16 +8373,16 @@ passthru.names = [ "node-gyp" ]; }; "node-gyp" = self.full."node-gyp"."*"; - full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + full."node-gyp"."~0.10.10" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = - (self.nativeDeps."node-gyp"."~0.10.2" or []); + (self.nativeDeps."node-gyp"."~0.10.10" or []); deps = [ self.full."glob"."3" self.full."graceful-fs"."2" @@ -8388,16 +8402,16 @@ ]; passthru.names = [ "node-gyp" ]; }; - full."node-gyp"."~0.10.9" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.10.9"; + full."node-gyp"."~0.10.2" = lib.makeOverridable self.buildNodePackage { + name = "node-gyp-0.10.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.9.tgz"; - sha1 = "de5e20f75ee291975d67c105a5653b981bf8974f"; + url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz"; + sha1 = "74290b46b72046d648d301fae3813feb0d07edd9"; }) ]; buildInputs = - (self.nativeDeps."node-gyp"."~0.10.9" or []); + (self.nativeDeps."node-gyp"."~0.10.2" or []); deps = [ self.full."glob"."3" self.full."graceful-fs"."2" @@ -8702,11 +8716,11 @@ passthru.names = [ "normalize-package-data" ]; }; full."npm"."*" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.9"; + name = "npm-1.3.11"; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.9.tgz"; - sha1 = "dbf815e1661845046e82105a705f8df1735bb1ee"; + url = "http://registry.npmjs.org/npm/-/npm-1.3.11.tgz"; + sha1 = "4bf7f005fe1038c4fe9207603b961c97bd0ba5a3"; }) ]; buildInputs = @@ -8714,21 +8728,21 @@ deps = [ self.full."semver"."~2.1.0" self.full."ini"."~1.1.0" - self.full."slide"."~1.1.4" + self.full."slide"."~1.1.5" self.full."abbrev"."~1.0.4" self.full."graceful-fs"."~2.0.0" self.full."minimatch"."~0.2.12" self.full."nopt"."~2.1.2" self.full."rimraf"."~2.2.0" - self.full."request"."~2.25.0" + self.full."request"."~2.27.0" self.full."which"."1" self.full."tar"."~0.1.18" self.full."fstream"."~0.1.23" self.full."block-stream"."0.0.7" self.full."mkdirp"."~0.3.3" self.full."read"."~1.0.4" - self.full."lru-cache"."~2.3.0" - self.full."node-gyp"."~0.10.9" + self.full."lru-cache"."~2.3.1" + self.full."node-gyp"."~0.10.10" self.full."fstream-npm"."~0.1.3" self.full."uid-number"."0" self.full."archy"."0" @@ -8736,7 +8750,7 @@ self.full."npmlog"."0.0.4" self.full."ansi"."~0.1.2" self.full."npm-registry-client"."~0.2.28" - self.full."read-package-json"."~1.1.0" + self.full."read-package-json"."~1.1.3" self.full."read-installed"."~0.2.2" self.full."glob"."~3.2.6" self.full."init-package-json"."0.0.11" @@ -9675,11 +9689,11 @@ passthru.names = [ "pause" ]; }; full."phantomjs"."~1.9" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.1-9"; + name = "phantomjs-1.9.2-0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.1-9.tgz"; - sha1 = "f18671f4bcbbb5d5fc4a20ddcd6800ab0edc4453"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.2-0.tgz"; + sha1 = "36f265d99f8e5b40b1f3c92ddf94cbae66db7ebc"; }) ]; buildInputs = @@ -9940,11 +9954,11 @@ passthru.names = [ "pullstream" ]; }; full."q"."0.9.x" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9956,11 +9970,11 @@ passthru.names = [ "q" ]; }; full."q".">= 0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9972,11 +9986,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -9988,11 +10002,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9.2" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -10004,11 +10018,11 @@ passthru.names = [ "q" ]; }; full."q"."~0.9.6" = lib.makeOverridable self.buildNodePackage { - name = "q-0.9.6"; + name = "q-0.9.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; - sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }) ]; buildInputs = @@ -10327,6 +10341,26 @@ ]; passthru.names = [ "read-package-json" ]; }; + full."read-package-json"."~1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "read-package-json-1.1.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.3.tgz"; + sha1 = "a361ab3da88f6f78998df223ad8186a4b7e1f391"; + }) + ]; + buildInputs = + (self.nativeDeps."read-package-json"."~1.1.3" or []); + deps = [ + self.full."glob"."~3.2.1" + self.full."lru-cache"."2" + self.full."normalize-package-data"."~0.2" + self.full."graceful-fs"."2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "read-package-json" ]; + }; full."readable-stream"."1.0" = lib.makeOverridable self.buildNodePackage { name = "readable-stream-1.0.17"; src = [ @@ -11176,23 +11210,6 @@ passthru.names = [ "s3http" ]; }; "s3http" = self.full."s3http"."*"; - full."safefs"."~3.0.1" = lib.makeOverridable self.buildNodePackage { - name = "safefs-3.0.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/safefs/-/safefs-3.0.3.tgz"; - sha1 = "1d511e2945f0e7eccdd6bb12ec2e309abf13514e"; - }) - ]; - buildInputs = - (self.nativeDeps."safefs"."~3.0.1" or []); - deps = [ - self.full."taskgroup"."~3.2.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "safefs" ]; - }; full."sauce-connect-launcher"."~0.1.10" = lib.makeOverridable self.buildNodePackage { name = "sauce-connect-launcher-0.1.11"; src = [ @@ -11665,11 +11682,11 @@ passthru.names = [ "shelljs" ]; }; full."should"."*" = lib.makeOverridable self.buildNodePackage { - name = "should-1.2.2"; + name = "should-1.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-1.2.2.tgz"; - sha1 = "0f03f775066d9ea2632690c917b12824fcc1d582"; + url = "http://registry.npmjs.org/should/-/should-1.3.0.tgz"; + sha1 = "20b71a09b5ed16146b903022bd306ef332efe873"; }) ]; buildInputs = @@ -11697,12 +11714,60 @@ ]; passthru.names = [ "sigmund" ]; }; - full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.8"; + full."signals"."<2.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.8.tgz"; - sha1 = "64bea183c9d95211e17e21e228a20312661def09"; + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals"."<2.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."signals".">0.7 <2.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals".">0.7 <2.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."signals"."~1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "signals-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }) + ]; + buildInputs = + (self.nativeDeps."signals"."~1.0.0" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "signals" ]; + }; + full."simplesmtp".">= 0.1.22" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.10"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.10.tgz"; + sha1 = "f395f4b118de45f82ac4fdae4bd88f12dc326f5d"; }) ]; buildInputs = @@ -11812,6 +11877,22 @@ ]; passthru.names = [ "slide" ]; }; + full."slide"."~1.1.5" = lib.makeOverridable self.buildNodePackage { + name = "slide-1.1.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/slide/-/slide-1.1.5.tgz"; + sha1 = "31732adeae78f1d2d60a29b63baf6a032df7c25d"; + }) + ]; + buildInputs = + (self.nativeDeps."slide"."~1.1.5" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "slide" ]; + }; full."smartdc"."*" = lib.makeOverridable self.buildNodePackage { name = "smartdc-7.0.0"; src = [ @@ -12318,11 +12399,11 @@ passthru.names = [ "superagent" ]; }; full."supertest"."*" = lib.makeOverridable self.buildNodePackage { - name = "supertest-0.7.1"; + name = "supertest-0.8.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/supertest/-/supertest-0.7.1.tgz"; - sha1 = "349a65a8bfb5207250658f71761279ad3a671d88"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.8.0.tgz"; + sha1 = "c8dd008358ed60175cfd4dfab0ab1af81d0dc55b"; }) ]; buildInputs = @@ -12482,53 +12563,19 @@ ]; passthru.names = [ "tar" ]; }; - full."taskgroup"."~3.1.1" = lib.makeOverridable self.buildNodePackage { - name = "taskgroup-3.1.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.1.2.tgz"; - sha1 = "81fec5dc7eb647fd5a0ba8ed02ee3a730244ca16"; - }) - ]; - buildInputs = - (self.nativeDeps."taskgroup"."~3.1.1" or []); - deps = [ - self.full."ambi"."~2.0.0" - self.full."eventemitter2"."~0.4.11" - ]; - peerDependencies = [ - ]; - passthru.names = [ "taskgroup" ]; - }; - full."taskgroup"."~3.2.0" = lib.makeOverridable self.buildNodePackage { - name = "taskgroup-3.2.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/taskgroup/-/taskgroup-3.2.0.tgz"; - sha1 = "ac45e79852a080bd20716eae6d79931968d637d2"; - }) - ]; - buildInputs = - (self.nativeDeps."taskgroup"."~3.2.0" or []); - deps = [ - self.full."ambi"."~2.1.0" - ]; - peerDependencies = [ - ]; - passthru.names = [ "taskgroup" ]; - }; full."temp"."*" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.5.1"; + name = "temp-0.6.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz"; - sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df"; + url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; + sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; }) ]; buildInputs = (self.nativeDeps."temp"."*" or []); deps = [ self.full."rimraf"."~2.1.4" + self.full."osenv"."0.0.3" ]; peerDependencies = [ ]; @@ -12715,22 +12762,6 @@ ]; passthru.names = [ "tunnel-agent" ]; }; - full."typechecker"."~2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "typechecker-2.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.1.tgz"; - sha1 = "e18e99be60762c01bde38ef02f9a067ed887c454"; - }) - ]; - buildInputs = - (self.nativeDeps."typechecker"."~2.0.1" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "typechecker" ]; - }; full."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { name = "uglify-js-1.2.5"; src = [ @@ -12873,11 +12904,11 @@ passthru.names = [ "uid2" ]; }; full."underscore"."*" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12922,11 +12953,11 @@ passthru.names = [ "underscore" ]; }; full."underscore".">=1.1.7" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12938,11 +12969,11 @@ passthru.names = [ "underscore" ]; }; full."underscore".">=1.4.3" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.5.1"; + name = "underscore-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; - sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }) ]; buildInputs = @@ -12985,6 +13016,22 @@ ]; passthru.names = [ "underscore" ]; }; + full."underscore"."~1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "underscore-1.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore"."~1.5.2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "underscore" ]; + }; full."underscore.string"."~2.2.0rc" = lib.makeOverridable self.buildNodePackage { name = "underscore.string-2.2.1"; src = [ @@ -13018,11 +13065,11 @@ passthru.names = [ "underscore.string" ]; }; full."ungit"."*" = lib.makeOverridable self.buildNodePackage { - name = "ungit-0.1.8"; + name = "ungit-0.2.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ungit/-/ungit-0.1.8.tgz"; - sha1 = "9d6c45b3771d983bf011424f4cb284c1e79ef0c8"; + url = "http://registry.npmjs.org/ungit/-/ungit-0.2.0.tgz"; + sha1 = "fa25b1bd4670a527823dd0912d6f2fa2f1dc6a06"; }) ]; buildInputs = @@ -13032,7 +13079,6 @@ self.full."superagent"."0.14.7" self.full."underscore"."1.4.4" self.full."temp"."0.5.0" - self.full."watchr"."2.4.3" self.full."socket.io"."0.9.16" self.full."moment"."2.0.0" self.full."async"."0.2.9" @@ -13047,6 +13093,10 @@ self.full."forever-monitor"."1.1.0" self.full."open"."0.0.4" self.full."optimist"."0.6.0" + self.full."crossroads"."~0.12.0" + self.full."signals"."~1.0.0" + self.full."hasher"."~1.1.4" + self.full."blueimp-md5"."~1.0.3" ]; peerDependencies = [ ]; @@ -13419,28 +13469,6 @@ ]; passthru.names = [ "watch" ]; }; - full."watchr"."2.4.3" = lib.makeOverridable self.buildNodePackage { - name = "watchr-2.4.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/watchr/-/watchr-2.4.3.tgz"; - sha1 = "b7e32fc1cc7a730043a73b3fc6559ad2283af79e"; - }) - ]; - buildInputs = - (self.nativeDeps."watchr"."2.4.3" or []); - deps = [ - self.full."bal-util"."~2.0.0" - self.full."typechecker"."~2.0.1" - self.full."extendr"."~2.0.1" - self.full."eachr"."~2.0.2" - self.full."safefs"."~3.0.1" - self.full."taskgroup"."~3.1.1" - ]; - peerDependencies = [ - ]; - passthru.names = [ "watchr" ]; - }; full."wd"."~0.0.32" = lib.makeOverridable self.buildNodePackage { name = "wd-0.0.34"; src = [ @@ -13463,16 +13491,16 @@ ]; passthru.names = [ "wd" ]; }; - full."websocket-driver".">=0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.2.2"; + full."websocket-driver".">=0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.3.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz"; - sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.0.tgz"; + sha1 = "497b258c508b987249ab9b6f79f0c21dd3467c64"; }) ]; buildInputs = - (self.nativeDeps."websocket-driver".">=0.2.0" or []); + (self.nativeDeps."websocket-driver".">=0.3.0" or []); deps = [ ]; peerDependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index d3dcbe665c5..cdb1e4bc331 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -94,4 +94,5 @@ , "almond" , "lcov-result-merger" , "coveralls" +, "js-yaml" ] From 9fc836e2067202a1ffcea8bb36732fa4831157dd Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 16 Sep 2013 13:19:51 +0100 Subject: [PATCH 049/193] perlPackages: Add ocharles to maintainers for all packages he's contributed Close #979. vcunat edit: in one case the lines were added into "src" attribute instead of "meta". --- pkgs/top-level/perl-packages.nix | 358 ++++++++++++++++++++++++++++++- 1 file changed, 357 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c47bcc3b1a..9ab8de481d1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11,6 +11,8 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn gnused; + inherit (stdenv.lib) maintainers; + inherit __overrides; # Helper functions for packages that use Module::Build to build. @@ -33,7 +35,7 @@ rec { # use gnused so that the preCheck command passes buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; propagatedBuildInputs = [ FileNext ]; - meta = with stdenv.lib; { + meta = { description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; license = "free"; # Artistic 2.0 @@ -83,6 +85,10 @@ rec { sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; }; propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; aliased = buildPerlPackage rec { @@ -108,6 +114,10 @@ rec { url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz; sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; AnyEventRabbitMQ = buildPerlPackage { @@ -121,6 +131,8 @@ rec { meta = { description = "An asynchronous and multi channel Perl AMQP client"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -168,6 +180,8 @@ rec { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -289,6 +303,8 @@ rec { meta = { description = "Replace functions with ones that succeed or die with lexical scope"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -321,6 +337,8 @@ rec { meta = { description = "Wrap OP check callbacks"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -331,6 +349,10 @@ rec { sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs"; }; propagatedBuildInputs = [CarpClan]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; BKeywords = buildPerlPackage { @@ -392,6 +414,10 @@ rec { sha256 = "1aa2mjn5767b13063nnsrwcikrnbspby7j1c5q007bzaq0gcbcri"; }; propagatedBuildInputs = [ StringCRC32 ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CacheMemcachedFast = buildPerlPackage { @@ -403,6 +429,8 @@ rec { meta = { description = "Perl client for B, in C language"; license = "unknown"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -413,6 +441,10 @@ rec { sha256 = "1zykapgl9lxnlx79xfghzb26qimhry94xfxfyswwfhra1ywd9yyg"; }; propagatedBuildInputs = [ TimeDate DBFile DigestSHA1 FileNFSLock HeapFibonacci IOString ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; cam_pdf = buildPerlPackage rec { @@ -433,6 +465,10 @@ rec { }; propagatedBuildInputs = [HTMLTiny LWP]; buildInputs = [TestPod]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CaptureTiny = buildPerlPackage { @@ -518,6 +554,8 @@ rec { meta = { description = "HTTP Basic and Digest authentication"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -720,6 +758,8 @@ rec { meta = { description = "Flexible caching support for Catalyst."; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -734,6 +774,8 @@ rec { meta = { description = "HTTP/1.1 cache validators for Catalyst"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -769,6 +811,8 @@ rec { meta = { description = "Unicode aware Catalyst"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -941,6 +985,8 @@ rec { propagatedBuildInputs = [ TestException ]; meta = { description = "Convert flat hash to nested data using TT2's dot convention"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1002,6 +1048,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1407,6 +1455,10 @@ rec { sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; }; propagatedBuildInputs = [ SymbolUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; constantdefer = pkgs.perlPackages.constant-defer; @@ -1445,6 +1497,10 @@ rec { sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; CPANChanges = buildPerlPackage { @@ -1586,6 +1642,8 @@ rec { homepage = http://search.cpan.org/dist/Crypt-Random-Source; description = "Get weak or strong random data from pluggable sources"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1678,6 +1736,8 @@ rec { meta = { description = "Polymorphic data cloning"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1837,6 +1897,8 @@ rec { homepage = https://metacpan.org/release/Data-UUID-MT; description = "Fast random UUID generator using the Mersenne Twister algorithm"; license = "apache_2_0"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1858,6 +1920,10 @@ rec { sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy"; }; propagatedBuildInputs = [CarpClan BitVector]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; DateManip = buildPerlPackage { @@ -1966,6 +2032,8 @@ rec { meta = { description = "Parses ISO8601 formats"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -1993,6 +2061,8 @@ rec { meta = { description = "Parse and format PostgreSQL dates and times"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2235,6 +2305,8 @@ rec { homepage = http://search.cpan.org/dist/DBIx-Connector/; description = "Fast, safe DBI connection and transaction management"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2247,6 +2319,8 @@ rec { propagatedBuildInputs = [ DBI ]; meta = { description = "Very complete easy-to-use OO interface to DBI"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2258,6 +2332,8 @@ rec { }; meta = { description = "Find memory cycles in objects"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2272,6 +2348,8 @@ rec { meta = { description = "Adding keywords to perl, in perl"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2317,6 +2395,10 @@ rec { sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n"; }; propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; DevelStackTrace = buildPerlPackage { @@ -2385,6 +2467,8 @@ rec { meta = { description = "Keyed-Hashing for Message Authentication"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2405,6 +2489,8 @@ rec { propagatedBuildInputs = [ LWP ]; meta = { description = "Perl extension for getting MD5 sums for files and urls."; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2795,6 +2881,8 @@ rec { meta = { description = "Generate world unique message-ids"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2807,6 +2895,8 @@ rec { propagatedBuildInputs = [ EmailMessageID EmailMIMEContentType EmailMIMEEncodings EmailSimple MIMETypes ]; meta = { license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2819,6 +2909,8 @@ rec { meta = { description = "Parse a MIME Content-Type Header"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2830,6 +2922,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2901,6 +2995,10 @@ rec { url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Error = buildPerlPackage rec { @@ -2933,6 +3031,10 @@ rec { sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; }; buildInputs = [ TestUnitLite ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExceptionClass = buildPerlPackage rec { @@ -2952,6 +3054,10 @@ rec { }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExceptionWarning = buildPerlPackage { @@ -2962,6 +3068,10 @@ rec { }; buildInputs = [ TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; ExporterDeclare = buildPerlModule { @@ -2976,6 +3086,8 @@ rec { homepage = http://open-exodus.net/projects/Exporter-Declare; description = "Exporting done right"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3028,6 +3140,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3142,6 +3256,10 @@ rec { }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; propagatedBuildInputs = [ ExceptionBase ExceptionDied ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; FCGI = buildPerlPackage rec { @@ -3163,6 +3281,8 @@ rec { homepage = http://open-exodus.net/projects/Fennec-Lite; description = "Minimalist Fennec, the commonly used bits"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3300,6 +3420,10 @@ rec { url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.21.tar.gz; sha256 = "1kclhmyha2xijq49darlz82f3bn7gq3saycxpfiz3dndqhr5i9iz"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Filepushd = buildPerlPackage { @@ -3312,6 +3436,8 @@ rec { homepage = https://metacpan.org/release/File-pushd; description = "Change directory temporarily for a limited scope"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3334,6 +3460,8 @@ rec { homepage = http://github.com/ingydotnet/file-share-pm/tree; description = "Extend File::ShareDir to Local Libraries"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3359,6 +3487,8 @@ rec { meta = { description = "Install shared files"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3563,6 +3693,10 @@ rec { url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz; sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HashFlatten = buildPerlPackage rec { @@ -3619,6 +3753,10 @@ rec { sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47"; }; propagatedBuildInputs = [ Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HeapFibonacci = buildPerlPackage { @@ -3627,6 +3765,10 @@ rec { url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HookLexWrap = buildPerlPackage rec { @@ -3692,6 +3834,8 @@ rec { meta = { description = "HTML forms using Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3715,6 +3859,10 @@ rec { sha256 = "0wnb561yp1r3mqw2hmd16zm45lqqm2mp823s1rx2k4qw141rmkpv"; }; buildInputs = [ TestBase ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; HTMLScrubber = buildPerlPackage { @@ -3785,6 +3933,8 @@ rec { meta = { description = "Add XPath support to HTML::TreeBuilder"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -3966,6 +4116,8 @@ rec { homepage = https://github.com/ingydotnet/io-all-pm/tree; description = "IO::All of it to Graham and Damian!"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4093,6 +4245,8 @@ rec { homepage = https://github.com/rjbs/io-tiecombine; description = "Produce tied (and other) separate but combined variables"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4288,6 +4442,10 @@ rec { url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; libxml_perl = buildPerlPackage rec { @@ -4371,6 +4529,8 @@ rec { meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4392,6 +4552,10 @@ rec { url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; LocaleGettext = buildPerlPackage { @@ -4447,6 +4611,8 @@ rec { meta = { description = "Simple logging interface with a contextual log"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4460,6 +4626,8 @@ rec { meta = { description = "Dispatches messages to one or more outputs"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4585,6 +4753,10 @@ rec { sha256 = "1z89jszgifvjb8irzd8wrzim7l5m4hypdl9mj4dpkb4jm4189kmn"; }; propagatedBuildInputs = [ LWP HookLexWrap ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; LWPxParanoidAgent = buildPerlPackage rec { @@ -4683,6 +4855,8 @@ rec { homepage = http://search.cpan.org/dist/Math-Random-ISAAC; description = "Perl interface to the ISAAC PRNG algorithm"; license = "unrestricted"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4696,6 +4870,8 @@ rec { meta = { description = "Auto-seeded Mersenne Twister PRNGs"; license = "unrestricted"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4710,6 +4886,8 @@ rec { meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4731,6 +4909,8 @@ rec { meta = { description = "Tools for creating Meta objects to track custom metrics"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4744,6 +4924,8 @@ rec { meta = { description = "Basic method declarations with signatures, without source filters"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4890,6 +5072,8 @@ rec { meta = { description = "Declare author-only dependencies"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -4903,6 +5087,8 @@ rec { meta = { description = "Designate tests only run by module authors"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5012,6 +5198,10 @@ rec { sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Moo = buildPerlPackage { @@ -5069,6 +5259,8 @@ rec { homepage = http://metacpan.org/release/MooseX-ABC; description = "Abstract base classes for Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5094,6 +5286,8 @@ rec { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5117,6 +5311,8 @@ rec { meta = { description = "Extend your attribute interfaces (deprecated)"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5127,6 +5323,10 @@ rec { sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f"; }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXConfigFromFile = buildPerlPackage { @@ -5140,6 +5340,8 @@ rec { meta = { description = "An abstract Moose role for setting attributes from a configfile"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5198,6 +5400,8 @@ rec { homepage = https://github.com/pshangov/moosex-has-options; description = "Succinct options for Moose"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5352,6 +5556,10 @@ rec { }; buildInputs = [ Testuseok TestTableDriven ]; propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXSemiAffordanceAccessor = buildPerlPackage rec { @@ -5380,6 +5588,10 @@ rec { sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; }; buildInputs = [ Moose TestFatal TestRequires ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXStrictConstructor = buildPerlPackage { @@ -5440,6 +5652,10 @@ rec { }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ Moose MooseXTypes ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesDateTime = buildPerlPackage { @@ -5449,6 +5665,10 @@ rec { sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996"; }; propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesDateTimeMoreCoercions = buildPerlPackage { @@ -5472,6 +5692,10 @@ rec { sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g"; }; propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; MooseXTypesPathClass = buildPerlPackage { @@ -5499,6 +5723,8 @@ rec { homepage = https://github.com/karenetheridge/moosex-types-path-tiny; description = "Path::Tiny types and coercions for Moose"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5527,6 +5753,8 @@ rec { homepage = https://github.com/dagolden/moosex-types-stringlike; description = "Moose type constraints for strings or string-like objects"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5542,6 +5770,8 @@ rec { homepage = http://metacpan.org/release/MooseX-Types-Structured; description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5552,6 +5782,10 @@ rec { sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s"; }; propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Mouse = buildPerlPackage rec { @@ -5646,6 +5880,8 @@ rec { propagatedBuildInputs = [ URI ]; meta = { description = "Perl extension to create signatures for AWS requests"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5710,6 +5946,8 @@ rec { meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5724,6 +5962,8 @@ rec { meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; preConfigure = '' @@ -5746,6 +5986,8 @@ rec { homepage = https://github.com/metabrainz/CoverArtArchive; description = "Query the coverartarchive.org"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5825,6 +6067,8 @@ rec { meta = { description = "An Asynchronous and multi channel Perl AMQP client"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -5932,6 +6176,8 @@ rec { meta = { description = "Comprehensive inside-out object support module"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6110,6 +6356,8 @@ rec { homepage = https://metacpan.org/release/Path-Tiny; description = "File path utility"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; preConfigure = '' @@ -6236,6 +6484,8 @@ rec { meta = { description = "Display information about the current request/response"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6554,6 +6804,8 @@ rec { homepage = http://metacpan.org/release/Redis/; description = "Perl binding for Redis database"; license = "artistic_2"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6605,6 +6857,8 @@ rec { homepage = http://jaldhar.github.com/REST-Utils; description = "Utility functions for REST applications"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6674,6 +6928,10 @@ rec { sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6"; }; propagatedBuildInputs = [ SOAPLite ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; SafeIsa = buildPerlPackage { @@ -6749,6 +7007,8 @@ rec { }; meta = { license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6770,6 +7030,8 @@ rec { meta = { description = "Perl's Web Services Toolkit"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6905,6 +7167,8 @@ rec { propagatedBuildInputs = [ NumberFormat ]; meta = { license = "open_source"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -6978,6 +7242,10 @@ rec { url = mirror://cpan/authors/id/S/SO/SOENKE/String-CRC32-1.4.tar.gz; sha256 = "0lc3d4szxagwzcw6pxq3mmkvdlrz2zkw4i13crf42nvivv7gda8l"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringErrf = buildPerlPackage { @@ -7000,6 +7268,10 @@ rec { url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringFlogger = buildPerlPackage { @@ -7065,6 +7337,10 @@ rec { url = mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz; sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; StringToIdentifierEN = buildPerlPackage rec { @@ -7101,6 +7377,8 @@ rec { meta = { description = "Use TT to interpolate lexical variables"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7291,6 +7569,10 @@ rec { url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; syntax = buildPerlPackage { @@ -7380,6 +7662,10 @@ rec { sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; }; propagatedBuildInputs = [ TemplateToolkit ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TemplatePluginJavaScript = buildPerlPackage { @@ -7389,6 +7675,10 @@ rec { sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; }; propagatedBuildInputs = [ TemplateToolkit ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TemplateTimer = buildPerlPackage { @@ -7527,6 +7817,10 @@ rec { }; buildInputs = [ ClassInspector TestUnitLite ]; propagatedBuildInputs = [ constantboolean ExceptionBase SymbolUtil ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestAssertions = buildPerlPackage rec { @@ -7623,6 +7917,8 @@ rec { homepage = http://metacpan.org/release/Test-EOL; description = "Check the correct line endings in your project"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7646,6 +7942,8 @@ rec { homepage = https://metacpan.org/release/Test-FailWarnings; description = "Add test failures if warnings are caught"; license = "apache"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7693,6 +7991,10 @@ rec { sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; propagatedBuildInputs = [ JSONAny TestDifferences TestTester ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestLongString = buildPerlPackage rec { @@ -7712,6 +8014,8 @@ rec { propagatedBuildInputs = [ DevelCycle PadWalker ]; meta = { description = "Verifies code hasn't left circular references"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7726,6 +8030,8 @@ rec { meta = { description = "Simulating other classes"; license = "lgpl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7735,6 +8041,10 @@ rec { url = mirror://cpan/authors/id/S/SI/SIMONFLK/Test-MockModule-0.05.tar.gz; sha256 = "01vf75higpap5mwm5fyas08b3qcmy5bfq1c3wl4h0y3nihjibib7"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestMockObject = buildPerlPackage { @@ -7806,6 +8116,8 @@ rec { meta = { description = "Check the presence of tabs in your project"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7923,6 +8235,8 @@ rec { homepage = https://github.com/rjbs/Test-Routine; description = "Composable units of assertion"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -7975,6 +8289,8 @@ rec { meta = { description = "Write tests, not scripts that run them"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8008,6 +8324,8 @@ rec { meta = { description = "Unit testing without external dependencies"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8061,6 +8379,8 @@ rec { meta = { description = "Test fallback behaviour in absence of modules"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8099,6 +8419,10 @@ rec { sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; propagatedBuildInputs = [ TestWWWMechanize WWWMechanizeCGI ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TestWWWMechanizePSGI = buildPerlPackage { @@ -8121,6 +8445,10 @@ rec { sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi"; }; propagatedBuildInputs = [ XMLLibXML ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TextAligner = buildPerlPackage { @@ -8196,6 +8524,8 @@ rec { meta = { description = "Spy on objects to achieve test doubles (mock testing)"; license = "perl5"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8222,6 +8552,8 @@ rec { meta = { description = "Micro template engine with Perl5 language"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8347,6 +8679,8 @@ rec { meta = { description = "Remove leading and/or trailing whitespace from strings"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8356,6 +8690,10 @@ rec { url = mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz; sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; TextUnidecode = buildPerlPackage rec { @@ -8373,6 +8711,10 @@ rec { sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry"; }; propagatedBuildInputs = [ URI ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; Throwable = buildPerlPackage rec { @@ -8545,6 +8887,8 @@ rec { meta = { description = "Wrapper around ICU collation services"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; buildInputs = [ pkgs.icu ]; }; @@ -8593,6 +8937,8 @@ rec { meta = { description = "Build a URI from a set of named parameters"; license = "perl"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8694,6 +9040,10 @@ rec { }; propagatedBuildInputs = [ HTTPRequestAsCGI WWWMechanize ]; preConfigure = "sed -i 's|#!/usr/bin/perl|#!${perl}/bin/perl|' t/cgi-bin/script.cgi"; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; WWWRobotRules = buildPerlPackage { @@ -8796,6 +9146,8 @@ rec { }; meta = { description = "A re-usable XPath engine for DOM-like trees"; + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; }; }; @@ -8823,6 +9175,10 @@ rec { sha256 = "05rzm433vvndh49k8p4gqnyw4x4lxa4zr6qdlrlgplqkxvhvk6jk"; }; propagatedBuildInputs = [ XMLParser ]; + meta = { + maintainers = with maintainers; [ ocharles ]; + platforms = stdenv.lib.platforms.unix; + }; }; XMLSimple = buildPerlPackage { From 8041a3372619290d941a1d719ca5d68166e1dd7a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 16 Sep 2013 15:56:55 +0200 Subject: [PATCH 050/193] Add MegaCli, a command line tool to manage certain RAID cards. --- pkgs/tools/misc/megacli/default.nix | 31 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/megacli/default.nix diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix new file mode 100644 index 00000000000..7a8e1f96b1c --- /dev/null +++ b/pkgs/tools/misc/megacli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: +stdenv.mkDerivation rec { + name = "megacli-8.07.07"; + src = + requireFile { + name = "8.07.07_MegaCLI.zip"; + url = http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.07.07_MegaCLI.zip; + sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; + }; + + buildInputs = [rpm cpio ncurses unzip makeWrapper]; + libPath = + stdenv.lib.makeLibraryPath + [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; + + buildCommand = '' + ensureDir $out/bin + cd $out + unzip ${src} + rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 + wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 + ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 + eval fixupPhase + ''; + + meta = { + description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards."; + license = "unfree"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1218d19884d..c27867cb055 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1247,6 +1247,8 @@ let mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; + megacli = callPackage ../tools/misc/megacli { }; + megatools = callPackage ../tools/networking/megatools { }; minecraft = callPackage ../games/minecraft { }; From 9278aa436eace51cbd0d4f3111a04efd184e39e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Sep 2013 10:44:04 +0200 Subject: [PATCH 051/193] Fix upower warning Namely "libgcc_s.so.1 must be installed for pthread_cancel to work". --- pkgs/os-specific/linux/upower/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 8f244c3d645..d5dc292ac33 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; + NIX_CFLAGS_LINK = "-lgcc_s"; + installFlags = "historydir=$(TMPDIR)/foo"; meta = { From 7216b3c8446b2ab1fd70ceb1f42605ba0a49a080 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Sep 2013 14:20:14 +0200 Subject: [PATCH 052/193] systemd: Add kexec support --- pkgs/os-specific/linux/systemd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 77126e5ffdc..63e1a2a3bf3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl +, kexectools }: assert stdenv.isLinux; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { '' # FIXME: patch this in systemd properly (and send upstream). # FIXME: use sulogin from util-linux once updated. - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c src/core/shutdown.c; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ @@ -60,7 +61,8 @@ stdenv.mkDerivation rec { --replace /sbin/fsck ${utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${sysvtools}/sbin/sulogin + --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \ + --replace /sbin/kexec ${kexectools}/sbin/kexec done substituteInPlace src/journal/catalog.c \ From 2d14789920b6e1443e42ae35aa20fb42c1667e6a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Sep 2013 17:49:17 +0200 Subject: [PATCH 053/193] linux: Update to 3.4.62 --- 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 33494a65f23..b275d0740dd 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.61"; + version = "3.4.62"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1izjmpcb2ww1pj5nyxgnx4v5ghl0d173w2s6py89ai4yqzqamhnf"; + sha256 = "1cfi7125xdb1b9mrabrxyr86ixyb8jik21vg5r8d355r0zgz124m"; }; features.iwlwifi = true; From 2b6c07f5a8cee5b1ac02db2c1035e1d515e86a40 Mon Sep 17 00:00:00 2001 From: Krofek Date: Mon, 16 Sep 2013 23:06:51 +0200 Subject: [PATCH 054/193] hostapd update: 1.0 -> 2.0 --- pkgs/os-specific/linux/hostapd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b8e5055f056..410fa6a7ad6 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "1.0"; + version = "2.0"; src = fetchurl { - url = "http://w1.fi/releases/${name}.tar.gz"; - sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0"; + url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; + sha256 = "262ce394b930bccc3d65fb99ee380f28d36444978f524c845a98e8e29f4e9d35"; }; buildInputs = [ libnl openssl pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/bin"; meta = with stdenv.lib; { - homepage = http://w1.fi/hostapd/; + homepage = http://hostap.epitest.fi; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; From 1d8a998c691bc8df2409b21e04e7956ba741e076 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 17 Sep 2013 01:41:35 +0300 Subject: [PATCH 055/193] quassel: update to 0.9.0 --- pkgs/applications/networking/irc/quassel/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 16aaf3d9f3b..f7dc270251c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -11,11 +11,11 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.7.4"; + name = "quassel-0.9.0"; src = fetchurl { url = "http://quassel-irc.org/pub/${name}.tar.bz2"; - sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7"; + sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf"; }; buildInputs = [ cmake qt4 ] @@ -48,6 +48,7 @@ in with stdenv; mkDerivation rec { ''; license = "GPLv3"; maintainers = [ maintainers.phreedom ]; + repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } From a5037b88582a6c8e1772210397a8c89f9974766b Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Sep 2013 07:00:44 +0200 Subject: [PATCH 056/193] python-pyblock: Update to version 0.53. As the SHA256 changed in the meantime and there are only minor changes between 0.52 and 0.53, I've updated this to the release tarball, which hopefully won't change anytime soon. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84d75e917b4..558d753e124 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4157,13 +4157,13 @@ pythonPackages = modules // import ./python-packages-generated.nix { pyblock = stdenv.mkDerivation rec { - name = "python-pyblock-${version}"; - version = "0.52-1"; + name = "pyblock-${version}"; + version = "0.53"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/pyblock.git/snapshot/" - + "pyblock-${version}.tar.bz2"; - sha256 = "1jj5hd1dcr8xx00rg3jynsf4ak88wwr5id3fmb0qf6zvim1whj7l"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "f6d33a8362dee358517d0a9e2ebdd044"; }; postPatch = '' From 1f1420d3d80c0568a5cafb16c4c858deb43a7c53 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Sep 2013 07:02:46 +0200 Subject: [PATCH 057/193] python-pykickstart: Update to version 1.99.39. As well as pyblock, the SHA256 changed here as well. Although the changes between 1.99.32 and 1.99.39 aren't as minor as with pyblock, this shouldn't have any impact on nixpart so I think it's safe to upgrade (we'll see later, should we end up with failed tests in nixpart or . Of course we're now using the release tarball from the repo site here as well. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 558d753e124..c7b6ecc2d4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4392,12 +4392,12 @@ pythonPackages = modules // import ./python-packages-generated.nix { pykickstart = buildPythonPackage rec { name = "pykickstart-${version}"; - version = "1.99.32-1"; + version = "1.99.39"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/pykickstart.git/snapshot/" - + "r${version}.tar.bz2"; - sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + + "${name}.tar.gz/${md5}/${name}.tar.gz"; + md5 = "d249f60aa89b1b4facd63f776925116d"; }; postPatch = '' From 7d10bbb4c8ed181199f02855c02d0fe150ea5e27 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Sep 2013 10:58:09 +0200 Subject: [PATCH 058/193] chromium: Update beta and dev channels. beta: 30.0.1599.22 -> 30.0.1599.37 dev: 31.0.1612.0 -> 31.0.1626.0 (new patch sandbox_userns_31.patch) I've rebased the user namespace sandbox patch against current trunk for the dev version, because it didn't apply anymore. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 4 +++- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 087bde000ed..18fb7fefeff 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -90,7 +90,9 @@ let # user namespace sandbox patch userns_patch = if versionOlder sourceInfo.version "30.0.0.0" then ./sandbox_userns_29.patch - else ./sandbox_userns_30.patch; + else if versionOlder sourceInfo.version "31.0.0.0" + then ./sandbox_userns_30.patch + else ./sandbox_userns_31.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index e83f9948535..79aa06192c5 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 = "31.0.1612.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1612.0.tar.xz"; - sha256 = "19h6i8jdnpzbvyq8pk9jq89lghnydpij9yj8xfs7qdgqgyxxcl5w"; + version = "31.0.1626.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1626.0.tar.xz"; + sha256 = "15rbh8hjs9ipkl4c34701p1zpfmrsw6dya03a8ym5pa5dha949mp"; }; beta = { - version = "30.0.1599.22"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.22.tar.xz"; - sha256 = "0955q7fz6nfr7nbxa8hp9q7mgljlan42rjg8ql5x2vn6c80sjji8"; + version = "30.0.1599.37"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1599.37.tar.xz"; + sha256 = "05xxafl1dgbi040zmhzi5v5m6myi7c6jgq2nrksmrx2i91kfir2k"; }; stable = { version = "29.0.1547.65"; From f2254354f96f4d337a6b56667ca021be0645a5ed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Sep 2013 11:03:51 +0200 Subject: [PATCH 059/193] Fix Nixpkgs evaluation https://hydra.nixos.org/build/6169018 --- pkgs/tools/misc/megacli/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 7a8e1f96b1c..2b15d4470c3 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,11 @@ -{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: +{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: + +assert stdenv.system == "x86_64-linux"; + stdenv.mkDerivation rec { name = "megacli-8.07.07"; - src = + + src = requireFile { name = "8.07.07_MegaCLI.zip"; url = http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.07.07_MegaCLI.zip; @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards."; + description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; license = "unfree"; }; } From fc2210300f80368a2e0076bd4d6e0b0043096f4f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 17 Sep 2013 11:18:45 +0200 Subject: [PATCH 060/193] plone: update to 4.3.2 --- pkgs/top-level/python-packages-generated.nix | 1661 +++++++++--------- pkgs/top-level/python-packages.json | 2 +- 2 files changed, 832 insertions(+), 831 deletions(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ff86757c979..d7a1e32753a 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -55,7 +55,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -67,15 +67,15 @@ in }; - "Products.Archetypes-1.9.1" = self.buildPythonPackage { - name = "Products.Archetypes-1.9.1"; + "Products.Archetypes-1.9.4" = self.buildPythonPackage { + name = "Products.Archetypes-1.9.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip"; - md5 = "c2343539f9f3e485f0bc98b46c12cd85"; + url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.4.zip"; + md5 = "fc5679b10df703a542b58da044f7d9c6"; }; 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" ]; + 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.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -87,6 +87,26 @@ in }; + "plone.app.contentlisting-1.0.5" = self.buildPythonPackage { + name = "plone.app.contentlisting-1.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip"; + md5 = "9fc15b8ecad1c918778c3ea9a75bf533"; + }; + 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"; + }; + }; + + "Products.Marshall-2.1.2" = self.buildPythonPackage { name = "Products.Marshall-2.1.2"; src = fetchurl { @@ -95,7 +115,7 @@ in }; 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" ]; + 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.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -127,15 +147,55 @@ in }; - "Products.CMFPlone-4.3.1" = self.buildPythonPackage { - name = "Products.CMFPlone-4.3.1"; + "plone.z3cform-0.8.0" = self.buildPythonPackage { + name = "plone.z3cform-0.8.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip"; - md5 = "2fee0c66e0d9bdf28b513bcd6d95a602"; + 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."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" ]; + propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ]; + 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"; + }; + }; + + + "six-1.4.1" = self.buildPythonPackage { + name = "six-1.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/six/six-1.4.1.tar.gz"; + md5 = "bdbb9e12d3336c198695aa4cf3a61d62"; + }; + 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"; + }; + }; + + + "Products.CMFPlone-4.3.2" = self.buildPythonPackage { + name = "Products.CMFPlone-4.3.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.2.zip"; + md5 = "b9948583429d7d90475148d276fa5cf4"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.9" self."archetypes.referencebrowserwidget-2.4.19" 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.11" self."plone.app.content-2.1.3" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.8" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.6" self."plone.app.layout-2.3.7" self."plone.app.linkintegrity-1.5.3" self."plone.app.locales-4.3.2" self."plone.app.portlets-2.4.5" self."plone.app.redirector-1.2" self."plone.app.search-1.1.5" self."plone.app.upgrade-1.3.4" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.4" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" 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.9" 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.5" self."Products.Archetypes-1.9.4" 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.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.15" self."Products.PlacelessTranslationService-2.0.4" 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.5" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -167,11 +227,31 @@ in }; - "waitress-0.8.6" = self.buildPythonPackage { - name = "waitress-0.8.6"; + "Mako-0.9.0" = self.buildPythonPackage { + name = "Mako-0.9.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.6.tar.gz"; - md5 = "eb5a8968780cfbc6b75364683b09f5fe"; + url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.9.0.tar.gz"; + md5 = "e2627ba5c65f83dfe39d9a0892ae517d"; + }; + 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"; + }; + }; + + + "waitress-0.8.7" = self.buildPythonPackage { + name = "waitress-0.8.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.7.tar.gz"; + md5 = "714f3d458d82a47f12fb168460de8366"; }; doCheck = false; buildInputs = [ ]; @@ -207,22 +287,22 @@ in }; - "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.8" 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"; }; }; @@ -235,7 +315,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -247,35 +327,15 @@ in }; - "roman-1.4.0" = self.buildPythonPackage { - name = "roman-1.4.0"; + "plone.autoform-1.5" = self.buildPythonPackage { + name = "plone.autoform-1.5"; 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"; + url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.5.zip"; + md5 = "a62216fb76017077643f5af8b1e17949"; }; 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" ]; + propagatedBuildInputs = [ self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" 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 = '' @@ -415,7 +475,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -427,26 +487,6 @@ in }; - "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 { @@ -487,41 +527,21 @@ in }; - "six-1.3.0" = self.buildPythonPackage { - name = "six-1.3.0"; + "Products.PlacelessTranslationService-2.0.4" = self.buildPythonPackage { + name = "Products.PlacelessTranslationService-2.0.4"; 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"; - }; - }; - - - "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"; + url = "https://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/Products.PlacelessTranslationService-2.0.4.zip"; + md5 = "4b5a1ddc66eeaa02d32ee4a685905c10"; }; 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."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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Versioning for Plone + PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing) software for Zope 2. ''; - homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + homepage = "http://pypi.python.org/pypi/Products.PlacelessTranslationService"; license = "GPL"; }; }; @@ -575,26 +595,6 @@ in }; - "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 { @@ -623,7 +623,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -643,7 +643,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -683,7 +683,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -735,22 +735,22 @@ in }; - "zope.component-4.1.0" = self.buildPythonPackage { - name = "zope.component-4.1.0"; + "Products.CMFCore-2.2.7" = self.buildPythonPackage { + name = "Products.CMFCore-2.2.7"; 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.CMFCore/Products.CMFCore-2.2.7.tar.gz"; + md5 = "9320a4023b8575097feacfd4a400e930"; }; 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" .''; + buildInputs = [ ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Component Architecture + Zope Content Management Framework core components ''; - homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/Products.CMFCore"; + license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; }; }; @@ -763,7 +763,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -803,7 +803,7 @@ in }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.18" self.setuptools self."zope.deprecation-3.4.1" ]; + propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.19" self.setuptools self."zope.deprecation-3.4.1" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -843,7 +843,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -855,26 +855,6 @@ in }; - "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 { @@ -923,7 +903,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -955,15 +935,35 @@ 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.4" 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.21" ]; + installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; + meta = { + description = '' + Versioning for Plone + ''; + homepage = "http://pypi.python.org/pypi/Products.CMFEditions"; + license = "GPL"; + }; + }; + + + "plone.app.form-2.2.3" = self.buildPythonPackage { + name = "plone.app.form-2.2.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.3.zip"; + md5 = "4b7dcabcda1407a40185782a4d1f9a01"; + }; + 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.11" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -983,7 +983,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1015,42 +1015,22 @@ 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" .''; - meta = { - description = '' - Password reset tool for Plone - ''; - 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" ]; + propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' - UNKNOWN + Zope Component Architecture ''; - homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + homepage = "http://pypi.python.org/pypi/zope.component"; + license = "ZPL 2.1"; }; }; @@ -1115,11 +1095,11 @@ in }; - "plonetheme.sunburst-1.4.4" = self.buildPythonPackage { - name = "plonetheme.sunburst-1.4.4"; + "plonetheme.sunburst-1.4.5" = self.buildPythonPackage { + name = "plonetheme.sunburst-1.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip"; - md5 = "f2cb3fdd66ecc14d1a542d2ca76252db"; + url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.5.zip"; + md5 = "a8438d6f4a27ad6c10dc3554a9145705"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -1183,7 +1163,7 @@ in }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1203,7 +1183,7 @@ in }; 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."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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1215,26 +1195,6 @@ in }; - "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 { @@ -1275,35 +1235,15 @@ in }; - "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { - name = "Products.ExternalEditor-1.1.0"; + "plone.app.content-2.1.3" = self.buildPythonPackage { + name = "plone.app.content-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; - md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.3.zip"; + md5 = "3463a245414518f058fa6d658a6b9caf"; }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.9" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1323,7 +1263,7 @@ in }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1375,25 +1315,22 @@ in }; - "diazo-1.0.3" = self.buildPythonPackage { - name = "diazo-1.0.3"; + "plone.dexterity-2.1.3" = self.buildPythonPackage { + name = "plone.dexterity-2.1.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.3.zip"; - md5 = "d3c2b017af521db4c86fb360c86e0bc8"; + 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."experimental.cssselect-0.3" self."lxml-2.3.6" self.setuptools ]; + propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" 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.21" ]; 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. + Flexible CMF content ''; - homepage = "http://diazo.org"; - license = "New BSD"; + homepage = "http://code.google.com/p/dexterity"; + license = "GPL version 2"; }; }; @@ -1418,6 +1355,30 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "diazo-1.0.4" = self.buildPythonPackage { + name = "diazo-1.0.4"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.4.zip"; + md5 = "b5f07cfd928e06bcb964b3f830767bab"; + }; + 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"; + }; + }; + + "zc.lockfile-1.0.2" = self.buildPythonPackage { name = "zc.lockfile-1.0.2"; src = fetchurl { @@ -1518,21 +1479,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.location-4.0.2" = self.buildPythonPackage { - name = "zope.location-4.0.2"; + "zope.configuration-3.7.4" = self.buildPythonPackage { + name = "zope.configuration-3.7.4"; 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/z/zope.configuration/zope.configuration-3.7.4.zip"; + md5 = "5b0271908ef26c05059eda76928896ea"; }; - 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.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 Location + Zope Configuration Markup Language (ZCML) ''; - homepage = "http://pypi.python.org/pypi/zope.location/"; + homepage = "http://pypi.python.org/pypi/zope.configuration"; license = "ZPL 2.1"; }; }; @@ -1546,7 +1507,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1558,21 +1519,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { - name = "Products.PortalTransforms-2.1.2"; + "python-openid-2.2.5" = self.buildPythonPackage { + name = "python-openid-2.2.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; - md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + url = "https://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz"; + md5 = "393f48b162ec29c3de9e2973548ea50d"; }; 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" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - MIME based content transformations + OpenID support for servers and consumers. ''; - homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + homepage = "http://github.com/openid/python-openid"; license = "UNKNOWN"; }; }; @@ -1598,6 +1559,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "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"; + }; + }; + + "lxml-3.2.3" = self.buildPythonPackage { name = "lxml-3.2.3"; src = fetchurl { @@ -1626,7 +1607,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -1638,15 +1619,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.controlpanel-2.3.6" = self.buildPythonPackage { - name = "plone.app.controlpanel-2.3.6"; + "Products.PythonScripts-2.13.2" = self.buildPythonPackage { + name = "Products.PythonScripts-2.13.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip"; - md5 = "ca5e0e0c8497d9860603e39e0eeba9b8"; + 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."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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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"; + }; + }; + + + "plone.app.controlpanel-2.3.7" = self.buildPythonPackage { + name = "plone.app.controlpanel-2.3.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.7.zip"; + md5 = "537072fe22237a2148310b8714755356"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1678,26 +1679,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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"; - }; - }; - - "docutils-0.9.1" = self.buildPythonPackage { name = "docutils-0.9.1"; src = fetchurl { @@ -1738,6 +1719,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "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"; + }; + }; + + "nose-1.3.0" = self.buildPythonPackage { name = "nose-1.3.0"; src = fetchurl { @@ -1778,26 +1779,6 @@ 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"; - 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"; - }; - }; - - "zope.error-3.7.4" = self.buildPythonPackage { name = "zope.error-3.7.4"; src = fetchurl { @@ -1826,7 +1807,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."plone.app.portlets-2.4.5" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1838,22 +1819,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "five.globalrequest-1.0" = self.buildPythonPackage { - name = "five.globalrequest-1.0"; + "Products.PortalTransforms-2.1.2" = self.buildPythonPackage { + name = "Products.PortalTransforms-2.1.2"; 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/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip"; + md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; }; 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."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.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope 2 integration for zope.globalrequest + MIME based content transformations ''; - homepage = "http://pypi.python.org/pypi/five.globalrequest"; - license = "ZPL"; + homepage = "http://pypi.python.org/pypi/Products.PortalTransforms"; + license = "UNKNOWN"; }; }; @@ -1898,15 +1879,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.portlets-2.4.4" = self.buildPythonPackage { - name = "plone.app.portlets-2.4.4"; + "plone.app.portlets-2.4.5" = self.buildPythonPackage { + name = "plone.app.portlets-2.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip"; - md5 = "c1144f7686cacf3d64fcd202ab2e5e2d"; + url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.5.zip"; + md5 = "409aeeed42d87af8338197514363ec76"; }; 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" ]; + 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.3" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.11" self."plone.i18n-2.0.9" 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.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -1918,26 +1899,46 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.dexterity-2.1.3" = self.buildPythonPackage { - name = "plone.dexterity-2.1.3"; + "Plone-4.3.2" = self.buildPythonPackage { + name = "Plone-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip"; - md5 = "7f6444a2c26488e4068217266fd243b7"; + url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip"; + md5 = "809f9fe8b8d23b49778e8ce304ea34f6"; }; 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" ]; + propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" 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.2" self.setuptools self."wicked-1.1.10" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Flexible CMF content + The Plone Content Management System ''; - homepage = "http://code.google.com/p/dexterity"; + homepage = "http://plone.org/"; license = "GPL version 2"; }; }; + "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"; + }; + }; + + "feedparser-5.0.1" = self.buildPythonPackage { name = "feedparser-5.0.1"; src = fetchurl { @@ -1958,6 +1959,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.app.jquerytools-1.5.6" = self.buildPythonPackage { + name = "plone.app.jquerytools-1.5.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip"; + md5 = "4ae9a72baa8e9899c1706b4fedbb516b"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ]; + 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"; + }; + }; + + "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage { name = "Products.BTreeFolder2-2.13.3"; src = fetchurl { @@ -1966,7 +1987,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -1998,6 +2019,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.formwidget.namedfile-1.0.7" = self.buildPythonPackage { + name = "plone.formwidget.namedfile-1.0.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.7.zip"; + md5 = "6fa3cd99bf9b30971034b0f6dc31cfb3"; + }; + 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.2" ]; + 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"; + }; + }; + + "zope.testing-3.9.7" = self.buildPythonPackage { name = "zope.testing-3.9.7"; src = fetchurl { @@ -2058,15 +2099,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.contentrules-3.0.3" = self.buildPythonPackage { - name = "plone.app.contentrules-3.0.3"; + "plone.app.contentrules-3.0.4" = self.buildPythonPackage { + name = "plone.app.contentrules-3.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip"; - md5 = "518c1e22a9cfe187b6770e62be4f8bd8"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.4.zip"; + md5 = "15e86e2739096bff5bf0745590d5ebb0"; }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" 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.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2226,7 +2267,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."AccessControl-3.0.6" self."Persistence-2.13.2" self.setuptools ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Persistence-2.13.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2258,15 +2299,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.search-1.1.4" = self.buildPythonPackage { - name = "plone.app.search-1.1.4"; + "plone.app.search-1.1.5" = self.buildPythonPackage { + name = "plone.app.search-1.1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip"; - md5 = "fb24320380ed2ba11e6f20cc1fe3b6df"; + url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.5.zip"; + md5 = "eeb42889464d35e9d8169e062bc9c827"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.4" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.contentlisting-1.0.5" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2306,7 +2347,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2358,26 +2399,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -2386,7 +2407,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2418,21 +2439,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.browserpage-3.12.2" = self.buildPythonPackage { - name = "zope.browserpage-3.12.2"; + "Products.ExternalEditor-1.1.0" = self.buildPythonPackage { + name = "Products.ExternalEditor-1.1.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; - md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; }; 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" ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - ZCML directives for configuring browser views for Zope. + Zope External Editor ''; - homepage = "http://pypi.python.org/pypi/zope.browserpage/"; + homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; license = "ZPL 2.1"; }; }; @@ -2486,7 +2507,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2498,22 +2519,22 @@ 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"; + "roman-1.4.0" = self.buildPythonPackage { + name = "roman-1.4.0"; 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/r/roman/roman-1.4.0.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; }; 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" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - jQuery Tools integration for Plone plus overlay and AJAX form helpers. + Integer to Roman numerals converter ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/roman"; + license = "Python 2.1.1"; }; }; @@ -2538,6 +2559,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "plone.rfc822-1.1" = self.buildPythonPackage { + name = "plone.rfc822-1.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.rfc822/plone.rfc822-1.1.zip"; + md5 = "ba3e26cab9e751fb1cf40639d661d2f0"; + }; + 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.viewlet-3.7.2" = self.buildPythonPackage { name = "zope.viewlet-3.7.2"; src = fetchurl { @@ -2586,7 +2627,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.19" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.7" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" 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.4" self."Products.MimetypesRegistry-2.0.5" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2598,6 +2639,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "WSGIProxy2-0.3" = self.buildPythonPackage { + name = "WSGIProxy2-0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.3.zip"; + md5 = "8b2cb207932eb8c341c3fa41f0cbe994"; + }; + doCheck = true; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."six-1.4.1" self."WebOb-1.2.3" ]; + installCommand = ''easy_install --always-unzip --prefix="$out" .''; + meta = { + description = '' + UNKNOWN + ''; + homepage = "https://github.com/gawel/WSGIProxy2/"; + license = "MIT"; + }; + }; + + "zope.browserresource-3.10.3" = self.buildPythonPackage { name = "zope.browserresource-3.10.3"; src = fetchurl { @@ -2626,7 +2687,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2646,7 +2707,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2678,15 +2739,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "pyramid-1.4.3" = self.buildPythonPackage { - name = "pyramid-1.4.3"; + "pyramid-1.4.5" = self.buildPythonPackage { + name = "pyramid-1.4.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.3.tar.gz"; - md5 = "28fabf42cf585ecec7a57b5acc1174e3"; + url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.5.tar.gz"; + md5 = "321731aad69e9788b7819e257a50be1a"; }; 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" ]; + propagatedBuildInputs = [ self."Chameleon-2.12" self."Mako-0.9.0" 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 = '' @@ -2698,6 +2759,46 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "Products.contentmigration-2.1.5" = self.buildPythonPackage { + name = "Products.contentmigration-2.1.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip"; + md5 = "f08e5f2572fc6f4c61b930a17f99418f"; + }; + 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"; + }; + }; + + + "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage { + name = "Products.MimetypesRegistry-2.0.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.MimetypesRegistry/Products.MimetypesRegistry-2.0.5.zip"; + md5 = "1be555ad13648e139174c034631fce34"; + }; + 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.21" ]; + 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"; + }; + }; + + "python-dateutil-1.5" = self.buildPythonPackage { name = "python-dateutil-1.5"; src = fetchurl { @@ -2718,22 +2819,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage { - name = "Products.PloneLanguageTool-3.2.7"; + "plone.app.upgrade-1.3.4" = self.buildPythonPackage { + name = "plone.app.upgrade-1.3.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip"; - md5 = "bd9eb6278bf76e8cbce99437ca362164"; + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip"; + md5 = "10c192ee4a2422f901e020fd5b39879a"; }; 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.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" 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.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" 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.21" ]; 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. + Upgrade machinery for Plone. ''; - homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool"; - license = "GPL"; + homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; + license = "GPL version 2"; }; }; @@ -2766,7 +2867,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."plone.rfc822-1.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 = '' @@ -2838,26 +2939,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -2886,7 +2967,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2926,7 +3007,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2945,8 +3026,8 @@ development, check it into Subversion, and not touch Diazo during deployment. 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.3.1" self."six-1.3.0" self."waitress-0.8.6" self."WebOb-1.2.3" ]; + buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.4" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.6" pkgs.unzip ]; + propagatedBuildInputs = [ self."beautifulsoup4-4.3.1" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' @@ -2966,7 +3047,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.registry-1.0.1" self."plone.supermodel-1.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -2986,7 +3067,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3026,7 +3107,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -3118,6 +3199,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "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"; + }; + }; + + "five.customerize-1.1" = self.buildPythonPackage { name = "five.customerize-1.1"; src = fetchurl { @@ -3126,7 +3227,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3166,7 +3267,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3186,7 +3287,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3198,11 +3299,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.locales-4.3.1" = self.buildPythonPackage { - name = "plone.app.locales-4.3.1"; + "plone.app.locales-4.3.2" = self.buildPythonPackage { + name = "plone.app.locales-4.3.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip"; - md5 = "c88b2da05361a24a564bdef30fb371aa"; + url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.2.zip"; + md5 = "c06d6574c1e1df4e253b80751a468ad5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3218,15 +3319,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "collective.z3cform.datetimewidget-1.2.3" = self.buildPythonPackage { - name = "collective.z3cform.datetimewidget-1.2.3"; + "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage { + name = "collective.z3cform.datetimewidget-1.2.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.3.zip"; - md5 = "439117021c93f26c677510504ee245d3"; + url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip"; + md5 = "38fa463ea9b0b3cf5f61540250968214"; }; 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" ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3238,35 +3339,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.contentlisting-1.0.4" = self.buildPythonPackage { - name = "plone.app.contentlisting-1.0.4"; + "Zope2-2.13.21" = self.buildPythonPackage { + name = "Zope2-2.13.21"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.4.zip"; - md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; + url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.21.zip"; + md5 = "7d6e1661e365ee562fea9d3593f03f0e"; }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -3278,22 +3359,42 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.ExternalMethod-2.13.0" = self.buildPythonPackage { - name = "Products.ExternalMethod-2.13.0"; + "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/Products.ExternalMethod/Products.ExternalMethod-2.13.0.zip"; - md5 = "15ba953ef6cb632eb571977651252ea6"; + 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."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.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 = '' - This package provides support for external Python methods within a Zope 2 environment. + Text field with MIME type support ''; - homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.textfield"; + license = "GPL"; + }; + }; + + + "plone.app.workflow-2.1.6" = self.buildPythonPackage { + name = "plone.app.workflow-2.1.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.6.zip"; + md5 = "68a76865382b9db82aaa60c16efb1d14"; + }; + 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.4" 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.21" ]; + 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"; }; }; @@ -3306,7 +3407,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3338,11 +3439,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Chameleon-2.11" = self.buildPythonPackage { - name = "Chameleon-2.11"; + "Chameleon-2.12" = self.buildPythonPackage { + name = "Chameleon-2.12"; src = fetchurl { - url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.11.tar.gz"; - md5 = "df72458bf3dd26a744dcff5ad555c34b"; + url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.12.tar.gz"; + md5 = "c2947c7b615bf758fa4a710e759c658b"; }; doCheck = false; buildInputs = [ self."zope.event-4.0.2" ]; @@ -3352,7 +3453,7 @@ development, check it into Subversion, and not touch Diazo during deployment. description = '' Fast HTML/XML Template Compiler. ''; - homepage = "https://chameleon.readthedocs.org/en/latest/"; + homepage = "http://www.pagetemplates.org/"; license = "BSD-like (http://repoze.org/license.html)"; }; }; @@ -3366,7 +3467,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -3498,15 +3599,15 @@ 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"; + "plone.app.dexterity-2.0.9" = self.buildPythonPackage { + name = "plone.app.dexterity-2.0.9"; 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/p/plone.app.dexterity/plone.app.dexterity-2.0.9.zip"; + md5 = "aa9d6ee719a6918f99f0aa0066ebf024"; }; 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" ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."lxml-2.3.6" self."plone.app.content-2.1.3" self."plone.app.layout-2.3.7" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.7" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.3" self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.0.2" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3518,6 +3619,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "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 { @@ -3538,15 +3659,35 @@ 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 = [ ]; + propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.21" ]; + 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"; + }; + }; + + + "plone.app.layout-2.3.7" = self.buildPythonPackage { + name = "plone.app.layout-2.3.7"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.7.zip"; + md5 = "c68be1efeef54124211a676d0dbaa655"; }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.5" self."plone.app.viewletmanager-2.0.4" self."plone.i18n-2.0.9" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3606,7 +3747,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" 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 = '' @@ -3618,15 +3759,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.z3cform-0.7.3" = self.buildPythonPackage { - name = "plone.app.z3cform-0.7.3"; + "plone.app.z3cform-0.7.4" = self.buildPythonPackage { + name = "plone.app.z3cform-0.7.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip"; - md5 = "deddc1af36efb26a6792c9803531c665"; + url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.4.zip"; + md5 = "6350db39b32c3bf6edbb820b91b70b0f"; }; 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" ]; + propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3646,7 +3787,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.7" self."plone.app.vocabularies-2.1.11" 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 = '' @@ -3678,11 +3819,51 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.i18n-2.0.8" = self.buildPythonPackage { - name = "plone.i18n-2.0.8"; + "Products.PasswordResetTool-2.0.15" = self.buildPythonPackage { + name = "Products.PasswordResetTool-2.0.15"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip"; - md5 = "572c21e86b99316a06dc9998454d7750"; + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.15.zip"; + md5 = "74b46348d023052285124683bf122272"; + }; + 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.21" ]; + 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"; + }; + }; + + + "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.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" 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.21" ]; + 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.i18n-2.0.9" = self.buildPythonPackage { + name = "plone.i18n-2.0.9"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.9.zip"; + md5 = "8e8ceffc64f04beecf1579a24edc2670"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -3698,26 +3879,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -3778,35 +3939,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "ZODB3-3.10.5" = self.buildPythonPackage { - name = "ZODB3-3.10.5"; + "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage { + name = "archetypes.referencebrowserwidget-2.4.19"; 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"; + url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip"; + md5 = "b70af6b2da6d8c57c1138a52e94e588c"; }; 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" ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" 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 = '' @@ -3818,22 +3959,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.configuration-3.7.4" = self.buildPythonPackage { - name = "zope.configuration-3.7.4"; + "plone.app.jquery-1.7.2" = self.buildPythonPackage { + name = "plone.app.jquery-1.7.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-3.7.4.zip"; - md5 = "5b0271908ef26c05059eda76928896ea"; + url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; + md5 = "e204cf45456d26217263531832b5bdac"; }; 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" ]; + buildInputs = [ ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Zope Configuration Markup Language (ZCML) + jQuery integration for Plone ''; - homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + homepage = "http://pypi.python.org/pypi/plone.app.jquery"; + license = "GPL version 2"; }; }; @@ -3866,7 +4007,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.3" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3906,7 +4047,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -3946,7 +4087,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."diazo-1.0.4" 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.2" 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 = '' @@ -3958,26 +4099,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -3986,7 +4107,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4006,7 +4127,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" 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 = '' @@ -4018,15 +4139,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.TinyMCE-1.3.4" = self.buildPythonPackage { - name = "Products.TinyMCE-1.3.4"; + "plone.app.discussion-2.2.8" = self.buildPythonPackage { + name = "plone.app.discussion-2.2.8"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip"; - md5 = "e697dfdd72f3b6238e26908bb455d39a"; + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.8.zip"; + md5 = "97cc5b204076f8803fcdaccbf0565bb6"; }; 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" ]; + propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.7" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" 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.2" 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"; + }; + }; + + + "Products.TinyMCE-1.3.5" = self.buildPythonPackage { + name = "Products.TinyMCE-1.3.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.5.zip"; + md5 = "b972ff26c90d99c13ded0aeb33af2a2e"; + }; + doCheck = false; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.7" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.11.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 = '' @@ -4038,31 +4179,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "python-openid-2.2.5" = self.buildPythonPackage { - name = "python-openid-2.2.5"; + "plone.supermodel-1.2.3" = self.buildPythonPackage { + name = "plone.supermodel-1.2.3"; 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"; + url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.3.zip"; + md5 = "34610edccd7f93409b95a6b9ecd3da9e"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -4106,7 +4227,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.layout-2.3.7" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4118,35 +4239,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.z3cform-0.8.0" = self.buildPythonPackage { - name = "plone.z3cform-0.8.0"; + "plone.app.caching-1.1.6" = self.buildPythonPackage { + name = "plone.app.caching-1.1.6"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip"; - md5 = "bdb23dd162544964d2f8f8f5f002e874"; + url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip"; + md5 = "52f817d67e6da1508bf6f1486e5466d2"; }; 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" ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" 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.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4158,6 +4259,26 @@ development, check it into Subversion, and not touch Diazo during deployment. }; + "AccessControl-3.0.8" = self.buildPythonPackage { + name = "AccessControl-3.0.8"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.8.zip"; + md5 = "06bea3be59d1ce76c815661180b7ffd9"; + }; + 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"; + }; + }; + + "Record-2.13.0" = self.buildPythonPackage { name = "Record-2.13.0"; src = fetchurl { @@ -4178,21 +4299,21 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "AccessControl-3.0.6" = self.buildPythonPackage { - name = "AccessControl-3.0.6"; + "z3c.form-3.0.2" = self.buildPythonPackage { + name = "z3c.form-3.0.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/A/AccessControl/AccessControl-3.0.6.zip"; - md5 = "a8ce472482adabf9ec969f3971a39a19"; + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.2.zip"; + md5 = "8eab166766c6ae2e44e40f54136b3f79"; }; 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" ]; + 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 = '' - Security framework for Zope2. + An advanced form and widget framework for Zope 3 ''; - homepage = "http://pypi.python.org/pypi/AccessControl"; + homepage = "https://launchpad.net/z3c.form"; license = "ZPL 2.1"; }; }; @@ -4206,7 +4327,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" 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 = '' @@ -4218,26 +4339,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -4406,7 +4507,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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 ]; + propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4438,15 +4539,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.collection-1.0.10" = self.buildPythonPackage { - name = "plone.app.collection-1.0.10"; + "plone.app.collection-1.0.11" = self.buildPythonPackage { + name = "plone.app.collection-1.0.11"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip"; - md5 = "1042ac059be2311d4758452a3fa4f82e"; + url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.11.zip"; + md5 = "3f97abc0cd5e370c4bbb1a73f7ee05a7"; }; 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" ]; + propagatedBuildInputs = [ self."archetypes.querywidget-1.0.9" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4466,7 +4567,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4486,7 +4587,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4498,26 +4599,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -4538,75 +4619,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "zope.broken-3.6.0" = self.buildPythonPackage { - name = "zope.broken-3.6.0"; + "Products.GenericSetup-1.7.4" = self.buildPythonPackage { + name = "Products.GenericSetup-1.7.4"; 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.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.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"; + url = "https://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.4.tar.gz"; + md5 = "f93251ed519e8c4aea0bc001416027b1"; }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4618,35 +4639,35 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.jquery-1.7.2" = self.buildPythonPackage { - name = "plone.app.jquery-1.7.2"; + "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage { + name = "plone.app.viewletmanager-2.0.4"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.jquery/plone.app.jquery-1.7.2.tar.gz"; - md5 = "e204cf45456d26217263531832b5bdac"; + url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip"; + md5 = "565a12ac71d20b2823b9e44daebe432f"; }; doCheck = false; - buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools ]; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - jQuery integration for Plone + configurable viewlet manager ''; - homepage = "http://pypi.python.org/pypi/plone.app.jquery"; + homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; license = "GPL version 2"; }; }; - "plone.schemaeditor-1.3.2" = self.buildPythonPackage { - name = "plone.schemaeditor-1.3.2"; + "plone.schemaeditor-1.3.3" = self.buildPythonPackage { + name = "plone.schemaeditor-1.3.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.2.zip"; - md5 = "ab9cb4e929f305063dc8f33e9a33fd21"; + url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.3.zip"; + md5 = "25a04a0bf6cd6411669dd3850a1d04b8"; }; 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" ]; + propagatedBuildInputs = [ self."plone.autoform-1.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4778,26 +4799,6 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "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 { @@ -4818,22 +4819,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.portlet.static-2.0.2" = self.buildPythonPackage { - name = "plone.portlet.static-2.0.2"; + "zope.browserpage-3.12.2" = self.buildPythonPackage { + name = "zope.browserpage-3.12.2"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip"; - md5 = "ec0dc691b4191a41ff97779b117f9985"; + url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; }; 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" ]; + 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 = '' - A simple static HTML portlet for Plone. + ZCML directives for configuring browser views for Zope. ''; - homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + homepage = "http://pypi.python.org/pypi/zope.browserpage/"; + license = "ZPL 2.1"; }; }; @@ -4898,15 +4899,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "archetypes.querywidget-1.0.8" = self.buildPythonPackage { - name = "archetypes.querywidget-1.0.8"; + "archetypes.querywidget-1.0.9" = self.buildPythonPackage { + name = "archetypes.querywidget-1.0.9"; src = fetchurl { - url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.8.zip"; - md5 = "3416b6b4948c624e1b5b8dd8d7e33f59"; + url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.9.zip"; + md5 = "67e51c20990bb3eefbc9e8e953d7c9f5"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.5" self."plone.app.querystring-1.0.8" self.setuptools ]; + propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.6" self."plone.app.querystring-1.0.8" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -4926,7 +4927,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.GenericSetup-1.7.3" self.setuptools self."Zope2-2.13.20" ]; + propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5078,15 +5079,15 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.vocabularies-2.1.10" = self.buildPythonPackage { - name = "plone.app.vocabularies-2.1.10"; + "plone.app.vocabularies-2.1.11" = self.buildPythonPackage { + name = "plone.app.vocabularies-2.1.11"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.10.tar.gz"; - md5 = "166a0d6f9a3e3cd753efa56aaef585be"; + url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.11.tar.gz"; + md5 = "08c773a5093780aaa27709a890f1e21f"; }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5126,7 +5127,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5158,11 +5159,11 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "plone.app.linkintegrity-1.5.2" = self.buildPythonPackage { - name = "plone.app.linkintegrity-1.5.2"; + "plone.app.linkintegrity-1.5.3" = self.buildPythonPackage { + name = "plone.app.linkintegrity-1.5.3"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip"; - md5 = "f97c61da9f243391cafdfe3fe1cf6d6c"; + url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.3.zip"; + md5 = "f2eed92f433fe73b4056d3ba48ba8eb0"; }; doCheck = false; buildInputs = [ pkgs.unzip ]; @@ -5186,7 +5187,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; doCheck = false; buildInputs = [ ]; - propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.3" self.setuptools self."eggtestinfo-0.3" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."eggtestinfo-0.3" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5226,7 +5227,7 @@ development, check it into Subversion, and not touch Diazo during deployment. }; 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" ]; + 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.21" ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' @@ -5238,22 +5239,22 @@ development, check it into Subversion, and not touch Diazo during deployment. }; - "Products.PythonScripts-2.13.2" = self.buildPythonPackage { - name = "Products.PythonScripts-2.13.2"; + "plone.outputfilters-1.11.1" = self.buildPythonPackage { + name = "plone.outputfilters-1.11.1"; src = fetchurl { - url = "https://pypi.python.org/packages/source/P/Products.PythonScripts/Products.PythonScripts-2.13.2.zip"; - md5 = "04c86f2c45a29a162297a80dac61d14f"; + url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.11.1.zip"; + md5 = "6b7506f09ad98621f8bb388c55183d6d"; }; 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" ]; + propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self.setuptools ]; installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .''; meta = { description = '' - Provides support for restricted execution of Python scripts in Zope 2. + Transformations applied to HTML in Plone text fields as they are rendered ''; - homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + homepage = "http://github.com/plone/plone.outputfilters"; + license = "GPL"; }; }; diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json index a87f7eb78be..0d9773ba837 100644 --- a/pkgs/top-level/python-packages.json +++ b/pkgs/top-level/python-packages.json @@ -82,7 +82,7 @@ } }, { "name": "Plone", - "extends": "http://dist.plone.org/release/4.3.1/versions.cfg", + "extends": "http://dist.plone.org/release/4.3.2/versions.cfg", "doCheck": false, "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .", "override": { From 095fc0ebaaeb64b7f692cc3b33e632d153c0e5ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Sep 2013 11:24:41 +0200 Subject: [PATCH 061/193] nix-repl: Add --- .../package-management/nix-repl/default.nix | 35 +++++++++++++++++++ pkgs/tools/package-management/nix/default.nix | 2 ++ .../tools/package-management/nix/unstable.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/release.nix | 2 -- 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/package-management/nix-repl/default.nix diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix new file mode 100644 index 00000000000..648abe882c4 --- /dev/null +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, nix, readline, boehmgc }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; + + src = fetchgit { + url = https://github.com/edolstra/nix-repl.git; + rev = "81d658fe4afda234028cd4551e12491db4303957"; + sha256 = "067mj8as99n0hkrr2qss3y3hnr8c5zy4n8bqx3z900n3j43cwzyc"; + }; + + buildInputs = [ nix readline boehmgc ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/bin + g++ -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix -L${nix}/lib/nix \ + -lformat -lutil -lstore -lexpr -lmain -lreadline -lgc + ''; + + meta = { + homepage = https://github.com/edolstra/nix-repl; + description = "An interactive environment for evaluating and building Nix expressions"; + maintainers = [ maintainers.eelco ]; + license = licenses.gpl3; + platforms = nix.meta.platforms; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 89cf2d1e00e..7b4bb3c6193 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 17e860f7d7c..ba0353e4507 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -69,5 +69,7 @@ stdenv.mkDerivation rec { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c27867cb055..5f1b2debdb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9798,6 +9798,8 @@ let nixops = callPackage ../tools/package-management/nixops { }; + nix-repl = callPackage ../tools/package-management/nix-repl { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 1aae2ce4ee2..557203f9fb1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -218,8 +218,6 @@ let ncat = linux; netcat = all; nfsUtils = linux; - nix = all; - nixUnstable = all; nmap = linux; nss_ldap = linux; nssmdns = linux; From ad8a921f15f5917b3ead4725ca8295d221765377 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Sep 2013 11:33:57 +0200 Subject: [PATCH 062/193] lua-5.1: install missing liblua.so.5.1.5 binary --- pkgs/development/interpreters/lua-5/5.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index e161683daf6..aa2b03838cd 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1" INSTALL_DATA='cp -d' ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; postInstall = '' From b13188dff065e7c947391f664a54506a332aa222 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Sep 2013 11:45:55 +0200 Subject: [PATCH 063/193] lua-5.2: install missing liblua.so.5.2.2 binary --- pkgs/development/interpreters/lua-5/5.2.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 0ae4fbe322a..f8787dcc7f0 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -9,7 +9,8 @@ let in stdenv.mkDerivation rec { name = "lua-${version}"; - version = "5.2.2"; + majorVersion = "5.2"; + version = "${majorVersion}.2"; src = fetchurl { url = "http://www.lua.org/ftp/${name}.tar.gz"; @@ -21,14 +22,14 @@ stdenv.mkDerivation rec { patches = [ dsoPatch ]; configurePhase = '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" ) - installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.2" INSTALL_DATA='cp -d' ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-O2 -fPIC" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; postInstall = '' mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" - rmdir $out/{share,lib}/lua/5.2 $out/{share,lib}/lua + rmdir $out/{share,lib}/lua/${majorVersion} $out/{share,lib}/lua mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/lua.pc" < Date: Tue, 17 Sep 2013 11:47:25 +0200 Subject: [PATCH 064/193] gravit: this package can be built with any 5.x version of lua --- pkgs/applications/science/astronomy/gravit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 820b4fb2979..cbe438b012a 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5, automake, autoconf }: stdenv.mkDerivation rec { name = "gravit-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp"; }; - buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf]; + buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf]; preConfigure = "sh autogen.sh"; From ab3b1a5aa98cc0463f0192f9a2f7cc3cd35755a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Sep 2013 11:53:27 +0200 Subject: [PATCH 065/193] gravit: enable PNG support --- pkgs/applications/science/astronomy/gravit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index cbe438b012a..a2cc07b0a61 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5, automake, autoconf }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, libpng, lua5, automake, autoconf }: stdenv.mkDerivation rec { name = "gravit-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp"; }; - buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf]; + buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf libpng]; preConfigure = "sh autogen.sh"; From 3af40ade24bf3f773a4055ef208c75333ec295d2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Sep 2013 13:01:57 +0200 Subject: [PATCH 066/193] chromium: Add missing patch for version 31. I accidentally forgot to add the new patch for version 31, sorry for the noise and evaluation error caused by this: http://hydra.nixos.org/jobset/nixos/trunk-combined#tabs-errors And thanks to @iElectric for noticing. Signed-off-by: aszlig --- .../browsers/chromium/sandbox_userns_31.patch | 297 ++++++++++++++++++ 1 file changed, 297 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch new file mode 100644 index 00000000000..490c1a9cebe --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch @@ -0,0 +1,297 @@ +commit ff4e8b4af04c58fc4c58ee7ed108aefcdc26a960 +Author: aszlig +Date: Thu May 16 14:17:56 2013 +0200 + + zygote: Add support for user namespaces on Linux. + + The implementation is done by patching the Zygote host to execute the sandbox + binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child + process is using uid 0 and gid 0 which map to the current user of the parent. + Afterwards, the sandbox will continue as if it was called as a setuid binary. + + In addition, this adds new_user_namespace as an option in process_util in order + to set the UID and GID mapping correctly. The reason for this is that just + passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because + without setting the mappings exec*() will clear the process's capability sets. + + If the kernel doesn't support unprivileged user namespaces and the sandbox + binary doesn't have the setuid flag, the Zygote main process will run without a + sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. + + Signed-off-by: aszlig + +diff --git a/base/process/launch.cc b/base/process/launch.cc +index 1329a5a..ec28fdf 100644 +--- a/base/process/launch.cc ++++ b/base/process/launch.cc +@@ -24,6 +24,7 @@ LaunchOptions::LaunchOptions() + new_process_group(false) + #if defined(OS_LINUX) + , clone_flags(0) ++ , new_user_namespace(false) + #endif // OS_LINUX + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) +diff --git a/base/process/launch.h b/base/process/launch.h +index ac2df5e..34a3851 100644 +--- a/base/process/launch.h ++++ b/base/process/launch.h +@@ -100,6 +100,9 @@ struct BASE_EXPORT LaunchOptions { + #if defined(OS_LINUX) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; ++ ++ // If true, start the process in a new user namespace. ++ bool new_user_namespace; + #endif // defined(OS_LINUX) + + #if defined(OS_CHROMEOS) +diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc +index de6286d..9333494 100644 +--- a/base/process/launch_posix.cc ++++ b/base/process/launch_posix.cc +@@ -37,6 +37,13 @@ + #include "base/threading/platform_thread.h" + #include "base/threading/thread_restrictions.h" + ++#if defined(OS_LINUX) ++#include ++#if !defined(CLONE_NEWUSER) ++#define CLONE_NEWUSER 0x10000000 ++#endif ++#endif ++ + #if defined(OS_CHROMEOS) + #include + #endif +@@ -294,13 +301,23 @@ bool LaunchProcess(const std::vector& argv, + + pid_t pid; + #if defined(OS_LINUX) +- if (options.clone_flags) { ++ int map_pipe_fd[2]; ++ int flags = options.clone_flags; ++ ++ if (options.new_user_namespace) { ++ flags |= CLONE_NEWUSER; ++ if (pipe(map_pipe_fd) < 0) { ++ DPLOG(ERROR) << "user namespace pipe"; ++ return false; ++ } ++ } ++ ++ if (options.clone_flags || options.new_user_namespace) { + // Signal handling in this function assumes the creation of a new + // process, so we check that a thread is not being created by mistake + // and that signal handling follows the process-creation rules. +- RAW_CHECK( +- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); +- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); ++ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); ++ pid = syscall(__NR_clone, flags, 0, 0, 0); + } else + #endif + { +@@ -318,6 +335,21 @@ bool LaunchProcess(const std::vector& argv, + } else if (pid == 0) { + // Child process + ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // Close the write end of the pipe so we get an EOF when the parent closes ++ // the FD. This is to avoid race conditions when the UID/GID mappings are ++ // written _after_ execvp(). ++ close(map_pipe_fd[1]); ++ ++ char dummy; ++ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { ++ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); ++ _exit(127); ++ } ++ } ++#endif ++ + // DANGER: fork() rule: in the child, if you don't end up doing exec*(), + // you call _exit() instead of exit(). This is because _exit() does not + // call any previously-registered (in the parent) exit handlers, which +@@ -433,6 +465,40 @@ bool LaunchProcess(const std::vector& argv, + _exit(127); + } else { + // Parent process ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // We need to write UID/GID mapping here to map the current user outside ++ // the namespace to the root user inside the namespace in order to ++ // correctly "fool" the child process. ++ char buf[256]; ++ int map_fd, map_len; ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to uid_map."); ++ } ++ close(map_fd); ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to gid_map."); ++ } ++ close(map_fd); ++ ++ // Close the pipe on the parent, so the child can continue doing the ++ // execvp() call. ++ close(map_pipe_fd[1]); ++ } ++#endif ++ + if (options.wait) { + // While this isn't strictly disk IO, waiting for another process to + // finish is the sort of thing ThreadRestrictions is trying to prevent. +diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc +index fea43b5..95cbe07 100644 +--- a/content/browser/zygote_host/zygote_host_impl_linux.cc ++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -121,25 +121,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + + sandbox_binary_ = sandbox_cmd.c_str(); + +- // A non empty sandbox_cmd means we want a SUID sandbox. +- using_suid_sandbox_ = !sandbox_cmd.empty(); ++ bool userns_sandbox = false; ++ const std::vector cmd_line_unwrapped(cmd_line.argv()); + +- if (using_suid_sandbox_) { ++ if (!sandbox_cmd.empty()) { + struct stat st; + if (stat(sandbox_binary_.c_str(), &st) != 0) { + LOG(FATAL) << "The SUID sandbox helper binary is missing: " + << sandbox_binary_ << " Aborting now."; + } + +- if (access(sandbox_binary_.c_str(), X_OK) == 0 && +- (st.st_uid == 0) && +- (st.st_mode & S_ISUID) && +- (st.st_mode & S_IXOTH)) { ++ if (access(sandbox_binary_.c_str(), X_OK) == 0) { ++ using_suid_sandbox_ = true; ++ + cmd_line.PrependWrapper(sandbox_binary_); + + scoped_ptr + sandbox_client(sandbox::SetuidSandboxClient::Create()); + sandbox_client->SetupLaunchEnvironment(); ++ ++ if (!((st.st_uid == 0) && ++ (st.st_mode & S_ISUID) && ++ (st.st_mode & S_IXOTH))) { ++ userns_sandbox = true; ++ sandbox_client->SetNoSuid(); ++ } + } else { + LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " + "configured correctly. Rather than run without sandboxing " +@@ -163,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + base::ProcessHandle process = -1; + base::LaunchOptions options; + options.fds_to_remap = &fds_to_map; ++ if (userns_sandbox) ++ options.new_user_namespace = true; + base::LaunchProcess(cmd_line.argv(), options, &process); ++ ++ if (process == -1 && userns_sandbox) { ++ LOG(ERROR) << "User namespace sandbox failed to start, running without " ++ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " ++ << "enabled in order to use the sandbox without setuid bit."; ++ using_suid_sandbox_ = false; ++ options.new_user_namespace = false; ++ base::LaunchProcess(cmd_line_unwrapped, options, &process); ++ } ++ + CHECK(process != -1) << "Failed to launch zygote process"; + + if (using_suid_sandbox_) { +diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc +index 567b305..1089233 100644 +--- a/content/zygote/zygote_main_linux.cc ++++ b/content/zygote/zygote_main_linux.cc +@@ -426,6 +426,13 @@ static bool EnterSuidSandbox(LinuxSandbox* linux_sandbox, + *has_started_new_init = true; + } + ++ // Don't set non-dumpable, as it causes trouble when the host tries to find ++ // the zygote process (XXX: Not quite sure why this happens with user ++ // namespaces). Fortunately, we also have the seccomp filter sandbox which ++ // should disallow the use of ptrace. ++ if (setuid_sandbox->IsNoSuid()) ++ return true; ++ + #if !defined(OS_OPENBSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc +index 34231d4..36e3201 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc +@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { + return env_->HasVar(kSandboxNETNSEnvironmentVarName); + } + ++bool SetuidSandboxClient::IsNoSuid() const { ++ return env_->HasVar(kSandboxNoSuidVarName); ++} ++ + bool SetuidSandboxClient::IsSandboxed() const { + return sandboxed_; + } +@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { + SetSandboxAPIEnvironmentVariable(env_); + } + ++void SetuidSandboxClient::SetNoSuid() { ++ env_->SetVar(kSandboxNoSuidVarName, "1"); ++} ++ + } // namespace sandbox + +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h +index a9f6536..2e8113a 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.h ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h +@@ -39,6 +39,8 @@ class SetuidSandboxClient { + bool IsInNewPIDNamespace() const; + // Did the setuid helper create a new network namespace ? + bool IsInNewNETNamespace() const; ++ // Is sandboxed without SUID binary ? ++ bool IsNoSuid() const; + // Are we done and fully sandboxed ? + bool IsSandboxed() const; + +@@ -46,6 +48,8 @@ class SetuidSandboxClient { + // helper. + void SetupLaunchEnvironment(); + ++ void SetNoSuid(); ++ + private: + // Holds the environment. Will never be NULL. + base::Environment* env_; +diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h +index aad4ff8..bd710d5 100644 +--- a/sandbox/linux/suid/common/sandbox.h ++++ b/sandbox/linux/suid/common/sandbox.h +@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; + + static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; + static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; ++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; + + static const long kSUIDSandboxApiNumber = 1; + static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; From 0b351e964ec98785ac1b1ee481f41836df0e8140 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Sep 2013 14:17:01 +0200 Subject: [PATCH 067/193] iotop: Update to 0.6 Also, install the man page in the right place. --- pkgs/os-specific/linux/iotop/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index e394b612388..8e181d3d5cf 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,16 +1,22 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages }: buildPythonPackage rec { - name = "iotop-0.4.1"; + name = "iotop-0.6"; namePrefix = ""; src = fetchurl { url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; - sha256 = "1dfvw3khr2rvqllvs9wad9ca3ld4i7szqf0ibq87rn36ickrf3ll"; + sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; pythonPath = [ pythonPackages.curses ]; + postInstall = + '' + # Put the man page in the right place. + mv $out/lib/python*/site-packages/iotop-*/share $out + ''; + doCheck = false; meta = { From 7856ba881a7de2d490fc1a90d2bbeb294492b0cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Sep 2013 16:00:36 +0200 Subject: [PATCH 068/193] linux: Enable proper blkio controller support Having BLK_CGROUP is not enough, you need BLK_DEV_THROTTLING or CFQ_GROUP_IOSCHED to do anything useful. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d4f7c4e6718..45cd135fbbe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -242,6 +242,8 @@ with stdenv.lib; CGROUP_MEM_RES_CTLR_SWAP y ''} DEVPTS_MULTIPLE_INSTANCES y + BLK_DEV_THROTTLING y + CFQ_GROUP_IOSCHED y # Enable staging drivers. These are somewhat experimental, but # they generally don't hurt. From 01fdb87a03f2235fd2dcfd353c34f333e9634f55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Sep 2013 17:17:55 +0200 Subject: [PATCH 069/193] virtualbox: Update to 4.2.18 --- .../applications/virtualization/virtualbox/default.nix | 10 +++++----- .../virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 09b6e015a93..652b2ed92c1 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.16"; # changes ./guest-additions as well + version = "4.2.18"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "86992"; + extpackRevision = "88780"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # 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"; + # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.2.18/SHA256SUMS + sha256 = "1d1737b59d0f30f5d42beeabaff168bdc0a75b8b28df685979be6173e5adbbba"; 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: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz"; + sha256 = "9dbddf393b029c549249f627d12040c1d257972bc09292969b8819a31ab78d74"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index cca133685f6..de38843c7f1 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 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg"; + sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767"; }; KERN_DIR = "${kernelDev}/lib/modules/*/build"; From 59bd1ba586497ac6ec28b4f3b06d00b6597bd93f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 17 Sep 2013 14:28:26 -0400 Subject: [PATCH 070/193] Add virtuoso 7 Signed-off-by: Shea Levy --- .../sql/virtuoso/{default.nix => 6.x.nix} | 0 pkgs/servers/sql/virtuoso/7.x.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++- 3 files changed, 40 insertions(+), 1 deletion(-) rename pkgs/servers/sql/virtuoso/{default.nix => 6.x.nix} (100%) create mode 100644 pkgs/servers/sql/virtuoso/7.x.nix diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/6.x.nix similarity index 100% rename from pkgs/servers/sql/virtuoso/default.nix rename to pkgs/servers/sql/virtuoso/6.x.nix diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix new file mode 100644 index 00000000000..630095782fa --- /dev/null +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, libxml2, openssl, readline, gawk }: + +stdenv.mkDerivation rec { + name = "virtuoso-opensource-7.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; + sha256 = "1z0jdzayv45y57jj8kii6csqfjhswcs8s2krqqfhab54xy6gynbl"; + }; + + buildInputs = [ libxml2 openssl readline gawk ]; + + CPP = "${stdenv.gcc}/bin/gcc -E"; + + configureFlags = " + --enable-shared --disable-all-vads --with-readline=${readline} + --disable-hslookup --disable-wbxml2 --without-iodbc + --enable-openssl=${openssl} + "; + + postInstall='' + echo Moving documentation + mkdir -pv $out/share/doc + mv -v $out/share/virtuoso/doc $out/share/doc/${name} + echo Removing jars and empty directories + find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete + ''; + + meta = with stdenv.lib; { + description = "SQL/RDF database used by, e.g., KDE-nepomuk"; + homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + platforms = platforms.all; + maintainers = [ maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1b2debdb4..69dc1855de9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6239,7 +6239,11 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; - virtuoso = callPackage ../servers/sql/virtuoso { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; + + virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; + + virtuoso = virtuoso6; vsftpd = callPackage ../servers/ftp/vsftpd { }; From 7aacc46f100d29672774a12e75dbfd1ddc8afd2e Mon Sep 17 00:00:00 2001 From: Malcolm Matalka Date: Tue, 17 Sep 2013 20:41:06 +0200 Subject: [PATCH 071/193] Pin 1.3.1 to R15B03, riak does not work with R16 --- pkgs/servers/nosql/riak/1.3.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index c71283570e0..ccac6e331fd 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, erlang }: +{ stdenv, fetchurl, unzip, erlangR15B03 }: let srcs = { @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "riak-1.3.1"; - buildInputs = [unzip erlang]; + buildInputs = [unzip erlangR15B03]; src = srcs.riak; From a10742f392547e44cac0c9a84d03b3d84d27ee20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 17 Sep 2013 20:47:28 +0200 Subject: [PATCH 072/193] add sigal, gallery static generator --- pkgs/top-level/python-packages.nix | 112 +++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7b6ecc2d4e..3edc15e9b1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5244,6 +5244,118 @@ pythonPackages = modules // import ./python-packages-generated.nix { }; }); + sigal = buildPythonPackage rec { + name = "sigal-0.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; + md5 = "93c93725674c0702583a638f5a09c9e4"; + }; + + propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh ]; + + meta = with stdenv.lib; { + description = "Yet another simple static gallery generator"; + homepage = http://sigal.saimon.org/en/latest/index.html; + license = licenses.mit; + maintainers = [ maintainers.iElectric ]; + }; + }; + + pilkit = buildPythonPackage rec { + name = "pilkit-1.1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pilkit/${name}.tar.gz"; + md5 = "659dd67440f4b576889f2cd350f43d7b"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace 'nose==1.2.1' 'nose' + ''; + + # tests fail, see https://github.com/matthewwithanm/pilkit/issues/9 + doCheck = false; + + buildInputs = [ pillow nose_progressive nose mock blessings ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + clint = buildPythonPackage rec { + name = "clint-0.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/clint/${name}.tar.gz"; + md5 = "7dcd43fb08bfb84c7d63e9356ada7b73"; + }; + + checkPhase = '' + nosetests + ''; + + buildInputs = [ pillow nose_progressive nose mock blessings nose ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + argh = buildPythonPackage rec { + name = "argh-0.23.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argh/${name}.tar.gz"; + md5 = "25bb02c6552b42875f2c36714e0ff16c"; + }; + + preCheck = '' + export LANG="en_US.UTF-8" + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + ''; + + buildInputs = [ pytest py mock ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + nose_progressive = buildPythonPackage rec { + name = "nose-progressive-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose-progressive/${name}.tar.gz"; + md5 = "180be93929c5962044a35489f193259d"; + }; + + buildInputs = [ pillow blessings nose ]; + propagatedBuildInputs = [ modules.curses ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; + + blessings = buildPythonPackage rec { + name = "blessings-1.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/blessings/${name}.tar.gz"; + md5 = "fbbddbf20b1f9a13e3fa612b1e086fd8"; + }; + + # 4 failing tests + doCheck = false; + + buildInputs = [ nose modules.curses ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.iElectric ]; + }; + }; sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; From 21cb877e1134ebcfa2af8ea67c2a85b995d6a9fd Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 17 Sep 2013 20:19:24 +0100 Subject: [PATCH 073/193] perlPackages.WWWMechanizeCGI: Use substituteInPlace, should fix darwin build --- pkgs/top-level/perl-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9ab8de481d1..b97ab734172 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9039,7 +9039,10 @@ rec { sha256 = "046jm18liq7rwkdawdh9520cnalkfrk26yqryp7xgw71y65lvq61"; }; propagatedBuildInputs = [ HTTPRequestAsCGI WWWMechanize ]; - preConfigure = "sed -i 's|#!/usr/bin/perl|#!${perl}/bin/perl|' t/cgi-bin/script.cgi"; + preConfigure = '' + substituteInPlace t/cgi-bin/script.cgi \ + --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' + ''; meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; From 19c72ae32c2a382f08a5c5a55a8c48bbfa7b62c4 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Tue, 17 Sep 2013 13:08:42 +1000 Subject: [PATCH 074/193] qt48: fix impurity on darwin. Close #982. --- .../development/libraries/qt-4.x/4.8/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 311ed43729e..59151d35326 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,10 +1,7 @@ -{ stdenv, fetchurl, substituteAll -, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext -, libXfixes, libXrandr, libSM, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig -, libtiff, glib, icu -, mysql, postgresql, sqlite -, perl, coreutils, libXi +{ stdenv, fetchurl, substituteAll, libXrender, libXinerama, libXcursor, libXmu, libXv, libXext +, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng +, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf @@ -40,6 +37,11 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # remove impure reference to /usr/lib/libstdc++.6.dylib + # there might be more references, but this is the only one I could find + substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ + --replace /usr/lib/libstdc++.6.dylib "${stdenv.gcc}/lib/libstdc++.6.dylib" ''; patches = From 8b9269ef66f2416726c80fa7ab9f52c79b13876c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 18 Sep 2013 10:11:54 +0300 Subject: [PATCH 075/193] libreoffice: unbreak .desktop files. Hopefully fixes nixos/nixos#252. --- pkgs/applications/office/libreoffice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2f2a50bf9cb..8aaf1839f92 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -193,8 +193,8 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreoffice4.0" "$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice4.0" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" done ''; From 3433e62e3fcdd682a9a0a8c827e81b319332e42a Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 24 Jun 2013 16:38:16 +0100 Subject: [PATCH 076/193] gtimelog: New expression --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69dc1855de9..09d99bf9e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7647,6 +7647,8 @@ let inherit (gnome) libgnome libgnomeui vte; }; + gtimelog = pythonPackages.gtimelog; + guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3edc15e9b1f..2f22d2fe04b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1259,7 +1259,6 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ sphinx ]; }; - googlecl = buildPythonPackage rec { version = "0.9.14"; name = "googlecl-${version}"; @@ -1280,6 +1279,21 @@ pythonPackages = modules // import ./python-packages-generated.nix { propagatedBuildInputs = [ gdata ]; }; + gtimelog = buildPythonPackage rec { + name = "gtimelog-0.8.1"; + src = fetchurl { + url = https://launchpad.net/gtimelog/devel/0.8.1/+download/gtimelog-0.8.1.tar.gz; + sha256 = "010sbw4rmslf5ifg9bgicn0f6mgsy76v8218xi0jndi9z6pva7y6"; + }; + propagatedBuildInputs = [ pygtk ]; + meta = with stdenv.lib; { + description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible."; + homepage = http://mg.pov.lt/gtimelog/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ocharles ]; + platforms = platforms.unix; + }; + }; logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.1"; From 370db596b9d7f3619c57a05440a8c0636826bea6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 18 Sep 2013 12:05:14 +0200 Subject: [PATCH 077/193] Bumped Android SDK to version 22.2 and updated its addons --- pkgs/development/mobile/androidenv/addon.xml | 26 +++---- pkgs/development/mobile/androidenv/addons.nix | 4 +- .../mobile/androidenv/androidsdk.nix | 10 +-- .../mobile/androidenv/platforms-linux.nix | 4 +- .../mobile/androidenv/platforms-macosx.nix | 4 +- .../mobile/androidenv/repository-8.xml | 73 +++++++++++++------ .../mobile/androidenv/sys-img-x86.xml | 15 ++++ .../mobile/androidenv/sysimages.nix | 12 ++- 8 files changed, 99 insertions(+), 49 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 635d0ae964f..2020f48b1d2 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -781,14 +781,14 @@ August 15, 2011 - + google Google Inc. google_apis Google APIs Android + Google APIs 18 - 1 + 2 com.google.android.maps @@ -802,9 +802,9 @@ August 15, 2011 - 147899839 - 5c0c24f04e6b65c61da83408b7aee79228c24a40 - google_apis-18_r01.zip + 142778022 + 40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2 + google_apis-18_r02.zip @@ -855,14 +855,14 @@ August 15, 2011 Google Inc. Google Repository m2repository - 1 + 2 Local Maven repository for Google Libraries - 660833 - d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0 - google_m2repository_r01.zip + 2043649 + f518e0170e84a6bccbadb8a043989cc61f4c37aa + google_m2repository_r02.zip @@ -910,15 +910,15 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 9 + 11 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 5125755 - 3e31fc0b982f938edf216afe9e532774db12607a - google_play_services_3159130_r09.zip + 5265306 + 00851350c55b016bef202700f643f246fb0c24ea + google_play_services_3264130_r11.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 651c84533f0..2fd66420cf6 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -197,8 +197,8 @@ in 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"; + url = https://dl-ssl.google.com/android/repository/google_apis-18_r02.zip; + sha1 = "40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 38377cf8bbb..0b5f69ed3e2 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -8,16 +8,16 @@ {platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-22.05"; + name = "android-sdk-22.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; - md5 = "8201b10c21510f082c54f58a9bb082c8"; + url = http://dl.google.com/android/android-sdk_r22.2-linux.tgz; + md5 = "2a3776839e823ba9acb7a87a3fe26e02"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; - md5 = "94f3cbe896c332b94ee0408ae610a4b8"; + url = http://dl.google.com/android/android-sdk_r22.2-macosx.zip; + md5 = "9dfef6404e2f842c433073796aed8b7d"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 2ca937b5534..5db90ffef1c 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; 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 c89cb9ed127..c5ddf714cdf 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -209,8 +209,8 @@ in platform_18 = buildPlatform { name = "android-platform-4.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; - sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + url = https://dl-ssl.google.com/android/repository/android-18_r02.zip; + sha1 = "62a9438d4cf6692f4d6510c27a380be195db9534"; }; meta = { description = "Android SDK Platform 4.3"; diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml index 4e180ac4b3e..79795aa4939 100644 --- a/pkgs/development/mobile/androidenv/repository-8.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -616,8 +616,8 @@ November 13, 2012 - - 1 + + 2 Android SDK Platform 4.3 4.3 18 @@ -625,14 +625,14 @@ November 13, 2012 21 - 9 + 10 1 - 48752456 - c24de91d6f296cf453701aef281609779fffb379 - android-18_r01.zip + 57319855 + 62a9438d4cf6692f4d6510c27a380be195db9534 + android-18_r02.zip @@ -705,16 +705,16 @@ November 13, 2012 - - 1 + + 2 Android SDK Platform 4.3 18 armeabi-v7a - 125597583 - 5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e - sysimg_armv7a-18_r01.zip + 125457135 + 4a1a93200210d8c42793324362868846f67401ab + sysimg_armv7a-18_r02.zip @@ -1006,33 +1006,60 @@ November 13, 2012 + + + + 18 + 1 + 0 + + + + 19659547 + 3a9810fc8559ab03c09378f07531e8cae2f1db30 + build-tools_r18.1-windows.zip + + + 20229298 + f314a0599e51397f0886fe888b50dd98f2f050d8 + build-tools_r18.1-linux.zip + + + 20451524 + 16ddb299b8b43063e5bb3387ec17147c5053dfd8 + build-tools_r18.1-macosx.zip + + + + + - + 22 - 0 - 5 + 2 + 0 18 - 113389691 - a3f450706b5374122f0edb76a4488462ba5171ca - tools_r22.0.5-windows.zip + 108669997 + c4231cd769ef9d1b6ae69202a1a0d0f783f04ea7 + tools_r22.2-windows.zip - 105904090 - 06a3e1d66b9280cba49c7ba1893ea14beae072d2 - tools_r22.0.5-linux.zip + 101168674 + a11febd30023ed2590bca4c2d7b1dc2b0cfcd715 + tools_r22.2-linux.zip - 77191184 - 318947edef0ab46603eb7f4d21333ee4b4fa1ff3 - tools_r22.0.5-macosx.zip + 74822802 + 76896171d0c9ba91c875c8f13ac58cd2e50e9f28 + tools_r22.2-macosx.zip diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml index f0e8347f6db..75ddf73eb1d 100644 --- a/pkgs/development/mobile/androidenv/sys-img-x86.xml +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -136,4 +136,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY + + Android SDK Platform 4.3 + 1 + 18 + x86 + + + + 155656419 + f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1 + sysimg_x86-18_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index bc78ea11e6f..4c1f0a30907 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -48,8 +48,8 @@ in sysimg_armeabi-v7a_18 = buildSystemImage { name = "armeabi-v7a-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; - sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r02.zip; + sha1 = "4a1a93200210d8c42793324362868846f67401ab"; }; }; @@ -85,6 +85,14 @@ in }; }; + sysimg_x86_18 = buildSystemImage { + name = "x86-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-18_r01.zip; + sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; + }; + }; + sysimg_mips_15 = buildSystemImage { name = "mips-15"; src = fetchurl { From 7d2364def44faa2a84da04a83c98fe6fbac0b146 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Sep 2013 13:04:42 +0200 Subject: [PATCH 078/193] mountall: Remove It's no longer used since we switched to systemd. --- pkgs/os-specific/linux/mountall/default.nix | 22 -- .../linux/mountall/fix-usr1-race.patch | 27 -- .../linux/mountall/no-plymouth.patch | 295 ------------------ pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/release-python.nix | 1 - 5 files changed, 347 deletions(-) delete mode 100644 pkgs/os-specific/linux/mountall/default.nix delete mode 100644 pkgs/os-specific/linux/mountall/fix-usr1-race.patch delete mode 100644 pkgs/os-specific/linux/mountall/no-plymouth.patch diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix deleted file mode 100644 index 4cad810cc5f..00000000000 --- a/pkgs/os-specific/linux/mountall/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }: - -stdenv.mkDerivation { - name = "mountall-2.35"; - - src = fetchurl { - url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.35.tar.gz; - sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy"; - }; - - patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ]; - - buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ]; - - makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; - - meta = { - homepage = https://launchpad.net/ubuntu/+source/mountall; - description = "Utility to mount all filesystems and emit Upstart events"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/mountall/fix-usr1-race.patch b/pkgs/os-specific/linux/mountall/fix-usr1-race.patch deleted file mode 100644 index e970b77733c..00000000000 --- a/pkgs/os-specific/linux/mountall/fix-usr1-race.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru mountall-2.35-orig/src/mountall.c mountall-2.35/src/mountall.c ---- mountall-2.35-orig/src/mountall.c 2012-03-20 11:01:14.035898815 +0100 -+++ mountall-2.35/src/mountall.c 2012-03-20 11:20:39.194786311 +0100 -@@ -3746,6 +3746,12 @@ - exit (EXIT_ERROR); - } - -+ /* SIGUSR1 tells us that a network device came up. Install -+ the handler before daemonising so that the mountall-net job -+ won't kill us by sending USR1. */ -+ nih_signal_set_handler (SIGUSR1, nih_signal_handler); -+ NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL)); -+ - /* Become daemon */ - if (daemonise) { - pid_t pid; -@@ -3799,10 +3805,6 @@ - nih_signal_set_handler (SIGTERM, nih_signal_handler); - NIH_MUST (nih_signal_add_handler (NULL, SIGTERM, nih_main_term_signal, NULL)); - -- /* SIGUSR1 tells us that a network device came up */ -- nih_signal_set_handler (SIGUSR1, nih_signal_handler); -- NIH_MUST (nih_signal_add_handler (NULL, SIGUSR1, usr1_handler, NULL)); -- - /* Check for force-fsck on the kernel command line */ - cmdline = fopen ("/proc/cmdline", "r"); - if (cmdline) { diff --git a/pkgs/os-specific/linux/mountall/no-plymouth.patch b/pkgs/os-specific/linux/mountall/no-plymouth.patch deleted file mode 100644 index 890dab9bc88..00000000000 --- a/pkgs/os-specific/linux/mountall/no-plymouth.patch +++ /dev/null @@ -1,295 +0,0 @@ -diff -ru -x '*~' mountall-2.31-orig/configure.ac mountall-2.31/configure.ac ---- mountall-2.31-orig/configure.ac 2011-07-15 14:00:15.000000000 +0200 -+++ mountall-2.31/configure.ac 2011-07-25 00:13:13.000000000 +0200 -@@ -29,7 +29,7 @@ - PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0]) - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) - PKG_CHECK_MODULES([UDEV], [libudev >= 146]) --PKG_CHECK_MODULES([PLYMOUTH], [ply-boot-client >= 0.8.0]) -+#PKG_CHECK_MODULES([PLYMOUTH], [ply-boot-client >= 0.8.0]) - - # Checks for header files. - -diff -ru -x '*~' mountall-2.31-orig/src/mountall.c mountall-2.31/src/mountall.c ---- mountall-2.31-orig/src/mountall.c 2011-07-15 14:00:15.000000000 +0200 -+++ mountall-2.31/src/mountall.c 2011-07-25 00:21:13.000000000 +0200 -@@ -64,8 +64,10 @@ - #include - #include - -+#if 0 - #include - #include -+#endif - - #include "ioprio.h" - -@@ -219,15 +221,19 @@ - void boredom_timeout (void *data, NihTimer *timer); - - int plymouth_connect (void); -+#if 0 - void plymouth_disconnected (void *user_data, ply_boot_client_t *client); -+#endif - - void plymouth_progress (Mount *mnt, int progress); - void plymouth_update (int only_clear); - -+#if 0 - void plymouth_response (void *user_data, ply_boot_client_t *client); - void plymouth_failed (void *user_data, ply_boot_client_t *client); - void plymouth_answer (void *user_data, const char *keys, - ply_boot_client_t *client); -+#endif - - void usr1_handler (void *data, NihSignal *signal); - int set_dev_wait_time (NihOption *option, const char *arg); -@@ -247,8 +253,10 @@ - **/ - size_t num_local = 0; - size_t num_local_mounted = 0; -+size_t num_local_failed = 0; - size_t num_remote = 0; - size_t num_remote_mounted = 0; -+size_t num_remote_failed = 0; - size_t num_virtual = 0; - size_t num_virtual_mounted = 0; - size_t num_swap = 0; -@@ -318,6 +326,7 @@ - **/ - static struct udev *udev = NULL; - -+#if 0 - /** - * ply_event_loop: - * -@@ -331,6 +340,7 @@ - * Plymouth boot client. - **/ - static ply_boot_client_t *ply_boot_client = NULL; -+#endif - - /** - * plymouth_error: -@@ -1253,11 +1263,12 @@ - nih_debug ("%s is root filesystem", MOUNT_NAME (mnt)); - tag = TAG_LOCAL; - } else if (is_remote (mnt)) { -- if ((! strcmp (mnt->mountpoint, "/usr")) -+ if ((! has_option (mnt, "nobootwait", FALSE)) && ( -+ (! strcmp (mnt->mountpoint, "/usr")) - || (! strcmp (mnt->mountpoint, "/var")) - || (! strncmp (mnt->mountpoint, "/usr/", 5)) - || (! strncmp (mnt->mountpoint, "/var/", 5)) -- || (has_option (mnt, "bootwait", FALSE))) -+ || (has_option (mnt, "bootwait", FALSE)))) - { - tag = TAG_REMOTE; - } else { -@@ -1566,7 +1577,8 @@ - /* Enforce local only after virtual filesystems triggered */ - if ((! local_triggered) - && virtual_triggered -- && (num_local_mounted == num_local)) { -+ && (num_local_mounted == num_local) -+ && (num_local_failed == 0)) { - nih_info (_("%s finished"), "local"); - emit_event ("local-filesystems", NULL); - local_triggered = TRUE; -@@ -1575,7 +1587,8 @@ - /* Enforce remote only after virtual filesystems triggrered */ - if ((! remote_triggered) - && virtual_triggered -- && (num_remote_mounted == num_remote)) { -+ && (num_remote_mounted == num_remote) -+ && (num_remote_failed == 0)) { - nih_info (_("%s finished"), "remote"); - emit_event ("remote-filesystems", NULL); - remote_triggered = TRUE; -@@ -1585,7 +1598,9 @@ - if ((! filesystem_triggered) - && virtual_triggered - && local_triggered -- && remote_triggered) { -+ && remote_triggered -+ && (num_local_failed == 0) -+ && (num_remote_failed == 0)) { - nih_info (_("All filesystems mounted")); - emit_event ("filesystem", NULL); - filesystem_triggered = TRUE; -@@ -1599,9 +1614,9 @@ - swap_triggered = TRUE; - } - -- nih_info ("local %zi/%zi remote %zi/%zi virtual %zi/%zi swap %zi/%zi", -- num_local_mounted, num_local, -- num_remote_mounted, num_remote, -+ nih_info ("local %zi/%zi/%zi remote %zi/%zi/%zi virtual %zi/%zi swap %zi/%zi", -+ num_local_mounted, num_local, num_local_failed, -+ num_remote_mounted, num_remote, num_remote_failed, - num_virtual_mounted, num_virtual, - num_swap_mounted, num_swap); - } -@@ -2442,12 +2457,14 @@ - if (no_events) - return; - -+#if 0 - /* Flush the Plymouth connection to ensure all updates are sent, - * since the event may kill plymouth. - */ - if (ply_boot_client) - ply_boot_client_flush (ply_boot_client); -- -+#endif -+ - env = NIH_MUST (nih_str_array_new (NULL)); - - if (mnt) { -@@ -3026,6 +3043,7 @@ - int - plymouth_connect (void) - { -+#if 0 - /* If we were already connected, just re-use that connection */ - if (ply_boot_client) - return TRUE; -@@ -3052,8 +3070,13 @@ - nih_info (_("Connected to Plymouth")); - - return TRUE; -+#else -+ return FALSE; -+#endif - } - -+ -+#if 0 - void - plymouth_disconnected (void * user_data, - ply_boot_client_t *client) -@@ -3066,6 +3089,7 @@ - ply_boot_client_free (ply_boot_client); - ply_boot_client = NULL; - } -+#endif - - - void -@@ -3076,6 +3100,7 @@ - - nih_assert (mnt != NULL); - -+#if 0 - /* No Plymouth => no progress information */ - if (! plymouth_connect ()) - return; -@@ -3105,6 +3130,7 @@ - plymouth_response, - plymouth_failed, - NULL); -+#endif - } - - void -@@ -3120,20 +3146,31 @@ - NIH_LIST_FOREACH (mounts, iter) { - Mount *mnt = (Mount *)iter; - -- if (mnt->error <= ERROR_BORED) -+ if (mnt->error == ERROR_NONE) - continue; - -- nih_error (_("Skipping mounting %s since Plymouth is not available"), -+ nih_error (_("Could not mount %s"), - MOUNT_NAME (mnt)); - - mnt->error = ERROR_NONE; - -+ if (mnt->tag == TAG_LOCAL) { -+ num_local_failed++; -+ emit_event ("mount-failed", mnt); -+ } -+ -+ if (mnt->tag == TAG_REMOTE) { -+ num_remote_failed++; -+ emit_event ("mount-failed", mnt); -+ } -+ - skip_mount (mnt); - } - - return; - } - -+#if 0 - /* If we're already displaying messages, don't change them unless - * the message is no longer valid for that mount point; otherwise - * clear the message. -@@ -3244,8 +3281,10 @@ - plymouth_answer, - plymouth_failed, - NULL); -+#endif - } - -+#if 0 - void - plymouth_response (void * user_data, - ply_boot_client_t *client) -@@ -3364,6 +3403,7 @@ - break; - } - } -+#endif - - /* - * set_dev_wait_time: -@@ -3399,7 +3439,6 @@ - return err; - } - -- - /** - * stop_mountpoint_timer: - * @mountpoint: mountpoint whose timer you want to stop. -@@ -3673,6 +3712,7 @@ - (NihIoWatcher)udev_monitor_watcher, - udev_monitor)); - -+#if 0 - /* Initialise a Plymouth event loop; this is an epoll instance that - * we can poll within our own main loop and call out to when needs - * be. -@@ -3686,6 +3726,7 @@ - - /* Attempt an early connection to Plymouth */ - plymouth_connect (); -+#endif - - mounts = NIH_MUST (nih_list_new (NULL)); - -@@ -3698,7 +3739,9 @@ - * from /etc/fstab and /proc/self/mountinfo to find out what else - * we need to do. - */ -+#if 0 - parse_fstab (BUILTIN_FSTAB); -+#endif - parse_fstab (_PATH_MNTTAB); - parse_mountinfo (); - -@@ -3822,10 +3865,12 @@ - /* Flush the D-Bus connection to ensure all messages are sent */ - dbus_connection_flush (connection); - -+#if 0 - /* Flush the Plymouth connection to ensure all updates are sent */ - if (ply_boot_client) - ply_boot_client_flush (ply_boot_client); -- -+#endif -+ - return ret; - } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d99bf9e7c..433bd734f2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6759,8 +6759,6 @@ let module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; - mountall = callPackage ../os-specific/linux/mountall { }; - aggregateModules = modules: callPackage ../os-specific/linux/kmod/aggregator.nix { inherit modules; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 1de3a8aff8b..2453712584a 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1166,7 +1166,6 @@ let monodoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; monotone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; monotoneViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mountall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mozplugger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 1751f77b6a0c70d02a0d6ee4f0f4ceeb67d62fcc Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 16 Sep 2013 22:44:40 +0200 Subject: [PATCH 079/193] linux-3.11: upgrade to 3.11.1 --- pkgs/os-specific/linux/kernel/linux-3.11.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.11.nix b/pkgs/os-specific/linux/kernel/linux-3.11.nix index 34b2d488289..94773a22bfa 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.11.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.11"; - modDirVersion = "3.11.0"; + version = "3.11.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1yfpa4fzhsn4r5dwkcf3azy0vqdms865jaikn3fdwbabmpqchgl0"; + sha256 = "16wblz06129lxvxsl3rhmdj4b31yzmwv3rxnjmrlj3c3qlzph29c"; }; features.iwlwifi = true; From 5eeb02f67c8fd7e838f432201eb6800f6c85eee5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 18 Sep 2013 13:07:47 +0200 Subject: [PATCH 080/193] android-sdk: upgrade to latests versions --- .../development/mobile/androidenv/build-tools.nix | 10 +++++----- pkgs/development/mobile/androidenv/default.nix | 6 ++++++ pkgs/development/mobile/androidenv/fetch | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100755 pkgs/development/mobile/androidenv/fetch diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 0d9cbc22080..58bf3549361 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,15 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r18.0.1"; + name = "android-build-tools-r18.1.0"; 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"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; } 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"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 3339a065e2a..3c6263f125d 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -64,6 +64,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_3 = androidsdk { + platformVersions = [ "18" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant; inherit androidsdk; diff --git a/pkgs/development/mobile/androidenv/fetch b/pkgs/development/mobile/androidenv/fetch new file mode 100755 index 00000000000..30aabc9e086 --- /dev/null +++ b/pkgs/development/mobile/androidenv/fetch @@ -0,0 +1,15 @@ +#!/bin/sh + +# this shows a list of available xmls +android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O + +# we skip the intel addons, as they are Windows+osX only +# we skip the default sys-img (arm?) because it is empty +curl -o repository-8.xml https://dl-ssl.google.com/android/repository/repository-8.xml +curl -o addon.xml https://dl-ssl.google.com/android/repository/addon.xml +curl -o sys-img-mips.xml https://dl-ssl.google.com/android/repository/sys-img/mips/sys-img.xml +curl -o sys-img-x86.xml https://dl-ssl.google.com/android/repository/sys-img/x86/sys-img.xml + +./generate-addons.sh +./generate-platforms.sh +./generate-sysimages.sh From ef50aab1eef5b0122c621464b5ac434e924fa339 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:27:45 +0200 Subject: [PATCH 081/193] remove obsolete sqlite 3.7.9 --- .../libraries/sqlite/3.7.9-full.nix | 44 ------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 48 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/3.7.9-full.nix diff --git a/pkgs/development/libraries/sqlite/3.7.9-full.nix b/pkgs/development/libraries/sqlite/3.7.9-full.nix deleted file mode 100644 index c6ef448ea12..00000000000 --- a/pkgs/development/libraries/sqlite/3.7.9-full.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, tcl, readline ? null, ncurses ? null }: - -assert readline != null -> ncurses != null; - -stdenv.mkDerivation { - # I try to keep a version no newer than default.nix, and similar CFLAGS, - # for this to be compatible with it. - name = "sqlite-3.7.9-full"; - - src = fetchurl { - url = "http://www.sqlite.org/cgi/src/tarball/SQLite-3.7.9.tar.gz?uuid=version-3.7.9"; - sha256 = "0v11slxgjpx2nv7wp8c76wk2pa1dijs9v6zlcn2dj9jblp3bx8fk"; - }; - - buildInputs = [ readline ncurses ]; - nativeBuildInputs = [ tcl ]; - - doCheck = true; - checkTarget = "test"; - - configureFlags = "--enable-threadsafe --enable-tempstore"; - - preConfigure = '' - ${ # The tests oserror-1.1.{1,2,3} need the fd limit < 2000 - # and on the builders in NixOS we have 4096 now. - if stdenv.isLinux then "ulimit -n 1024" else ""} - export TCLLIBDIR=$out/${tcl.libdir} - ''; - - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; - - postInstall = '' - make sqlite3_analyzer - cp sqlite3_analyzer $out/bin - ''; - - meta = { - homepage = http://www.sqlite.org/; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 433bd734f2c..bc5a3f84f45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5537,10 +5537,6 @@ let inherit readline ncurses; }); - sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix { - inherit readline ncurses; - }); - stfl = callPackage ../development/libraries/stfl { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple From 2d1e91cced78cd3547c1add0ca890b9616657039 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:26:39 +0200 Subject: [PATCH 082/193] remove obsolete sqlite 3.7.14 --- pkgs/development/libraries/sqlite/3.7.14.nix | 25 -------------------- pkgs/top-level/all-packages.nix | 5 ---- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/3.7.14.nix diff --git a/pkgs/development/libraries/sqlite/3.7.14.nix b/pkgs/development/libraries/sqlite/3.7.14.nix deleted file mode 100644 index 50338f98a2c..00000000000 --- a/pkgs/development/libraries/sqlite/3.7.14.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, readline ? null, ncurses ? null }: - -assert readline != null -> ncurses != null; - -stdenv.mkDerivation { - name = "sqlite-3.7.14.1"; - - src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz; - sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc"; - }; - - buildInputs = [ readline ncurses ]; - - configureFlags = "--enable-threadsafe"; - - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; - - meta = { - homepage = http://www.sqlite.org/; - description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc5a3f84f45..48f2c569ff2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5526,11 +5526,6 @@ let ncurses = null; }); - sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { - readline = null; - ncurses = null; - }); - sqlite = sqlite_3_7_16; sqliteInteractive = appendToName "interactive" (sqlite.override { From d506c662e8f07ee75422464e0b56289effc09a3f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:28:31 +0200 Subject: [PATCH 083/193] remove sqlite alias now there is only 1 version --- pkgs/development/libraries/sqlite/{3.7.16.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/development/libraries/sqlite/{3.7.16.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/sqlite/3.7.16.nix b/pkgs/development/libraries/sqlite/default.nix similarity index 100% rename from pkgs/development/libraries/sqlite/3.7.16.nix rename to pkgs/development/libraries/sqlite/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48f2c569ff2..2db066ac23d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,13 +5521,11 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; - sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { + sqlite = lowPrio (callPackage ../development/libraries/sqlite { readline = null; ncurses = null; }); - sqlite = sqlite_3_7_16; - sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; }); From 386257e019e493fad2864864b60f742913a26eec Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:33:01 +0200 Subject: [PATCH 084/193] sqlite: upgrade to 3.8.0.2 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f681e94c6ba..7521abc599b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.16.2"; + name = "sqlite-3.8.0.2"; src = fetchurl { - url = http://www.sqlite.org/2013/sqlite-autoconf-3071602.tar.gz; - sha1 = "85bf857cf86f34831d55d7ba97606dba581b8d62"; + url = http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz; + sha1 = "294c30e882a0d45877bce09afe72d08ccfc6b650"; }; buildInputs = [ readline ncurses ]; From 36b503e06a529562f5bdd7b60f37245e7a3e3004 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 20:32:18 +0200 Subject: [PATCH 085/193] firefox: upgrade to 24.0 --- .../networking/browsers/firefox/default.nix | 9 +-- .../browsers/firefox/system-cairo.patch | 73 ------------------- 2 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/system-cairo.patch diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index fe436046339..b6331e9914c 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 = "23.0.1"; + firefoxVersion = "24.0"; - xulVersion = "23.0.1"; # this attribute is used by other packages + xulVersion = "24.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 = "66361fcvyl9liyh41gvgysiim90wsywk"; + sha1 = "8scch0gr59j86vp9c1v0yx6mq1pkwcvg"; }; commonConfigureFlags = @@ -57,6 +57,7 @@ in rec { "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" + "--disable-gstreamer" ] ++ optional useSystemCairo "--enable-system-cairo"; @@ -82,8 +83,6 @@ in rec { enableParallelBuilding = true; - patches = optional useSystemCairo ./system-cairo.patch; - preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" diff --git a/pkgs/applications/networking/browsers/firefox/system-cairo.patch b/pkgs/applications/networking/browsers/firefox/system-cairo.patch deleted file mode 100644 index 76cf4d51c9c..00000000000 --- a/pkgs/applications/networking/browsers/firefox/system-cairo.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# From: https://hg.mozilla.org/mozilla-central/rev/52b02042b27f -# User Connor Behan -# Date 1370038985 -7200 -# Node ID 52b02042b27f75acbcb2bd4822bedb00ab680e67 -# Parent 08ed531fed70978385cf9253bbc8389b0abe76ca -Bug 722975: Unbreak builds using --with-system-cairo. r=bas - -diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp ---- a/gfx/thebes/gfxPlatform.cpp -+++ b/gfx/thebes/gfxPlatform.cpp -@@ -548,23 +548,31 @@ struct SourceSurfaceUserData - BackendType mBackendType; - }; - - void SourceBufferDestroy(void *srcSurfUD) - { - delete static_cast(srcSurfUD); - } - -+#if MOZ_TREE_CAIRO - void SourceSnapshotDetached(cairo_surface_t *nullSurf) - { - gfxImageSurface* origSurf = - static_cast(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); - - origSurf->SetData(&kSourceSurface, NULL, NULL); - } -+#else -+void SourceSnapshotDetached(void *nullSurf) -+{ -+ gfxImageSurface* origSurf = static_cast(nullSurf); -+ origSurf->SetData(&kSourceSurface, NULL, NULL); -+} -+#endif - - RefPtr - gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) - { - void *userData = aSurface->GetData(&kSourceSurface); - - if (userData) { - SourceSurfaceUserData *surf = static_cast(userData); -@@ -667,24 +675,28 @@ gfxPlatform::GetSourceSurfaceForSurface( - } - - srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(), - imgSurface->Stride(), - size, format); - - } - -+#if MOZ_TREE_CAIRO - cairo_surface_t *nullSurf = - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_surface_set_user_data(nullSurf, - &kSourceSurface, - imgSurface, - NULL); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_destroy(nullSurf); -+#else -+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", (const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get()); -+#endif - } - - SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; - srcSurfUD->mBackendType = aTarget->GetType(); - srcSurfUD->mSrcSurface = srcBuffer; - aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy); - - return srcBuffer; - From a918a0b36652e5ecaac8e612c2d7158eb9d8aaf1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:47:45 +0200 Subject: [PATCH 086/193] firefox: use system cairo now upstream properly supports it --- .../networking/browsers/firefox/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index b6331e9914c..81c90a4ca96 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,8 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo ? null -, useSystemCairo ? false +, cairo , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those # binaries may not be distributed without permission from the @@ -14,7 +13,6 @@ }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -assert useSystemCairo -> cairo != null; let optional = stdenv.lib.optional; in rec { @@ -52,13 +50,14 @@ in rec { "--enable-system-hunspell" "--enable-system-pixman" "--enable-system-sqlite" + "--enable-system-cairo" "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" "--disable-gstreamer" - ] ++ optional useSystemCairo "--enable-system-cairo"; + ]; xulrunner = stdenv.mkDerivation rec { @@ -73,8 +72,8 @@ in rec { alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx - ] ++ optional useSystemCairo cairo; + hunspell libevent libstartup_notification libvpx cairo + ]; configureFlags = [ "--enable-application=xulrunner" @@ -138,8 +137,8 @@ in rec { [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite - hunspell libevent libstartup_notification libvpx - ] ++ optional useSystemCairo cairo; + hunspell libevent libstartup_notification libvpx cairo + ]; patches = [ ./disable-reporter.patch # fixes "search box not working when built on xulrunner" From 8e4a53ba9533fd07a3f60311d60922297ae7fcd6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 17 Sep 2013 22:57:13 +0200 Subject: [PATCH 087/193] firefox: enable gstreamer support This finally brings H.264/MP3/AAC support for HTML5