From 9adcb636b3765762475486ad06be6eb2ce9fcb73 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 4 Dec 2012 14:00:33 -0800 Subject: [PATCH 001/248] Fix hardcoded paths in ztest --- pkgs/os-specific/linux/zfs/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index cfe460faaf47..f2b701695ffe 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -19,11 +19,13 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" - substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" + substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest" + substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" ''; configureFlags = '' From 894de031cd248705c8cb1ed3425fa50af9ea67a9 Mon Sep 17 00:00:00 2001 From: RSzibele Date: Fri, 4 Jan 2013 11:39:11 +0100 Subject: [PATCH 002/248] Added Minetest-0.4.4. --- pkgs/games/minetest/default.nix | 40 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/games/minetest/default.nix diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix new file mode 100644 index 000000000000..3b06cd8694cd --- /dev/null +++ b/pkgs/games/minetest/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2, + libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: + +let + version = "0.4.4"; + sources = { + src = fetchgit { + url = "https://github.com/celeron55/minetest.git"; + rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8"; + }; + data = fetchgit { + url = "https://github.com/celeron55/minetest_game.git"; + rev = "3928eccf74af0288d12ffb14f8222fae479bc06b"; + }; + }; +in stdenv.mkDerivation { + name = "minetest-${version}"; + + src = sources.src; + + cmakeFlags = [ + "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" + ]; + + buildInputs = [ + cmake irrlicht3843 libpng12 bzip2 libjpeg + libXxf86vm mesa openal libvorbis x11 + ]; + + postInstall = '' + mkdir -pv $out/share/minetest/games/minetest_game/ + cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ + ''; + + meta = { + homepage = "http://minetest.net/"; + description = "Minetest is an infinite-world block sandbox game."; + license = "LGPLv2.1+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 807032672176..32ae6a772dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1082,6 +1082,8 @@ let minecraft = callPackage ../games/minecraft { }; + minetest = callPackage ../games/minetest { }; + miniupnpc = callPackage ../tools/networking/miniupnpc { }; miniupnpd = callPackage ../tools/networking/miniupnpd { }; From c6d9e073b072bc4bc70bac3e1beb8b29b73b78f3 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 1 Feb 2013 19:52:57 -0800 Subject: [PATCH 003/248] zfs-0.6.0-rc14, spl-0.6.0-rc14 --- pkgs/os-specific/linux/spl/default.nix | 6 +++--- pkgs/os-specific/linux/zfs/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 94e3573b70e6..c95060a5ffbf 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc13-${kernel.version}"; + name = "spl-0.6.0-rc14-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz; - sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; + sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; }; patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 17c7d3824d7a..4769d78a2fdc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc13-${kernel.version}"; + name = "zfs-0.6.0-rc14-${kernel.version}"; src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz; - sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv"; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz; + sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg"; }; patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; From 40e86be5b18d501806de99464baf8697877d91bd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 2 Feb 2013 19:38:56 -0500 Subject: [PATCH 004/248] Gummiboot: Switch to zip archive. For some reason tarballs from cgit have a different hash each time you download. --- pkgs/tools/misc/gummiboot/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index a59854c82d2c..341939ea40f6 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, gnu_efi }: +{ stdenv, fetchurl, gnu_efi, unzip }: stdenv.mkDerivation rec { name = "gummiboot-16"; + buildInputs = [ unzip ]; + patches = [ ./no-usr.patch ]; buildFlags = [ @@ -12,8 +14,8 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; src = fetchurl { - url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.tar.gz"; - sha256 = "1znvbxrhc7pkbhbw9bvg4zhfkp81q7fy4mq2jsw6vimccr7h29a0"; + url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip"; + sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1"; }; meta = { From 8d5bbfb20da3a1d343431db4b5ca48083b4d0d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 3 Feb 2013 18:56:48 +0400 Subject: [PATCH 005/248] development/libraries/librdf/default.nix: Move librdf_raptor to propagatedBuildInputs. --- pkgs/development/libraries/librdf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index e02cedeeab3c..1f3e5b409378 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm"; }; - buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ]; + buildInputs = [ pkgconfig ladspaH openssl zlib ]; + + propagatedBuildInputs = [ librdf_raptor ]; meta = { description = "A lightweight RDF library with special support for LADSPA plugins."; From 5784dbb095f44f17b7a7139e524be2a820ac2641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 3 Feb 2013 19:58:11 +0400 Subject: [PATCH 006/248] qjackctl: Update to 0.3.9, --enable-jack-version --- pkgs/applications/audio/qjackctl/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 01fa24a065e0..e70d51ce857c 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: stdenv.mkDerivation rec { - version = "0.3.8"; + version = "0.3.9"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "1rbipbknq7f8qfma33vwfv2ar3vxkz1p1ykp5mx6nirmcn1nj247"; + sha256 = "0a4s7lwd5b67qbwv1yck8bw6zz8ffx1gza5fwflfqrfcfl3dds2y"; }; buildInputs = [ qt4 alsaLib jackaudio dbus ]; + configureFlags = "--enable-jack-version"; + meta = { - description = "qt jackd control gui tool"; + description = "A Qt application to control the JACK sound server daemon"; homepage = http://qjackctl.sourceforge.net/; license = "GPL"; }; From 5406828d76e1803b66293287aaa67bc4ad750e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 3 Feb 2013 20:22:43 +0400 Subject: [PATCH 007/248] jackaudio/default.nix: Update to 1.9.9.5. --- pkgs/misc/jackaudio/default.nix | 14 +- .../jackaudio/ffado_setbuffsize-jack2.patch | 140 ------------------ 2 files changed, 7 insertions(+), 147 deletions(-) delete mode 100644 pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 77d3c2f35ab9..826924b8e8e2 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate , libsndfile, makeWrapper, pkgconfig, python, pythonDBus -, firewireSupport ? false, ffado ? null }: +, firewireSupport ? false, ffado ? null, bash }: assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { name = "jackdbus-${version}"; - version = "1.9.8"; + version = "1.9.9.5"; src = fetchurl { urls = [ - "http://pkgs.fedoraproject.org/lookaside/pkgs/jack-audio-connection-kit/jack-1.9.8.tgz/1dd2ff054cab79dfc11d134756f27165/jack-1.9.8.tgz" - "http://www.grame.fr/~letz/jack-1.9.8.tgz" + https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2 ]; - sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac"; + sha256 = "1ggba69jsfg7dmjzlyqz58y2wa92lm3vwdy4r15bs7mvxb65mvv5"; }; buildInputs = @@ -21,10 +20,11 @@ stdenv.mkDerivation rec { pkgconfig python pythonDBus ] ++ (stdenv.lib.optional firewireSupport ffado); - patches = ./ffado_setbuffsize-jack2.patch; + patchPhase = '' + substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash + ''; configurePhase = '' - cd jack-1.9.8 python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""} ''; diff --git a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch deleted file mode 100644 index 7771639280d8..000000000000 --- a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch +++ /dev/null @@ -1,140 +0,0 @@ -https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/jack2 - -From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Sat, 17 Mar 2012 22:36:30 +0100 -Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size - -This is a port of Jonathan Woithe's patch from jackd1. -With sufficiently recent versions of FFADO, it allows to change -the buffersize at runtime. ---- - linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- - linux/firewire/JackFFADODriver.h | 6 ++++ - 2 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -index b33e1cd..085b78a 100644 ---- a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -+++ b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp -@@ -3,6 +3,7 @@ - Copyright (C) 2004 Grame - Copyright (C) 2007 Pieter Palmers - Copyright (C) 2009 Devin Anderson -+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -48,7 +49,10 @@ - namespace Jack - { - -+// Basic functionality requires API version 8. If version 9 or later -+// is present the buffers can be resized at runtime. - #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 -+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 - - #define jack_get_microseconds GetMicroSeconds - -@@ -281,19 +285,68 @@ - int - JackFFADODriver::SetBufferSize (jack_nframes_t nframes) - { -- printError("Buffer size change requested but not supported!!!"); -+ ffado_driver_t* driver = (ffado_driver_t*)fDriver; -+ signed int chn; -+ -+ // The speed of this function isn't critical; we can afford the -+ // time to check the FFADO API version. -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || -+ ffado_streaming_set_period_size == NULL) { -+ printError("unsupported on current version of FFADO; please upgrade FFADO"); -+ return -1; -+ } - -- /* - driver->period_size = nframes; - driver->period_usecs = - (jack_time_t) floor ((((float) nframes) / driver->sample_rate) - * 1000000.0f); -- */ -+ -+ -+ // Reallocate the null and scratch buffers. -+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->nullbuffer == NULL) { -+ printError("could not allocate memory for null buffer"); -+ return -1; -+ } -+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->scratchbuffer == NULL) { -+ printError("could not allocate memory for scratch buffer"); -+ return -1; -+ } -+ -+ // MIDI buffers need reallocating -+ for (chn = 0; chn < driver->capture_nchannels; chn++) { -+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { -+ // setup the midi buffer -+ if (driver->capture_channels[chn].midi_buffer != NULL) -+ free(driver->capture_channels[chn].midi_buffer); -+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ for (chn = 0; chn < driver->playback_nchannels; chn++) { -+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { -+ if (driver->playback_channels[chn].midi_buffer != NULL) -+ free(driver->playback_channels[chn].midi_buffer); -+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ -+ // Notify FFADO of the period size change -+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { -+ printError("could not alter FFADO device period size"); -+ return -1; -+ } -+ -+ // This is needed to give the shadow variables a chance to -+ // properly update to the changes. -+ sleep(1); - - /* tell the engine to change its buffer size */ -- //driver->engine->set_buffer_size (driver->engine, nframes); -+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails - -- return -1; // unsupported -+ UpdateLatencies(); -+ -+ return 0; - } - - typedef void (*JackDriverFinishFunction) (jack_driver_t *); -@@ -306,7 +359,7 @@ - - assert(params); - -- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { - printError("Incompatible libffado version! (%s)", ffado_get_version()); - return NULL; - } -diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.h b/jack-1.9.8/linux/firewire/JackFFADODriver.h -index cb2a45d..790f4dd 100644 ---- a/jack-1.9.8/linux/firewire/JackFFADODriver.h -+++ b/jack-1.9.8/linux/firewire/JackFFADODriver.h -@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver - int Read(); - int Write(); - -+ // BufferSize can be changed -+ bool IsFixedBufferSize() -+ { -+ return false; -+ } -+ - int SetBufferSize(jack_nframes_t nframes); - }; - --- -1.7.10 From 52d265fd12b49c8f7e0b593231a797e72f15c76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 3 Feb 2013 20:36:32 +0400 Subject: [PATCH 008/248] applications/audio/guitarix: New nixpkg. --- pkgs/applications/audio/guitarix/default.nix | 53 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/audio/guitarix/default.nix diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix new file mode 100644 index 000000000000..17d53a621ca6 --- /dev/null +++ b/pkgs/applications/audio/guitarix/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, jackaudio, libsndfile +, glib, gtk, glibmm, gtkmm, fftw, librdf, ladspaH, boost }: + +stdenv.mkDerivation rec { + name = "guitarix-${version}"; + version = "0.25.2"; + + src = fetchurl { + url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; + sha256 = "1wcg3yc2iy72hj6z9l88393f00by0iwhhn8xrc3q55p4rj0mnrga"; + }; + + buildInputs = + [ python gettext intltool pkgconfig jackaudio libsndfile glib gtk glibmm + gtkmm fftw librdf ladspaH boost + ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf build"; + + installPhase = "python waf install"; + + meta = { + description = "A virtual guitar amplifier for Linux running with JACK"; + longDescription = '' + guitarix is a virtual guitar amplifier for Linux running with + JACK (Jack Audio Connection Kit). It is free as in speech and + free as in beer. Its free sourcecode allows to build it for + other UNIX-like systems also, namely for BSD and for MacOSX. + + It takes the signal from your guitar as any real amp would do: + as a mono-signal from your sound card. Your tone is processed by + a main amp and a rack-section. Both can be routed separately and + deliver a processed stereo-signal via JACK. You may fill the + rack with effects from more than 25 built-in modules spanning + from a simple noise-gate to brain-slashing modulation-fx like + flanger, phaser or auto-wah. Your signal is processed with + minimum latency. On any properly set-up Linux-system you do not + need to wait for more than 10 milli-seconds for your playing to + be delivered, processed by guitarix. + + guitarix offers the range of sounds you would expect from a + full-featured universal guitar-amp. You can get crisp + clean-sounds, nice overdrive, fat distortion and a diversity of + crazy sounds never heard before. + ''; + homepage = http://guitarix.sourceforge.net/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.astsmtl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8860d409c367..1c00a2dcd272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7055,6 +7055,10 @@ let inherit (gnome) libgnome libgnomeui vte; }; + guitarix = callPackage ../applications/audio/guitarix { + fftw = fftwSinglePrec; + }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { }; From a6ada4b3f9901efe3955af35862e7b6c2acd1909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 3 Feb 2013 22:17:33 +0400 Subject: [PATCH 009/248] firefoxWrapper: Fix Quake Live support. --- pkgs/top-level/all-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c00a2dcd272..d65840d153c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8047,14 +8047,14 @@ let wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: + let + cfg = stdenv.lib.attrByPath [ browserName ] {} config; + enableAdobeFlash = cfg.enableAdobeFlash or true; + enableGnash = cfg.enableGnash or false; + in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = - let - cfg = stdenv.lib.attrByPath [ browserName ] {} config; - enableAdobeFlash = cfg.enableAdobeFlash or true; - enableGnash = cfg.enableGnash or false; - in assert !(enableGnash && enableAdobeFlash); ([ ] ++ lib.optional enableGnash gnash @@ -8066,7 +8066,7 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if config.browserName.enableQuakeLive or false + if cfg.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; From 789154b119d4ada7b51a9bce23258e25353329f6 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 4 Feb 2013 10:45:47 +0100 Subject: [PATCH 010/248] Add fping, a more scriptable ping --- pkgs/tools/networking/fping/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/tools/networking/fping/default.nix diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix new file mode 100644 index 000000000000..c51c8f59ff76 --- /dev/null +++ b/pkgs/tools/networking/fping/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "fping-3.4"; + + src = fetchurl { + url = "http://www.fping.org/dist/${name}.tar.gz"; + sha256 = "1zkawlk6lcqw6nakqnl3v0x1cwnxrx2lmg9q6j76mw9i96pjh9fl"; + }; + + meta = { + homepage = "http://fping.org/"; + description = "A program to send ICMP echo probes to network hosts."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d65840d153c7..575e903e87c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -759,6 +759,8 @@ let fox = callPackage ../development/libraries/fox/default.nix { }; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fping = callPackage ../tools/networking/fping {}; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; From 9670631c75199f2386ee30380a0c5145e7f5d867 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Feb 2013 13:57:59 +0100 Subject: [PATCH 011/248] nvidia-x11: Update to 310.32 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 1 + pkgs/os-specific/linux/nvidia-x11/default.nix | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 98a03002fc2a..c0ba9d885543 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -48,6 +48,7 @@ installPhase() { patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5583d123cfec..e3630db2d5b6 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "310.19"; in +let versionNumber = "310.32"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0bqcg2zlp42msz1pghrpmjy6bw1abm6xxh129m8pz80ydb085l45"; + sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0wjwm8m6hakr22xn2fm59abr1by65p987h7jgaa8q5zvmzgrxd87"; + sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -38,6 +38,8 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + openclPath = stdenv.lib.makeLibraryPath [zlib]; + programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); From 5784fa5f79709b4a87c5d6b2169a0e664536032f Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 3 Feb 2013 02:21:40 +0100 Subject: [PATCH 012/248] for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e331b86872eb..0bf5e8a61ddf 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-rootprefix=$(out)" + "--with-kbd-loadkeys=${kbd}/bin/loadkeys" + "--with-kbd-setfont=${kbd}/bin/setfont" "--with-rootprefix=$(out)" "--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces" "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d" @@ -63,9 +65,7 @@ stdenv.mkDerivation rec { PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python NIX_CFLAGS_COMPILE = - [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\"" - "-DKBD_SETFONT=\"${kbd}/bin/setfont\"" - # Can't say ${polkit}/bin/pkttyagent here because that would + [ # Can't say ${polkit}/bin/pkttyagent here because that would # lead to a cyclic dependency. "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" From c32435381e1d1cdfde5c27190f0339181583c17c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 06:57:46 -0500 Subject: [PATCH 013/248] Linux 3.0.62 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 557ee6b52c6f..18ef471f4afb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.59"; + version = "3.0.62"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86"; + sha256 = "0bmvsh3n8llx2zynd2q3z0hg3i3ib36yr4j5pd7jlapf8pzmgi25"; }; config = configWithPlatform stdenv.platform; From 249b3ea5ef6dfbd41d6da1cef9483794f15b52e0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 06:58:07 -0500 Subject: [PATCH 014/248] Linux 3.4.29 --- 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 6046e3b65fc2..067f4be97dc0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -241,7 +241,7 @@ in import ./generic.nix ( rec { - version = "3.4.28"; + version = "3.4.29"; testing = false; preConfigure = '' @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "11b8nip1szm2c4wnpz2plv9icny33i377wd8jk9qbib08wwcf87i"; + sha256 = "117s6q71hf0p88bfpj7nsa7rdmz35b0c1vw5x87fd2ysb5lvnz4i"; }; config = configWithPlatform stdenv.platform; From 5336c82882faedd99d762e435539b1743335f89a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 06:58:19 -0500 Subject: [PATCH 015/248] Linux 3.7.6 --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 86c2223b77cc..25e6f181defb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -247,7 +247,7 @@ in import ./generic.nix ( rec { - version = "3.7.5"; + version = "3.7.6"; testing = false; preConfigure = '' @@ -256,7 +256,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1x8wpc33h3xib3c98icpw8b652lqdqcw0sal0fky4wrb7v22kshd"; + sha256 = "0r5njypz4ypcq1g7wpfzscc267k0zm0xh916rk3ypi0vj55k6pdv"; }; config = configWithPlatform stdenv.platform; From ed87cc2e4e8abc346262a268bb0999565ae89c41 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 07:19:31 -0500 Subject: [PATCH 016/248] pythonPackages.nose: Don't run tests on darwin. Should fix NixOS/charon#77 --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 154feb5c9c85..bd362587cc14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1659,6 +1659,8 @@ pythonPackages = python.modules // rec { }; buildInputs = [ coverage ]; + + doCheck = ! stdenv.isDarwin; }; nose2 = if isPy26 then null else (buildPythonPackage rec { From 0d1b60d206b450f7e051646c4542ffe61eaa7b35 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 07:20:14 -0500 Subject: [PATCH 017/248] Document deepSeq --- pkgs/lib/trivial.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index e971dd6d80e7..8af3474f2a67 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -27,6 +27,8 @@ rec { # evaluation of its first argument. seq = x: y: if x == null then y else y; + # Like `seq', but recurses into lists and attribute sets to force evaluation + # of all list elements/attributes. deepSeq = x: y: if builtins.isList x then deepSeqList x y From 33e90e510a020662890412848ca2148b274397f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 018/248] haskell-contravariant: update to version 0.3 --- .../libraries/haskell/contravariant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index 526b9e1f9973..571632d09b5a 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.2.0.2"; - sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; - buildDepends = [ transformers ]; + version = "0.3"; + sha256 = "025rmangj0g8vls1ymh1dz4xq6ljnn8fsbcfrds3030s325v4zl9"; + buildDepends = [ transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Haskell 98 contravariant functors"; From 5ecaa4b551fd3b8de3dd9cd07855c47d5964f3c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 019/248] haskell-criterion: update to version 0.6.2.1 --- pkgs/development/libraries/haskell/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 64f03d4dccae..004f74cd7e7f 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.2.0"; - sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx"; + version = "0.6.2.1"; + sha256 = "08gbs61qqsq0kh2r33kzm9mmbs3ar5krmp1a0cf21c012k6k55z5"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms From e3ac93b519f522913c5ef2664b855edd8f80dc83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 020/248] haskell-email-validate: update to version 1.0.0 --- .../libraries/haskell/email-validate/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 1b1b4b7348ed..482fd766487f 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, ranges }: +{ cabal, attoparsec }: cabal.mkDerivation (self: { pname = "email-validate"; - version = "0.3.2"; - sha256 = "0cshrl0if1ivn7c0ggm21r58pzsyp7l5wk3dgl86n6zla9dwdmhq"; - buildDepends = [ parsec ranges ]; + version = "1.0.0"; + sha256 = "0sj1cvn9ap0m8d4cg4cqavvmkd74vp86lyyra9g6f17815sxdbsg"; + buildDepends = [ attoparsec ]; meta = { homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; description = "Validating an email address string against RFC 5322"; From 7bca38c6faf746224c8f9369ac1ee98213d4d921 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 021/248] haskell-hastache: update to version 0.5.0 --- pkgs/development/libraries/haskell/hastache/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index f37badde96da..ff8aa25bd2d2 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,13 +1,13 @@ { cabal, blazeBuilder, filepath, ieee754, mtl, syb, text -, utf8String +, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hastache"; - version = "0.4.2"; - sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi"; + version = "0.5.0"; + sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8"; buildDepends = [ - blazeBuilder filepath ieee754 mtl syb text utf8String + blazeBuilder filepath ieee754 mtl syb text transformers utf8String ]; meta = { homepage = "http://github.com/lymar/hastache"; From 9a081207cfe197e4cb2e0a35d25b2d464db8c65b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 022/248] haskell-math-functions: update to version 0.1.3.0 --- pkgs/development/libraries/haskell/math-functions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index 127e888d1104..158feeee18a7 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.1.2"; - sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v"; + version = "0.1.3.0"; + sha256 = "06wxr8fbhmsgkpyx2vimx9l6apk0p27mwrxrvbjk0b7m9vsg3ay5"; buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; From 67d7dee6ee683d3d4455acc90dcfccf6966bd204 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 023/248] haskell-profunctors: update to version 3.3 --- pkgs/development/libraries/haskell/profunctors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index 7146359eda40..e2194bf90597 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "profunctors"; - version = "3.2"; - sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc"; + version = "3.3"; + sha256 = "0cvar0qr2yf0lmqwhiy2ibajiq9cmqy2ikwn8l5mdxxh5q5rwgjj"; buildDepends = [ comonad tagged ]; meta = { homepage = "http://github.com/ekmett/profunctors/"; From f3620bfe1d96a95a80f789687f45c109444c0573 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 024/248] haskell-semigroupoids: update to version 3.0.2 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 7e25fa5913e2..4f1367dd559d 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0.1"; - sha256 = "12k2yryr31lxhwq42cx05kswljmbli8p8c2wknigzkkam63d8k5h"; + version = "3.0.2"; + sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; From b390e531ea78adcfeb49ead13676c68253312d7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 025/248] haskell-yesod-auth: update to version 1.1.4.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 67a436870924..e0bd834f1ea4 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.4"; - sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx"; + version = "1.1.4.1"; + sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit httpTypes liftedBase mimeMail network persistent persistentTemplate From 805b7783d4dbf65fefdf1e727648a9191cadb537 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 4 Feb 2013 13:40:28 +0100 Subject: [PATCH 026/248] haskell-yesod-form: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index ae36c5180c3f..9ce33159d8f1 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1"; - sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq"; + version = "1.2.1.1"; + sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From c89187cc3c89f6fdca509f579871bcc6827e87ce Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 4 Feb 2013 15:21:33 +0100 Subject: [PATCH 027/248] Added setup hook that adds a Node package automatically to NODE_PATH, if included in the buildInputs parameter --- pkgs/development/web/nodejs/default.nix | 2 ++ pkgs/development/web/nodejs/setup-hook.sh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/web/nodejs/setup-hook.sh diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 533411b92de3..7f1aafa64f77 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux; + + setupHook = ./setup-hook.sh; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh new file mode 100644 index 000000000000..c2888471044d --- /dev/null +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -0,0 +1,5 @@ +addNodePath () { + addToSearchPath NODE_PATH $1/node_modules +} + +envHooks=(${envHooks[@]} addNodePath) From 1c23150eb0af55a0620dfc20c33f29a20855e693 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2013 15:33:09 +0100 Subject: [PATCH 028/248] Port my nss_myhostname patches to systemd --- ...007-Ignore-IPv6-link-local-addresses.patch | 37 ++++++++++++++++ ...lt-in-nscd-when-using-nss-myhostname.patch | 42 +++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch create mode 100644 pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch new file mode 100644 index 000000000000..1a8d294fd225 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch @@ -0,0 +1,37 @@ +From ab889004b8972258a87798133451f99dfce21823 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 4 Feb 2013 12:41:14 +0100 +Subject: [PATCH 7/8] Ignore IPv6 link-local addresses + +Returning IPv6 link-local addresses is a bad idea, because they only +work if an application connects specifically over the corresponding +interface. So you get errors like: + + $ curl -6 http://my-machine/ + curl: (7) Failed to connect to fe80::d6be:d9ff:fe1b:8477: Invalid argument + +To prevent this, this patch filters out link-local addresses. So if +you don't have a routable IPv6 address, nss-myhostname will fall back +to returning ::1. +--- + src/nss-myhostname/netlink.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c +index 53c3b50..621ca1d 100644 +--- a/src/nss-myhostname/netlink.c ++++ b/src/nss-myhostname/netlink.c +@@ -155,6 +155,10 @@ int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) { + ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) + continue; + ++ if (ifaddrmsg->ifa_family == AF_INET6 && ++ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) ++ continue; ++ + if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) + continue; + +-- +1.8.1 + diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch new file mode 100644 index 000000000000..6937c6c594e9 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch @@ -0,0 +1,42 @@ +From ef9b259ae24e7bf4ebec04b0b0a44964bc661bb5 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 4 Feb 2013 12:43:08 +0100 +Subject: [PATCH 8/8] Fix a segfault in nscd when using nss-myhostname +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Nscd expects that an NSS module's gethostbyname4_r function returns +its first result in the pre-allocated gaih_addrtuple denoted by **pat. +(See nscd/aicache.c in the Glibc sources.) However, nss-myhostname +doesn't fill in **pat but allocates the first result in ‘buffer’, then +sets *pat. So nscd crashes (e.g. when running ‘getent ahosts +my-machine’). + +Hard to tell if this is a bug in nscd, since there doesn't seem to be +a proper API spec for gethostbyname4_r. But in any case, this patch +fixes the crash by copying the first result to **pat. +--- + src/nss-myhostname/nss-myhostname.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c +index 834a806..b0fb832 100644 +--- a/src/nss-myhostname/nss-myhostname.c ++++ b/src/nss-myhostname/nss-myhostname.c +@@ -176,7 +176,11 @@ enum nss_status _nss_myhostname_gethostbyname4_r( + /* Verify the size matches */ + assert(idx == ms); + +- *pat = r_tuple_prev; ++ /* Nscd expects us to store the first record in **pat. */ ++ if (*pat) ++ **pat = *r_tuple_prev; ++ else ++ *pat = r_tuple_prev; + + if (ttlp) + *ttlp = 0; +-- +1.8.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0bf5e8a61ddf..9e64bb7ed405 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { ./0004-Set-switch-to-configuration-hints-for-some-units.patch ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch ./0006-Don-t-call-plymouth-quit.patch + ./0007-Ignore-IPv6-link-local-addresses.patch + ./0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; buildInputs = From 938afe971c1d945f6ce00947751707c184cb8648 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Feb 2013 15:48:11 +0100 Subject: [PATCH 029/248] nss_myhostname: Remove This package is now part of systemd. --- .../networking/nss-myhostname/default.nix | 19 ------------------- .../ignore-ipv6-link-local.patch | 13 ------------- .../nss-myhostname/nscd-segfault.patch | 15 --------------- pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 49 deletions(-) delete mode 100644 pkgs/tools/networking/nss-myhostname/default.nix delete mode 100644 pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch delete mode 100644 pkgs/tools/networking/nss-myhostname/nscd-segfault.patch diff --git a/pkgs/tools/networking/nss-myhostname/default.nix b/pkgs/tools/networking/nss-myhostname/default.nix deleted file mode 100644 index 80296b0d992c..000000000000 --- a/pkgs/tools/networking/nss-myhostname/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "nss-myhostname-0.3"; - - src = fetchurl { - url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz"; - sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb"; - }; - - patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ]; - - meta = { - description = "Name Service Switch module ensuring that the hostname always resolves to a valid address"; - homepage = http://0pointer.de/lennart/projects/nss-myhostname/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch deleted file mode 100644 index 396bb2e10ccd..000000000000 --- a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nss-myhostname-0.3/netlink.c 2011-05-09 08:56:34.344579140 -0400 -+++ nss-myhostname-0.3-new/netlink.c 2012-10-06 23:52:10.577755588 -0400 -@@ -179,6 +179,10 @@ - ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) - continue; - -+ if (ifaddrmsg->ifa_family == AF_INET6 && -+ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) -+ continue; -+ - if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) - continue; - diff --git a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch deleted file mode 100644 index a2947461c87d..000000000000 --- a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- nss-myhostname-0.3/nss-myhostname.c 2011-05-09 09:01:27.421581560 -0400 -+++ nss-myhostname-0.3-new/nss-myhostname.c 2012-10-06 23:40:09.836894004 -0400 -@@ -177,7 +177,11 @@ - /* Verify the size matches */ - assert(idx == ms); - -- *pat = r_tuple_prev; -+ /* Nscd expects us to store the first record in **pat. */ -+ if (*pat) -+ **pat = *r_tuple_prev; -+ else -+ *pat = r_tuple_prev; - - if (ttlp) - *ttlp = 0; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575e903e87c9..3a479e318bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1210,8 +1210,6 @@ let inherit (pythonPackages) pysqlite; }; - nss_myhostname = callPackage ../tools/networking/nss-myhostname {}; - nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; From ff95e66e963df5b437be118e4abbae17217d9c64 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 15:16:13 -0500 Subject: [PATCH 030/248] Add foreman rubygem --- .../interpreters/ruby/generated.nix | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 7c0afdffda43..bb8d4a22282a 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -21,6 +21,7 @@ g: # Get dependencies from patched gems erubis = g.erubis_2_7_0; fakes3 = g.fakes3_0_1_5; ffi = g.ffi_1_3_1; + foreman = g.foreman_0_61_0; highline = g.highline_1_6_2; hike = g.hike_1_2_1; hoe = g.hoe_3_1_0; @@ -30,7 +31,7 @@ g: # Get dependencies from patched gems json = g.json_1_7_6; json_pure = g.json_pure_1_7_6; mail = g.mail_2_4_4; - mime_types = g.mime_types_1_19; + mime_types = g.mime_types_1_20_1; minitar = g.minitar_0_5_3; multi_json = g.multi_json_1_5_0; net_sftp = g.net_sftp_2_0_5; @@ -63,7 +64,7 @@ g: # Get dependencies from patched gems websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { ZenTest_4_8_4 = { basename = ''ZenTest''; @@ -369,6 +370,17 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb''; }; + foreman_0_61_0 = { + basename = ''foreman''; + meta = { + description = ''Process manager for applications with multiple components''; + homepage = ''http://github.com/ddollar/foreman''; + longDescription = ''Process manager for applications with multiple components''; + }; + name = ''foreman-0.61.0''; + requiredGems = [ ]; + sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z''; + }; highline_1_6_2 = { basename = ''highline''; meta = { @@ -489,28 +501,40 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_19 g.treetop_1_4_12 ]; + requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; - mime_types_1_19 = { + mime_types_1_20_1 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.19 with new MIME types. The identification of MIME +type. This is release 1.20.1 with new MIME types. The identification of MIME content type is based on a file's filename extensions. +MIME types are used in MIME-compliant communications, as in e-mail or +HTTP traffic, to indicate the type of content which is transmitted. +MIME::Types provides the ability for detailed information about MIME +entities (provided as a set of MIME::Type objects) to be determined and +used programmatically. There are many types defined by RFCs and vendors, +so the list is long but not complete; don't hesitate to ask to add +additional information. This library follows the IANA collection of MIME +types (see below for reference). + MIME::Types for Ruby was originally based on and synchronized with MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen. -:include: Licence.rdoc''; +MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It +follows the official {IANA registry}[http://www.iana.org/assignments/media-types/] +({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types +added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].''; }; - name = ''mime-types-1.19''; + name = ''mime-types-1.20.1''; requiredGems = [ ]; - sha256 = ''1b44lrzk9v6i0jyajkx106qjyg8ns7siw1k42hmmwqj574ffsn26''; + sha256 = ''13l7avr24nwzk0xpyqh04iqpf58vqsb3bbqjmjr04bsryq8azlb0''; }; minitar_0_5_3 = { basename = ''minitar''; From e08ab1ebe505b79c30c7de484e32a94019cb6466 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 15:50:36 -0500 Subject: [PATCH 031/248] Add sinatra-1.3.2 rubygem --- .../interpreters/ruby/generated.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index bb8d4a22282a..7d6d8f005db5 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -40,6 +40,7 @@ g: # Get dependencies from patched gems polyglot = g.polyglot_0_3_3; rack = g.rack_1_5_1; rack_cache = g.rack_cache_1_2; + rack_protection = g.rack_protection_1_3_2; rack_ssl = g.rack_ssl_1_3_3; rack_test = g.rack_test_0_6_2; rails = g.rails_3_2_11; @@ -56,6 +57,7 @@ g: # Get dependencies from patched gems rubyzip = g.rubyzip_0_9_9; sass = g.sass_3_2_5; selenium_webdriver = g.selenium_webdriver_2_29_0; + sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_2_2; thor = g.thor_0_17_0; tilt = g.tilt_1_3_3; @@ -64,7 +66,7 @@ g: # Get dependencies from patched gems websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ]; gems = { ZenTest_4_8_4 = { basename = ''ZenTest''; @@ -663,6 +665,17 @@ Also see http://rack.github.com/. requiredGems = [ g.rack_1_5_1 ]; sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; }; + rack_protection_1_3_2 = { + basename = ''rack_protection''; + meta = { + description = ''You should use protection!''; + homepage = ''http://github.com/rkh/rack-protection''; + longDescription = ''You should use protection!''; + }; + name = ''rack-protection-1.3.2''; + requiredGems = [ ]; + sha256 = ''0f69d491xciq1hb3mm26nxnsb3pvlf3gdkggj4ryiphimsy05n0k''; + }; rack_ssl_1_3_3 = { basename = ''rack_ssl''; meta = { @@ -892,6 +905,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.childprocess_0_3_7 g.websocket_1_0_7 ]; sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; + sinatra_1_3_2 = { + basename = ''sinatra''; + meta = { + description = ''Classy web-development dressed in a DSL''; + homepage = ''http://www.sinatrarb.com/''; + longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; + }; + name = ''sinatra-1.3.2''; + requiredGems = [ g.rack_protection_1_3_2 ]; + sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; + }; sprockets_2_2_2 = { basename = ''sprockets''; meta = { From 064638b0fd365360e8a3670bbcf8fc195c7d4c7e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 15:51:25 -0500 Subject: [PATCH 032/248] Add uuid rubygem --- .../interpreters/ruby/generated.nix | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 7d6d8f005db5..67a37e54d41d 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -30,6 +30,7 @@ g: # Get dependencies from patched gems jruby_pageant = g.jruby_pageant_1_1_1; json = g.json_1_7_6; json_pure = g.json_pure_1_7_6; + macaddr = g.macaddr_1_6_1; mail = g.mail_2_4_4; mime_types = g.mime_types_1_20_1; minitar = g.minitar_0_5_3; @@ -59,14 +60,16 @@ g: # Get dependencies from patched gems selenium_webdriver = g.selenium_webdriver_2_29_0; sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_2_2; + systemu = g.systemu_2_5_2; thor = g.thor_0_17_0; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_12; tzinfo = g.tzinfo_0_3_35; + uuid = g.uuid_2_3_6; websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''uuid'' ]; gems = { ZenTest_4_8_4 = { basename = ''ZenTest''; @@ -495,6 +498,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00''; }; + macaddr_1_6_1 = { + basename = ''macaddr''; + meta = { + description = ''macaddr''; + homepage = ''https://github.com/ahoward/macaddr''; + longDescription = ''description: macaddr kicks the ass''; + }; + name = ''macaddr-1.6.1''; + requiredGems = [ g.systemu_2_5_2 ]; + sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch''; + }; mail_2_4_4 = { basename = ''mail''; meta = { @@ -927,6 +941,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; + systemu_2_5_2 = { + basename = ''systemu''; + meta = { + description = ''systemu''; + homepage = ''https://github.com/ahoward/systemu''; + longDescription = ''description: systemu kicks the ass''; + }; + name = ''systemu-2.5.2''; + requiredGems = [ ]; + sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; + }; thor_0_17_0 = { basename = ''thor''; meta = { @@ -970,6 +995,19 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp''; }; + uuid_2_3_6 = { + basename = ''uuid''; + meta = { + description = ''UUID generator''; + homepage = ''http://github.com/assaf/uuid''; + longDescription = ''UUID generator for producing universally unique identifiers based on RFC 4122 +(http://www.ietf.org/rfc/rfc4122.txt). +''; + }; + name = ''uuid-2.3.6''; + requiredGems = [ g.macaddr_1_6_1 ]; + sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8''; + }; websocket_1_0_7 = { basename = ''websocket''; meta = { From af847fd8cec40e171803a9309980277b73256d0f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 15:52:40 -0500 Subject: [PATCH 033/248] Add aws-sdk gem --- .../interpreters/ruby/generated.nix | 45 ++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 67a37e54d41d..f21458c2a663 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -13,6 +13,7 @@ g: # Get dependencies from patched gems arel = g.arel_3_0_2; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; + aws_sdk = g.aws_sdk_1_8_1_2; builder = g.builder_3_1_4; buildr = g.buildr_1_4_9; bundler = g.bundler_1_2_3; @@ -38,6 +39,7 @@ g: # Get dependencies from patched gems net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_3; nix = g.nix_0_1_1; + nokogiri = g.nokogiri_1_5_6; polyglot = g.polyglot_0_3_3; rack = g.rack_1_5_1; rack_cache = g.rack_cache_1_2; @@ -66,10 +68,11 @@ g: # Get dependencies from patched gems treetop = g.treetop_1_4_12; tzinfo = g.tzinfo_0_3_35; uuid = g.uuid_2_3_6; + uuidtools = g.uuidtools_2_1_3; websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''uuid'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''uuid'' ]; gems = { ZenTest_4_8_4 = { basename = ''ZenTest''; @@ -220,6 +223,17 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_8_4 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; + aws_sdk_1_8_1_2 = { + basename = ''aws_sdk''; + meta = { + description = ''AWS SDK for Ruby''; + homepage = ''http://aws.amazon.com/sdkforruby''; + longDescription = ''AWS SDK for Ruby''; + }; + name = ''aws-sdk-1.8.1.2''; + requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_6 ]; + sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x''; + }; builder_3_0_4 = { basename = ''builder''; meta = { @@ -618,6 +632,21 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; + nokogiri_1_5_6 = { + basename = ''nokogiri''; + meta = { + description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; + homepage = ''http://nokogiri.org''; + longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser. Among Nokogiri's +many features is the ability to search documents via XPath or CSS3 selectors. + +XML is like violence - if it doesn’t solve your problems, you are not using +enough of it.''; + }; + name = ''nokogiri-1.5.6''; + requiredGems = [ ]; + sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8''; + }; polyglot_0_3_3 = { basename = ''polyglot''; meta = { @@ -794,7 +823,7 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ g.json_1_7_6 ]; + requiredGems = [ ]; sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; rjb_1_4_2 = { @@ -1008,6 +1037,18 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.macaddr_1_6_1 ]; sha256 = ''194xznnxncfgr0nx84l11gnafvkfzr1nj1swnwas75q0ld0ri2l8''; }; + uuidtools_2_1_3 = { + basename = ''uuidtools''; + meta = { + description = ''UUID generator''; + homepage = ''http://uuidtools.rubyforge.org/''; + longDescription = ''A simple universally unique ID generation library. +''; + }; + name = ''uuidtools-2.1.3''; + requiredGems = [ ]; + sha256 = ''0v8scs7760334kkwca7n8kah6nk4hyw7izgk014zg1l1yv7kzpi9''; + }; websocket_1_0_7 = { basename = ''websocket''; meta = { From 76cc4e760b35b1836c281494e463dedccefd42fa Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 15:53:09 -0500 Subject: [PATCH 034/248] Add thin rubygem --- .../interpreters/ruby/generated.nix | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index f21458c2a663..6d0356c14e5b 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -18,8 +18,10 @@ g: # Get dependencies from patched gems buildr = g.buildr_1_4_9; bundler = g.bundler_1_2_3; childprocess = g.childprocess_0_3_7; + daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; + eventmachine = g.eventmachine_1_0_0; fakes3 = g.fakes3_0_1_5; ffi = g.ffi_1_3_1; foreman = g.foreman_0_61_0; @@ -63,6 +65,7 @@ g: # Get dependencies from patched gems sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_2_2; systemu = g.systemu_2_5_2; + thin = g.thin_1_5_0; thor = g.thor_0_17_0; tilt = g.tilt_1_3_3; treetop = g.treetop_1_4_12; @@ -72,7 +75,7 @@ g: # Get dependencies from patched gems websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''uuid'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; gems = { ZenTest_4_8_4 = { basename = ''ZenTest''; @@ -320,6 +323,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.ffi_1_3_1 ]; sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84''; }; + daemons_1_1_9 = { + basename = ''daemons''; + meta = { + description = ''A toolkit to create and control daemons in different ways''; + homepage = ''http://daemons.rubyforge.org''; + longDescription = ''Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) to be run as a daemon and to be controlled by simple start/stop/restart commands. You can also call blocks as daemons and control them from the parent or just daemonize the current process. Besides this basic functionality, daemons offers many advanced features like exception backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash.''; + }; + name = ''daemons-1.1.9''; + requiredGems = [ ]; + sha256 = ''1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy''; + }; diff_lcs_1_1_3 = { basename = ''diff_lcs''; meta = { @@ -368,6 +382,26 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + eventmachine_1_0_0 = { + basename = ''eventmachine''; + meta = { + description = ''Ruby/EventMachine library''; + homepage = ''http://rubyeventmachine.com''; + longDescription = ''EventMachine implements a fast, single-threaded engine for arbitrary network +communications. It's extremely easy to use in Ruby. EventMachine wraps all +interactions with IP sockets, allowing programs to concentrate on the +implementation of network protocols. It can be used to create both network +servers and clients. To create a server or client, a Ruby program only needs +to specify the IP address and port, and provide a Module that implements the +communications protocol. Implementations of several standard network protocols +are provided with the package, primarily to serve as examples. The real goal +of EventMachine is to enable programs to easily interface with other programs +using TCP/IP, especially if custom protocols are required.''; + }; + name = ''eventmachine-1.0.0''; + requiredGems = [ ]; + sha256 = ''1qshsikskkfbbhai9s0qhmnpa326m83k9yzivwvkl2dc1ffpk2pz''; + }; fakes3_0_1_5 = { basename = ''fakes3''; meta = { @@ -981,6 +1015,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; + thin_1_5_0 = { + basename = ''thin''; + meta = { + description = ''A thin and fast web server''; + homepage = ''http://code.macournoyer.com/thin/''; + longDescription = ''A thin and fast web server''; + }; + name = ''thin-1.5.0''; + requiredGems = [ g.eventmachine_1_0_0 g.daemons_1_1_9 ]; + sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1''; + }; thor_0_17_0 = { basename = ''thor''; meta = { From b839dcbd161419db5ee5921da3a10c124758c013 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 5 Feb 2013 11:36:18 +0800 Subject: [PATCH 035/248] add swfmill-0.3.2 --- pkgs/tools/video/swfmill/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/video/swfmill/default.nix diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix new file mode 100644 index 000000000000..b48cc7cddcca --- /dev/null +++ b/pkgs/tools/video/swfmill/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl +, pkgconfig, libxslt, freetype, libpng, libxml2 +}: + +stdenv.mkDerivation rec { + name = "swfmill-0.3.2"; + + src = fetchurl { + url = "http://swfmill.org/releases/${name}.tar.gz"; + sha256 = "077agf62q0xz95dxj4cq9avcqwin94vldrpb80iqwjskvkwpz9gy"; + }; + + buildInputs = [ pkgconfig libxslt freetype libpng libxml2 ]; + + meta = { + description = "An xml2swf and swf2xml processor with import functionalities"; + homepage = "http://swfmill.org"; + license = "GPLv2"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a479e318bca..fc3a624c36d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3324,6 +3324,8 @@ let swigWithJava = swig; + swfmill = callPackage ../tools/video/swfmill { }; + swftools = callPackage ../tools/video/swftools { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; From a2ba6d5bdd9d2869f0ac30918016b956c45740dc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 5 Feb 2013 11:24:00 +0400 Subject: [PATCH 036/248] Julia: update/fix --- pkgs/development/compilers/julia/default.nix | 26 ++++++-------- pkgs/development/libraries/pcre/8.31.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++- 3 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/pcre/8.31.nix diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a4503911b92c..7fa12d495aa6 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack - , tcl, tk, xproto, libX11 + , tcl, tk, xproto, libX11, git } : let realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; - date = "20121209"; + date = "20130205"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { clp_ver = "1.14.5"; lighttpd_ver = "1.4.29"; patchelf_ver = "0.6"; + pcre_ver = "8.31"; grisu_src = fetchurl { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; @@ -57,16 +58,20 @@ stdenv.mkDerivation rec { url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; }; + pcre_src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; + sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + }; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9"; - sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb"; + rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3"; + sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf - openblas liblapack tcl tk xproto libX11 + openblas liblapack tcl tk xproto libX11 git ]; configurePhase = '' @@ -79,7 +84,7 @@ stdenv.mkDerivation rec { cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do copy_kill_hash "$i" deps done copy_kill_hash "${dsfmt_src}" deps/random @@ -105,18 +110,9 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p usr/lib - ln -s libuv.a usr/lib/uv.a ''; preInstall = '' - make -C deps install-tk-wrapper - ''; - - postInstall = '' - ( - cd $out/share/julia/test/ - $out/bin/julia runtests.jl all - ) || true ''; meta = { diff --git a/pkgs/development/libraries/pcre/8.31.nix b/pkgs/development/libraries/pcre/8.31.nix new file mode 100644 index 000000000000..41315d9bb5d8 --- /dev/null +++ b/pkgs/development/libraries/pcre/8.31.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: + +stdenv.mkDerivation rec { + name = "pcre-8.31"; + + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + }; + + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. + configureFlags = '' + ${if unicodeSupport then "--enable-unicode-properties" else ""} + ${if !cplusplusSupport then "--disable-cpp" else ""} + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + + doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin + + meta = { + homepage = "http://www.pcre.org/"; + description = "A library for Perl Compatible Regular Expressions"; + license = "BSD-3"; + + longDescription = '' + The PCRE library is a set of functions that implement regular + expression pattern matching using the same syntax and semantics as + Perl 5. PCRE has its own native API, as well as a set of wrapper + functions that correspond to the POSIX regular expression API. The + PCRE library is free, even for building proprietary software. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a479e318bca..32c611582bd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2483,7 +2483,7 @@ let jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { - pcre = pcre_8_30; + pcre = pcre_8_31; liblapack = liblapack.override {shared = true;}; fftw = fftw.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; @@ -4775,6 +4775,10 @@ let unicodeSupport = config.pcre.unicode or true; }; + pcre_8_31 = callPackage ../development/libraries/pcre/8.31.nix { + unicodeSupport = config.pcre.unicode or true; + }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; From 09ee51c442da5dc40c0e8bbfb4bf66489923fca2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 5 Feb 2013 17:21:41 +0400 Subject: [PATCH 037/248] Fixing xlaunch for systemd branch --- pkgs/tools/X11/xlaunch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index 0bc33bcb7fa1..3cab25837e6c 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -45,7 +45,7 @@ EOF else RESET_OPTION=\"-noreset\" fi; - XCMD=\"\$(egrep \"^env\" /etc/init/xserver.conf | sed -e \"s/env/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" echo \"\$XCMD\" echo \"\$XCMD\" | bash & while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done From d10679eed417d799bd36b438433684c29ad1d4df Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 5 Feb 2013 16:04:09 +0100 Subject: [PATCH 038/248] Added gcovr 2.4 --- pkgs/top-level/python-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd362587cc14..92cd1965877d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1005,6 +1005,20 @@ pythonPackages = python.modules // rec { }; }); + gcovr = buildPythonPackage rec { + name = "gcovr-2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/gcovr/${name}.tar.gz"; + md5 = "672db629469882b93c40016aebff50ac"; + }; + + meta = { + description = "A Python script for summarizing gcov data"; + license = "BSD"; + }; + }; + genshi = buildPythonPackage { name = "genshi-0.6"; From 07c64a7a6c966744306cdac15171dac72e43cb40 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 5 Feb 2013 18:15:58 +0100 Subject: [PATCH 039/248] virtinst: could not find python modules, add python wrapper --- pkgs/applications/virtualization/virtinst/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 2bb2adaa00ac..26b16375e659 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python + libvirt libxml2Python urlgrabber ]; buildInputs = @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { buildPhase = "python setup.py build"; installPhase = - '' + '' python setup.py install --prefix="$out"; + wrapPythonPrograms ''; meta = { From 906be2ea985823631159675b10d3b41e4bfea453 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 22 Jan 2013 21:19:37 +0100 Subject: [PATCH 040/248] python-linkme-wrapper: optimize some escaping --- .../interpreters/python/python-linkme-wrapper.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh index e6307d81ed44..606bb76d401a 100644 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.sh +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.sh @@ -14,13 +14,12 @@ PROG=$(basename "$0") SITES= pypath() { - BIN=$(dirname "$1") - BIN=$(realpath -s "$BIN") + BIN=$(realpath -s "$(dirname "$BIN")") ENV=$(dirname "$BIN") SITE="$ENV/lib/python2.7/site-packages" SITES="$SITES${SITES:+:}$SITE" - PRG=$BIN/$(readlink "$1") + PRG="$BIN"/$(readlink "$1") if test -L "$PRG"; then pypath "$PRG" @@ -31,4 +30,4 @@ pypath $(realpath -s "$0") export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES" -exec $BIN/$PROG "$@" +exec "$BIN/$PROG" "$@" From d6f5d3c9a8f0c4c6dd7a65a7c661c3bb6eafc4b7 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 5 Feb 2013 20:34:49 +0100 Subject: [PATCH 041/248] pydb: mirror://sourceforge.net/ is no longer valid --- pkgs/development/tools/pydb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 7aa2d57955fd..23f0dea44535 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pydb-1.26"; src = fetchurl { - url = "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2"; + url = "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2"; sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; From 6cc91771a8d1329b495f0e9825e01180a3c6780b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 5 Feb 2013 19:08:04 -0500 Subject: [PATCH 042/248] Mark ruby gems as such --- pkgs/development/interpreters/ruby/gem.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 124c7cd747f5..b4ddd26bb46b 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -44,6 +44,8 @@ let propagatedUserEnvPkgs = requiredGems; + passthru.isRubyGem = true; + }; mb = stdenv.lib.maybeAttr; patchedGem = a: stdenv.mkDerivation (removeAttrs (stdenv.lib.mergeAttrsByFuncDefaults From 0dbef6991d2bb501679226de8be1450081491dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 6 Feb 2013 00:35:17 +0100 Subject: [PATCH 043/248] #283: Patch buildout to be useful in a nix profile --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92cd1965877d..d3925458ad5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -398,6 +398,12 @@ pythonPackages = python.modules // rec { md5 = "4e3b521600e475c56a0a66459a5fc7bb"; }; + # TODO: consider if this patch should be an option + # It makes buildout useful in a nix profile, but this alters the default functionality + patchPhase = '' + sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py + ''; + meta = { homepage = http://www.buildout.org/; description = "A software build and configuration system"; From c43891e32e8e86e81e5351b2775b27ee141ac9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 6 Feb 2013 00:54:17 +0100 Subject: [PATCH 044/248] lxml: upgrade from 2.2.2 to 3.0.2 --- 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 d3925458ad5d..cb2b301fa060 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1322,11 +1322,11 @@ pythonPackages = python.modules // rec { }; lxml = buildPythonPackage ( rec { - name = "lxml-2.2.2"; + name = "lxml-3.0.2"; src = fetchurl { - url = http://pypi.python.org/packages/source/l/lxml/lxml-2.2.2.tar.gz; - sha256 = "0zjpsy67wcs69qhb06ficl3a5z229hmczpr8h84rkk05vaagj8qv"; + url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz"; + md5 = "38b15b0dd5e9292cf98be800e84a3ce4"; }; buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; From cb4c42e9c39952f4187bfafcb4996285419f9c48 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 5 Feb 2013 11:59:26 +0100 Subject: [PATCH 045/248] gnumeric: Update to 1.12.0 Also update dependencies (goffice, libgsf) to required versions. --- pkgs/applications/office/gnumeric/default.nix | 8 +- .../libraries/goffice/{0.9.nix => 0.10.nix} | 6 +- pkgs/development/libraries/libgsf/default.nix | 6 +- .../libraries/libgsf/syscall-name-clash.patch | 120 ------------------ pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 11 insertions(+), 133 deletions(-) rename pkgs/development/libraries/goffice/{0.9.nix => 0.10.nix} (82%) delete mode 100644 pkgs/development/libraries/libgsf/syscall-name-clash.patch diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 6063024c2160..1bdc41d1fb57 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -3,12 +3,12 @@ , pango, pkgconfig, scrollkeeper, zlib }: -stdenv.mkDerivation { - name = "gnumeric-1.11.3"; +stdenv.mkDerivation rec { + name = "gnumeric-1.12.0"; src = fetchurl { - url = mirror://gnome/sources/gnumeric/1.11/gnumeric-1.11.3.tar.xz; - sha256 = "1hblcbba4qzlby094dih6ncclgf2n5ac59lqg9dykpz8ad3hxw72"; + url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; + sha256 = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"; }; configureFlags = "--disable-component"; diff --git a/pkgs/development/libraries/goffice/0.9.nix b/pkgs/development/libraries/goffice/0.10.nix similarity index 82% rename from pkgs/development/libraries/goffice/0.9.nix rename to pkgs/development/libraries/goffice/0.10.nix index 23b65b1c712c..793704be255c 100644 --- a/pkgs/development/libraries/goffice/0.9.nix +++ b/pkgs/development/libraries/goffice/0.10.nix @@ -3,11 +3,11 @@ , cairo, gconf, libgnomeui }: stdenv.mkDerivation rec { - name = "goffice-0.9.3"; + name = "goffice-0.10.0"; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.9/${name}.tar.xz"; - sha256 = "0l9achvmbmhn2p5qd0nl7vxn5c3nf1ndzlyknczzyiaa6d5zj91h"; + url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; + sha256 = "7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0acd4a77b46d..4264890fd956 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n && glib != null; stdenv.mkDerivation rec { - name = "libgsf-1.14.23"; + name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; + sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; }; buildNativeInputs = [ intltool pkgconfig ]; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ ./syscall-name-clash.patch ]; - meta = { homepage = http://www.gnome.org/projects/libgsf; license = "LGPLv2"; diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch deleted file mode 100644 index 01543ade4fdd..000000000000 --- a/pkgs/development/libraries/libgsf/syscall-name-clash.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c ---- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400 -@@ -34,7 +34,7 @@ - static void clone_dir (GsfInfile *in, GsfOutfile *out); - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - if (gsf_input_size (input) > 0) { - guint8 const *data; -@@ -87,7 +87,7 @@ - gsf_infile_name_by_index (in, i), - is_dir); - -- clone (new_input, new_output); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output); - } - /* An observation: when you think about the explanation to is_dir - * above, you realize that clone_dir is called even for regular files. -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c ---- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400 -+++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInfile *in, GsfOutfile *out) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out) - { - GsfInput *input = GSF_INPUT (in); - GsfOutput *output = GSF_OUTPUT (out); -@@ -85,7 +85,7 @@ - output = gsf_outfile_new_child_full (out, name, is_dir, - "compression-level", level, - NULL); -- clone (GSF_INFILE (input), GSF_OUTFILE (output)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output)); - } - } - gsf_output_close (GSF_OUTPUT (out)); -@@ -137,7 +137,7 @@ - - outfile = gsf_outfile_zip_new (output, &err); - g_object_unref (G_OBJECT (output)); -- clone (infile, outfile); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c ---- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -118,7 +118,7 @@ - g_error_free (err); - return 1; - } -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } -diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c ---- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500 -+++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400 -@@ -32,7 +32,7 @@ - #include - - static void --clone (GsfInput *input, GsfOutput *output) -+clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) - { - guint8 const *data; - size_t len; -@@ -72,7 +72,7 @@ - dst = gsf_outfile_new_child (out, - gsf_infile_name_by_index (in, i), - is_dir); -- clone (src, dst); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); - } - } - -@@ -111,7 +111,7 @@ - - outfile = gsf_outfile_msole_new (output); - g_object_unref (G_OBJECT (output)); -- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); -+ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); - - return 0; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0c59f18833..9ee90a1feb6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3852,7 +3852,7 @@ let libart = gnome.libart_lgpl; }; - goffice_0_9 = callPackage ../development/libraries/goffice/0.9.nix { + goffice_0_10 = callPackage ../development/libraries/goffice/0.10.nix { inherit (gnome) libglade libgnomeui; gconf = gnome.GConf; libart = gnome.libart_lgpl; @@ -7197,7 +7197,7 @@ let }; gnumeric = callPackage ../applications/office/gnumeric { - goffice = goffice_0_9; + goffice = goffice_0_10; inherit (gnome) libglade scrollkeeper; }; From b3cfae1acf3a63b6673014b18cd6614c704fafb1 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 5 Feb 2013 12:00:57 +0100 Subject: [PATCH 046/248] darktable: Update to 1.1.2 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 801fdeeaaae5..9791efe5d822 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "0k1m7nd42yn4c2jr1ps1g96fqk9pq20cxjp7dmlza61pj2j9nads"; + sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765"; }; buildInputs = From e44f4ef3ce5ee243a3339a913ab28e9feeb01b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 6 Feb 2013 00:49:31 +0100 Subject: [PATCH 047/248] #283 add a set of Plone packages, a popular Python CMS This set of packages for Plone was generated using cillianderoiste/python2nix, which is forked from garbase/python2nix. It uses ```buildout annotate``` to dump a set of packages and their versions based on an installed Plone instance and then looks up these packages on pypi, gets the relevant download url and sets some (minimal) buildInputs where required. The packages are not ready to be used on their own yet, since they lack complete dependencies. In the future we can move complete package expressions into a better location so that they can be re-used. The packages are also lacking metadata. They are all available under Free licenses (mostly Zope Public License, GPL or BSD), but the script does not yet fill that information in. It should be pretty easy to get hold of it, plus the short description and home page from pypi, this will be added to the script in the future so that the license information is accurate. --- pkgs/development/web/plone/default.nix | 10151 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 2 files changed, 10156 insertions(+) create mode 100644 pkgs/development/web/plone/default.nix diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/default.nix new file mode 100644 index 000000000000..b53254d29686 --- /dev/null +++ b/pkgs/development/web/plone/default.nix @@ -0,0 +1,10151 @@ + +{ pkgs, python, buildPythonPackage }: + +let plone42Packages = python.modules // rec { + inherit python; + inherit (pkgs) fetchurl stdenv; + + + + accesscontrol = buildPythonPackage rec { + name = "AccessControl-2.13.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/A/AccessControl/${name}.zip"; + md5 = "7e622d99fb17914b4708d26f245cb696"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + acquisition = buildPythonPackage rec { + name = "Acquisition-2.13.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/A/Acquisition/${name}.zip"; + md5 = "8c33160c157b50649e2b2b3224622579"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_kss = buildPythonPackage rec { + name = "archetypes.kss-1.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.kss/${name}.zip"; + md5 = "a8502140123b74f1b7ed4f36d3e56ff3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_querywidget = buildPythonPackage rec { + name = "archetypes.querywidget-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/${name}.zip"; + md5 = "cbe134f2806191fd35066bbb7c85bfcc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_referencebrowserwidget = buildPythonPackage rec { + name = "archetypes.referencebrowserwidget-2.4.16"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/${name}.zip"; + md5 = "7dd3b0d4e188828701a291449c7495f4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + archetypes_schemaextender = buildPythonPackage rec { + name = "archetypes.schemaextender-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/${name}.zip"; + md5 = "865aa5b4b6b26e3bb650d89ddfe77c87"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + argparse = buildPythonPackage rec { + name = "argparse-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; + md5 = "087399b73047fa5a6482037411ddc968"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + borg_localrole = buildPythonPackage rec { + name = "borg.localrole-3.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/borg.localrole/${name}.zip"; + md5 = "04082694dfda9ae5cda62747b8ac7ccf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + buildout_dumppickedversions = buildPythonPackage rec { + name = "buildout.dumppickedversions-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/buildout.dumppickedversions/${name}.tar.gz"; + md5 = "e81cffff329aaaaf8dd0d1c6bd63c8b0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + clientform = buildPythonPackage rec { + name = "ClientForm-0.2.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/C/ClientForm/${name}.zip"; + md5 = "33826886848f89c67a5c8a30b931bd97"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_monkeypatcher = buildPythonPackage rec { + name = "collective.monkeypatcher-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/${name}.zip"; + md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_recipe_omelette = buildPythonPackage rec { + name = "collective.recipe.omelette-0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.recipe.omelette/${name}.zip"; + md5 = "088bcf60754bead215573ce114207939"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_testcaselayer = buildPythonPackage rec { + name = "collective.testcaselayer-1.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.testcaselayer/${name}.zip"; + md5 = "fd8387d6b6ebd8645ec92f5f1e512450"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_xmltestreport = buildPythonPackage rec { + name = "collective.xmltestreport-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.xmltestreport/${name}.tar.gz"; + md5 = "f247d47a019b44694660d785f70c05b3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datagridfield = buildPythonPackage rec { + name = "collective.z3cform.datagridfield-0.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/${name}.zip"; + md5 = "c9210337b91305314864da42c12d04c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datagridfield_demo = buildPythonPackage rec { + name = "collective.z3cform.datagridfield-demo-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/collective.z3cform.datagridfield-0.11.zip"; + md5 = "c9210337b91305314864da42c12d04c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + collective_z3cform_datetimewidget = buildPythonPackage rec { + name = "collective.z3cform.datetimewidget-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/${name}.zip"; + md5 = "89daf27c7f0f235f9c001f0ee50d76e5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + coverage = buildPythonPackage rec { + name = "coverage-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; + md5 = "28c43d41b13f8987ea14d7b1d4a4e3ec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + datetime = buildPythonPackage rec { + name = "DateTime-2.12.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/DateTime/${name}.zip"; + md5 = "72a8bcf80b52211ae7fdfe36c693d70c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + diazo = buildPythonPackage rec { + name = "diazo-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/diazo/${name}.zip"; + md5 = "d3c2b017af521db4c86fb360c86e0bc8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + documenttemplate = buildPythonPackage rec { + name = "DocumentTemplate-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/DocumentTemplate/${name}.zip"; + md5 = "07bb086c77c1dfe94125ad2efbba94b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + docutils = buildPythonPackage rec { + name = "docutils-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/docutils/${name}.1.tar.gz"; + md5 = "b0d5cd5298fedf9c62f5fd364a274d56"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + elementtree = buildPythonPackage rec { + name = "elementtree-1.2.7-20070827-preview"; + + src = fetchurl { + url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip"; + md5 = "30e2fe5edd143f347e03a8baf5d60f8a"; + }; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + experimental_cssselect = buildPythonPackage rec { + name = "experimental.cssselect-0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/experimental.cssselect/${name}.zip"; + md5 = "3fecdcf1fbc3ea6025e115a56a262957"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + extensionclass = buildPythonPackage rec { + name = "ExtensionClass-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/E/ExtensionClass/${name}.zip"; + md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + feedparser = buildPythonPackage rec { + name = "feedparser-5.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.bz2"; + md5 = "702835de74bd4a578524f311e62c2877"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_customerize = buildPythonPackage rec { + name = "five.customerize-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.customerize/${name}.zip"; + md5 = "32f597c2fa961f7dcc84b23e655d928e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_formlib = buildPythonPackage rec { + name = "five.formlib-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.formlib/${name}.zip"; + md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_globalrequest = buildPythonPackage rec { + name = "five.globalrequest-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.globalrequest/${name}.tar.gz"; + md5 = "87f8996bd21d4aa156aa26e7d21b8744"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_grok = buildPythonPackage rec { + name = "five.grok-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.grok/${name}.zip"; + md5 = "b99c3017f3a487dc2a8b7b0b310ee8cf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_intid = buildPythonPackage rec { + name = "five.intid-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.intid/${name}.zip"; + md5 = "60c6726c07a1c1bf557aeec0ddcee369"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + five_localsitemanager = buildPythonPackage rec { + name = "five.localsitemanager-2.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/five.localsitemanager/${name}.zip"; + md5 = "5e3a658e6068832bd802018ebc83f2d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_annotation = buildPythonPackage rec { + name = "grokcore.annotation-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.annotation/${name}.tar.gz"; + md5 = "a28ccb4b7c86198923d9cce40953314f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_component = buildPythonPackage rec { + name = "grokcore.component-1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.component/${name}.tar.gz"; + md5 = "24b05b6b132787dbca18acd244c23ffb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_formlib = buildPythonPackage rec { + name = "grokcore.formlib-1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.formlib/${name}.tar.gz"; + md5 = "dced4aba77053ed78a358a1f5e85d9c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_security = buildPythonPackage rec { + name = "grokcore.security-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.security/${name}.tar.gz"; + md5 = "1e668b7e423814fa069c69f2a4014876"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_site = buildPythonPackage rec { + name = "grokcore.site-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.site/${name}.tar.gz"; + md5 = "bd16753e6d4f1c0ff38266d2ae79633d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_view = buildPythonPackage rec { + name = "grokcore.view-1.13.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.view/${name}.tar.gz"; + md5 = "304363398aa752d5e1479bab39b93e4e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + grokcore_viewlet = buildPythonPackage rec { + name = "grokcore.viewlet-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/g/grokcore.viewlet/${name}.tar.gz"; + md5 = "5e53b3c77941f9ad0ff2aeb7c1b6dd7d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + initgroups = buildPythonPackage rec { + name = "initgroups-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/initgroups/${name}.zip"; + md5 = "38e842dcab8445f65e701fec75213acd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + jinja2 = buildPythonPackage rec { + name = "Jinja2-2.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz"; + md5 = "83b20c1eeb31f49d8e6392efae91b7d5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + kss_core = buildPythonPackage rec { + name = "kss.core-1.6.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/k/kss.core/${name}.zip"; + md5 = "87e66e78c3bbd7af3ecce5b2fef935ae"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mailinglogger = buildPythonPackage rec { + name = "mailinglogger-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mailinglogger/${name}.tar.gz"; + md5 = "f865f0df6059ce23062b7457d01dbac5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + manuel = buildPythonPackage rec { + name = "manuel-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; + md5 = "8cd560cf6e8720ecb129c4e5be605fbb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + markdown = buildPythonPackage rec { + name = "Markdown-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Markdown/${name}.zip"; + md5 = "122418893e21e91109edbf6e082f830d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + martian = buildPythonPackage rec { + name = "martian-0.11.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/martian/${name}.tar.gz"; + md5 = "865646fcd9dd31613204d5f4c2db943b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mechanize = buildPythonPackage rec { + name = "mechanize-0.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mechanize/${name}.zip"; + md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + missing = buildPythonPackage rec { + name = "Missing-2.13.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Missing/${name}.zip"; + md5 = "9823cff54444cbbcaef8fc45d8e42572"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mocker = buildPythonPackage rec { + name = "mocker-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mocker/${name}.tar.bz2"; + md5 = "0bd9f83268e16aef2130fa89e2a4839f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + mr_developer = buildPythonPackage rec { + name = "mr.developer-1.21"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mr.developer/${name}.zip"; + md5 = "5f832f1709714b09cd7490603afd2365"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + multimapping = buildPythonPackage rec { + name = "MultiMapping-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/MultiMapping/${name}.zip"; + md5 = "d69c5904c105b9f2f085d4103e0f0586"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + nose = buildPythonPackage rec { + name = "nose-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; + md5 = "144f237b615e23f21f6a50b2183aa817"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + nt_svcutils = buildPythonPackage rec { + name = "nt-svcutils-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz"; + md5 = "144f237b615e23f21f6a50b2183aa817"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + ordereddict = buildPythonPackage rec { + name = "ordereddict-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz"; + md5 = "a0ed854ee442051b249bfad0f638bbec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + paste = buildPythonPackage rec { + name = "Paste-1.7.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Paste/${name}.tar.gz"; + md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pastedeploy = buildPythonPackage rec { + name = "PasteDeploy-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/PasteDeploy/${name}.tar.gz"; + md5 = "eb4b3e2543d54401249c2cbd9f2d014f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pastescript = buildPythonPackage rec { + name = "PasteScript-1.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz"; + md5 = "4c72d78dcb6bb993f30536842c16af4d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ paste pastedeploy ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + persistence = buildPythonPackage rec { + name = "Persistence-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Persistence/${name}.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pil = buildPythonPackage rec { + name = "PIL-1.1.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip"; + md5 = "92693648ccdc59c8fc71f7f06b1d228c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone = buildPythonPackage rec { + name = "Plone-4.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Plone/${name}.zip"; + md5 = "688438bd541e7cb2ab650c8c59282b85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_alterego = buildPythonPackage rec { + name = "plone.alterego-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.alterego/${name}.zip"; + md5 = "b7b6dbcbba00505d98d5aba83e016408"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_blob = buildPythonPackage rec { + name = "plone.app.blob-1.5.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.blob/${name}.zip"; + md5 = "8d6ba6f360b6bfd40f87914132339660"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_caching = buildPythonPackage rec { + name = "plone.app.caching-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.caching/${name}.zip"; + md5 = "83a52efeb7604d4c5b4afbc6c1365c6f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_collection = buildPythonPackage rec { + name = "plone.app.collection-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.collection/${name}.zip"; + md5 = "40c9035472e386fc9d0ec1b9a9a3d4f6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_content = buildPythonPackage rec { + name = "plone.app.content-2.0.12"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.content/${name}.zip"; + md5 = "2f14a85fb66d73e0b699b839caaaad26"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentlisting = buildPythonPackage rec { + name = "plone.app.contentlisting-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/${name}.zip"; + md5 = "fa6eb45c4ffd0eb3817ad4813ca24916"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentmenu = buildPythonPackage rec { + name = "plone.app.contentmenu-2.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/${name}.zip"; + md5 = "b1c7e5a37c659ba30b3a077e149b1752"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_contentrules = buildPythonPackage rec { + name = "plone.app.contentrules-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/${name}.zip"; + md5 = "74d2fed9095a7c5f890b6f27de78dafc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_controlpanel = buildPythonPackage rec { + name = "plone.app.controlpanel-2.2.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/${name}.zip"; + md5 = "401c8880865f398c281953f5837108b9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_customerize = buildPythonPackage rec { + name = "plone.app.customerize-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.customerize/${name}.zip"; + md5 = "6a3802c4e8fbd955597adc6a8298febf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_dexterity = buildPythonPackage rec { + name = "plone.app.dexterity-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/${name}.zip"; + md5 = "25ccd382f9e08cfdfe4a9b7e455030bc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_discussion = buildPythonPackage rec { + name = "plone.app.discussion-2.1.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.discussion/${name}.zip"; + md5 = "b0cb1fbdf8a7a238cf5a58fb10c24731"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_folder = buildPythonPackage rec { + name = "plone.app.folder-1.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.folder/${name}.zip"; + md5 = "8ea860daddb4c93c0b7f2b5f7106fef0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_form = buildPythonPackage rec { + name = "plone.app.form-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.form/${name}.zip"; + md5 = "8017f8f782d992825ed71d16b126c4e7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_i18n = buildPythonPackage rec { + name = "plone.app.i18n-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.i18n/${name}.zip"; + md5 = "a10026573463dfc1899bf4062cebdbf2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_imaging = buildPythonPackage rec { + name = "plone.app.imaging-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.imaging/${name}.zip"; + md5 = "8d494cd69b3f6be7fcb9e21c20277765"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_intid = buildPythonPackage rec { + name = "plone.app.intid-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.intid/${name}.tar.gz"; + md5 = "863077002bd272ff11c47de0f7f9db1a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_iterate = buildPythonPackage rec { + name = "plone.app.iterate-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.iterate/${name}.zip"; + md5 = "db598cfc0986737145ddc7e6b70a1794"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_jquery = buildPythonPackage rec { + name = "plone.app.jquery-1.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.jquery/${name}.zip"; + md5 = "a12d56f3dfd2ba6840bf21a6bd860b90"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_jquerytools = buildPythonPackage rec { + name = "plone.app.jquerytools-1.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/${name}.zip"; + md5 = "326470a34e07aa98c40d75ec22484572"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_kss = buildPythonPackage rec { + name = "plone.app.kss-1.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.kss/${name}.zip"; + md5 = "97a35086fecfe25e55b65042eb35e796"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_layout = buildPythonPackage rec { + name = "plone.app.layout-2.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.layout/${name}.zip"; + md5 = "90ea408f5e01aeb01517d55eb6b6063a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_linkintegrity = buildPythonPackage rec { + name = "plone.app.linkintegrity-1.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/${name}.zip"; + md5 = "41810cc85ca05921a329aac5bc4cf403"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_locales = buildPythonPackage rec { + name = "plone.app.locales-4.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.locales/${name}.zip"; + md5 = "baf48a0a5278a18fa1c2848d3470464f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_lockingbehavior = buildPythonPackage rec { + name = "plone.app.lockingbehavior-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.lockingbehavior/${name}.tar.gz"; + md5 = "a25745f1f40c6298da1b228ccd95ee27"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_openid = buildPythonPackage rec { + name = "plone.app.openid-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.openid/${name}.tar.gz"; + md5 = "ae0748f91cab0612a498926d405d8edd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_portlets = buildPythonPackage rec { + name = "plone.app.portlets-2.3.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.portlets/${name}.zip"; + md5 = "534be67a7a17a71ca1e76f6f149ff2ac"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_querystring = buildPythonPackage rec { + name = "plone.app.querystring-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.querystring/${name}.zip"; + md5 = "b501910b23def9b58e8309d1e469eb6f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_redirector = buildPythonPackage rec { + name = "plone.app.redirector-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.redirector/${name}.zip"; + md5 = "7d441340a83b8ed72a03bc16148a5f21"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_referenceablebehavior = buildPythonPackage rec { + name = "plone.app.referenceablebehavior-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.referenceablebehavior/${name}.zip"; + md5 = "2359140966f753204d5091bb49fce85c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_registry = buildPythonPackage rec { + name = "plone.app.registry-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.registry/${name}.zip"; + md5 = "0fdbb01e9ff71108f1be262c39b41b81"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_relationfield = buildPythonPackage rec { + name = "plone.app.relationfield-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.relationfield/${name}.zip"; + md5 = "d19888741677cd457ac7f22dde97ded0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_search = buildPythonPackage rec { + name = "plone.app.search-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.search/${name}.zip"; + md5 = "bd5a1f4b5016a6d0a8697e7a9cc04833"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_stagingbehavior = buildPythonPackage rec { + name = "plone.app.stagingbehavior-0.1b4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.stagingbehavior/${name}.zip"; + md5 = "0f9589ec056c303ea0c81a804dd411eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_testing = buildPythonPackage rec { + name = "plone.app.testing-4.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.testing/${name}.zip"; + md5 = "1a40df72c8beda9520b83dc449a97a3c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_textfield = buildPythonPackage rec { + name = "plone.app.textfield-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.textfield/${name}.zip"; + md5 = "f832887a40826d6f68c48b48f071fb9c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_theming = buildPythonPackage rec { + name = "plone.app.theming-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.theming/${name}.zip"; + md5 = "2da6d810e0d5f295dd0daa2b60731a1b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_upgrade = buildPythonPackage rec { + name = "plone.app.upgrade-1.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/${name}.zip"; + md5 = "2798dd50863d8c25624400b988a0acdd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_users = buildPythonPackage rec { + name = "plone.app.users-1.1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.users/${name}.zip"; + md5 = "97895d8dbdf885784be1afbf5b8b364c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_uuid = buildPythonPackage rec { + name = "plone.app.uuid-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.uuid/${name}.zip"; + md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_versioningbehavior = buildPythonPackage rec { + name = "plone.app.versioningbehavior-1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.versioningbehavior/${name}.zip"; + md5 = "6c153e3fa10b9ffea9742d0dad7b3b85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_viewletmanager = buildPythonPackage rec { + name = "plone.app.viewletmanager-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/${name}.zip"; + md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_vocabularies = buildPythonPackage rec { + name = "plone.app.vocabularies-2.1.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/${name}.zip"; + md5 = "34d4eb9c95879811fec0875aa3235ed3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_workflow = buildPythonPackage rec { + name = "plone.app.workflow-2.0.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.workflow/${name}.zip"; + md5 = "350ea680ccf7eb9b1598927cafad4f38"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_app_z3cform = buildPythonPackage rec { + name = "plone.app.z3cform-0.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/${name}.zip"; + md5 = "2e77f5e03d48a6fb2eb9994edb871917"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_autoform = buildPythonPackage rec { + name = "plone.autoform-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.autoform/${name}.zip"; + md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_behavior = buildPythonPackage rec { + name = "plone.behavior-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.behavior/${name}.zip"; + md5 = "a18feb9ec744b2a64028c366a8835d59"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_browserlayer = buildPythonPackage rec { + name = "plone.browserlayer-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.browserlayer/${name}.zip"; + md5 = "bce02f4907a4f29314090c525e5fc28e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_cachepurging = buildPythonPackage rec { + name = "plone.cachepurging-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.cachepurging/${name}.zip"; + md5 = "886814ac4deef0f1ed99a2eb60864264"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_caching = buildPythonPackage rec { + name = "plone.caching-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.caching/${name}.zip"; + md5 = "2c2e3b27d13b9101c92dfed222fde36c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_contentrules = buildPythonPackage rec { + name = "plone.contentrules-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.contentrules/${name}.zip"; + md5 = "a32370656c4fd58652fcd8a234db69c5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_dexterity = buildPythonPackage rec { + name = "plone.dexterity-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.dexterity/${name}.zip"; + md5 = "c8f495e368ada3a4566d99995d09e64c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_directives_dexterity = buildPythonPackage rec { + name = "plone.directives.dexterity-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.directives.dexterity/${name}.zip"; + md5 = "713b87644e3591b60b4a8ebd52987477"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_directives_form = buildPythonPackage rec { + name = "plone.directives.form-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.directives.form/${name}.zip"; + md5 = "e40a4b3fdde3768a137a450374934565"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_fieldsets = buildPythonPackage rec { + name = "plone.fieldsets-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.fieldsets/${name}.zip"; + md5 = "4158c8a1f784fcb5cecbd63deda7222f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_folder = buildPythonPackage rec { + name = "plone.folder-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.folder/${name}.zip"; + md5 = "1674ff18b7a9452d0c2063cf11c679b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_autocomplete = buildPythonPackage rec { + name = "plone.formwidget.autocomplete-1.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.autocomplete/${name}.zip"; + md5 = "06b3bfed9ea51fe2e93827f539fc7f07"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_contenttree = buildPythonPackage rec { + name = "plone.formwidget.contenttree-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.contenttree/${name}.zip"; + md5 = "2ea222d53ca856de7c6df831707f4ac1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_formwidget_namedfile = buildPythonPackage rec { + name = "plone.formwidget.namedfile-1.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/${name}.zip"; + md5 = "9274db2f5d7b4d07748fabfd125e49d0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_i18n = buildPythonPackage rec { + name = "plone.i18n-2.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.i18n/${name}.zip"; + md5 = "ef36aa9a294d507abb37787f9f7700bd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_indexer = buildPythonPackage rec { + name = "plone.indexer-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.indexer/${name}.zip"; + md5 = "538aeee1f9db78bc8c85ae1bcb0153ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_intelligenttext = buildPythonPackage rec { + name = "plone.intelligenttext-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/${name}.zip"; + md5 = "51688fa0815b49e00334e3ef948328ba"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_keyring = buildPythonPackage rec { + name = "plone.keyring-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.keyring/${name}.zip"; + md5 = "f3970e9bddb2cc65e461a2c62879233f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_locking = buildPythonPackage rec { + name = "plone.locking-2.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.locking/${name}.zip"; + md5 = "a7f8b8db78f57272d351d7fe0d067eb2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_memoize = buildPythonPackage rec { + name = "plone.memoize-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.memoize/${name}.zip"; + md5 = "d07cd14b976160e1f26a859e3370147e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_mocktestcase = buildPythonPackage rec { + name = "plone.mocktestcase-1.0b3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.mocktestcase/${name}.tar.gz"; + md5 = "6de66da6d610537d1f5c31e2ab0f36ee"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_namedfile = buildPythonPackage rec { + name = "plone.namedfile-1.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.namedfile/${name}.zip"; + md5 = "06f5bfa7079f889307ac5760e4cb4a7b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_openid = buildPythonPackage rec { + name = "plone.openid-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.openid/${name}.zip"; + md5 = "d4c36926a6dbefed035ed92c29329ce1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_outputfilters = buildPythonPackage rec { + name = "plone.outputfilters-1.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.outputfilters/${name}.zip"; + md5 = "a5ef28580f7fa7f2dc1768893995b0f7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlet_collection = buildPythonPackage rec { + name = "plone.portlet.collection-2.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/${name}.zip"; + md5 = "5f0006dbb3e0b56870383dfdedc49228"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlet_static = buildPythonPackage rec { + name = "plone.portlet.static-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlet.static/${name}.zip"; + md5 = "ec0dc691b4191a41ff97779b117f9985"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_portlets = buildPythonPackage rec { + name = "plone.portlets-2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.portlets/${name}.zip"; + md5 = "12b9a33f787756a48617c2d2dd63c538"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_protect = buildPythonPackage rec { + name = "plone.protect-2.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.protect/${name}.zip"; + md5 = "74925ffb08782e72f9b1e850fa78fffa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_recipe_alltests = buildPythonPackage rec { + name = "plone.recipe.alltests-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.recipe.alltests/${name}.zip"; + md5 = "c4ba0f67a2fdd259bd0e7d946bd35674"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_recipe_zeoserver = buildPythonPackage rec { + name = "plone.recipe.zeoserver-1.2.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.recipe.zeoserver/${name}.zip"; + md5 = "cd58899a7d534fe2d0ef42990a07c499"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_registry = buildPythonPackage rec { + name = "plone.registry-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.registry/${name}.zip"; + md5 = "6be3d2ec7e2d170e29b8c0bc65049aff"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_reload = buildPythonPackage rec { + name = "plone.reload-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.reload/${name}.zip"; + md5 = "49eab593c81b78a9b80d54786aa4ad72"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_resource = buildPythonPackage rec { + name = "plone.resource-1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.resource/${name}.zip"; + md5 = "594d41e3acd913ae92f2e9ef96503b9f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_rfc822 = buildPythonPackage rec { + name = "plone.rfc822-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.rfc822/${name}.zip"; + md5 = "b5b79bb5a9181da624a7e88940a45424"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_scale = buildPythonPackage rec { + name = "plone.scale-1.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.scale/${name}.zip"; + md5 = "7c59522b4806ee24f5e0a5fa69c523a5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_schemaeditor = buildPythonPackage rec { + name = "plone.schemaeditor-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/${name}.zip"; + md5 = "0b0fb4b20d9463b3fef82c2079a897d7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_session = buildPythonPackage rec { + name = "plone.session-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.session/${name}.zip"; + md5 = "2f9d3b88e813a47135af56a4da8bbde1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_stringinterp = buildPythonPackage rec { + name = "plone.stringinterp-1.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.stringinterp/${name}.zip"; + md5 = "81909716210c6ac3fd0ee87f45ea523d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_subrequest = buildPythonPackage rec { + name = "plone.subrequest-1.6.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.subrequest/${name}.zip"; + md5 = "cc12f68a22565415b10dbeef0020baa4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_supermodel = buildPythonPackage rec { + name = "plone.supermodel-1.1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.supermodel/${name}.zip"; + md5 = "00b3d723bb1a48116fe3bf8754f17085"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_synchronize = buildPythonPackage rec { + name = "plone.synchronize-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.synchronize/${name}.zip"; + md5 = "d25e86ace8daa0816861296c3288c4fb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_testing = buildPythonPackage rec { + name = "plone.testing-4.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.testing/${name}.zip"; + md5 = "fa40f6d3e3e254409c486c1c2c3e8804"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_theme = buildPythonPackage rec { + name = "plone.theme-2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.theme/${name}.zip"; + md5 = "c592d0d095e9fc76cc81597cdf6d0c37"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_transformchain = buildPythonPackage rec { + name = "plone.transformchain-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.transformchain/${name}.zip"; + md5 = "f5fb7ca894249e3e666501c4fae52a6c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_uuid = buildPythonPackage rec { + name = "plone.uuid-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.uuid/${name}.zip"; + md5 = "183fe2911a7d6c9f6b3103855e98ad8a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plone_z3cform = buildPythonPackage rec { + name = "plone.z3cform-0.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.z3cform/${name}.zip"; + md5 = "da891365156a5d5824d4e504465886a2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plonetheme_classic = buildPythonPackage rec { + name = "plonetheme.classic-1.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plonetheme.classic/${name}.zip"; + md5 = "9dc15871937f9cdf94cdfdb9be77a221"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + plonetheme_sunburst = buildPythonPackage rec { + name = "plonetheme.sunburst-1.2.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/${name}.zip"; + md5 = "be02660c869e04ac8cf6ade3559f2516"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_archetypes = buildPythonPackage rec { + name = "Products.Archetypes-1.8.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.Archetypes/${name}.zip"; + md5 = "74be68879b27228c084a9be869132a98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_atcontenttypes = buildPythonPackage rec { + name = "Products.ATContentTypes-2.1.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/${name}.zip"; + md5 = "abfb5209ffa11dc2c1a15c488e75d89c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_atreferencebrowserwidget = buildPythonPackage rec { + name = "Products.ATReferenceBrowserWidget-3.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/${name}.zip"; + md5 = "157bdd32155c8353450c17c649aad042"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_btreefolder2 = buildPythonPackage rec { + name = "Products.BTreeFolder2-2.13.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/${name}.tar.gz"; + md5 = "f57c85673036af7ccd34c3fa251f6bb2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfactionicons = buildPythonPackage rec { + name = "Products.CMFActionIcons-2.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/${name}.tar.gz"; + md5 = "ab1dc62404ed11aea84dc0d782b2235e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfcalendar = buildPythonPackage rec { + name = "Products.CMFCalendar-2.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/${name}.tar.gz"; + md5 = "49458e68dc3b6826ea9a3576ac014419"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfcore = buildPythonPackage rec { + name = "Products.CMFCore-2.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFCore/${name}.tar.gz"; + md5 = "9320a4023b8575097feacfd4a400e930"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdefault = buildPythonPackage rec { + name = "Products.CMFDefault-2.2.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/${name}.tar.gz"; + md5 = "fe7d2d3906ee0e3b484e4a02401576ab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdifftool = buildPythonPackage rec { + name = "Products.CMFDiffTool-2.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/${name}.zip"; + md5 = "7b7ed9b8f7b4f438e92e299823f92c86"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfdynamicviewfti = buildPythonPackage rec { + name = "Products.CMFDynamicViewFTI-4.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/${name}.zip"; + md5 = "7d39d416b41b2d93954bc73d9d0e077f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfeditions = buildPythonPackage rec { + name = "Products.CMFEditions-2.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/${name}.zip"; + md5 = "7dc744b3b896c1b212d9ba37b1752b65"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfformcontroller = buildPythonPackage rec { + name = "Products.CMFFormController-3.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/${name}.zip"; + md5 = "6573df7dcb39e3b63ba22abe2acd639e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfplacefulworkflow = buildPythonPackage rec { + name = "Products.CMFPlacefulWorkflow-1.5.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/${name}.zip"; + md5 = "9041e1f52eab5b348c0dfa85be438722"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfplone = buildPythonPackage rec { + name = "Products.CMFPlone-4.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/${name}.zip"; + md5 = "9c9663cb2b68c07e3d9a2fceaa97eaa1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfquickinstallertool = buildPythonPackage rec { + name = "Products.CMFQuickInstallerTool-3.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/${name}.tar.gz"; + md5 = "af34adb87ddf2b6da48eff8b70ca2989"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmftestcase = buildPythonPackage rec { + name = "Products.CMFTestCase-0.9.12"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/${name}.zip"; + md5 = "fbfdfe7bdb2158419d9899b4ab8c43eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmftopic = buildPythonPackage rec { + name = "Products.CMFTopic-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFTopic/${name}.tar.gz"; + md5 = "4abeeaafe6b6b1d2f2936bf5431cccba"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_cmfuid = buildPythonPackage rec { + name = "Products.CMFUid-2.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.CMFUid/${name}.tar.gz"; + md5 = "e20727959351dffbf0bac80613eee110"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_contentmigration = buildPythonPackage rec { + name = "Products.contentmigration-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.contentmigration/${name}.zip"; + md5 = "1cef33faec03e655b7c52c317db50ed2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_dcworkflow = buildPythonPackage rec { + name = "Products.DCWorkflow-2.2.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/${name}.tar.gz"; + md5 = "c90a16c4f3611015592ba8173a5f1863"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + propagatedBuildInputs = [ eggtestinfo ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_extendedpathindex = buildPythonPackage rec { + name = "Products.ExtendedPathIndex-3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/${name}.zip"; + md5 = "00c048a4b103200bdcbda61fa22c66df"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_externaleditor = buildPythonPackage rec { + name = "Products.ExternalEditor-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/${name}.zip"; + md5 = "475fea6e0b958c0c51cfdbfef2f4e623"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_externalmethod = buildPythonPackage rec { + name = "Products.ExternalMethod-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/${name}.zip"; + md5 = "15ba953ef6cb632eb571977651252ea6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_genericsetup = buildPythonPackage rec { + name = "Products.GenericSetup-1.7.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/${name}.tar.gz"; + md5 = "c48967c81c880ed33ee16a14caab3b11"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_i18ntestcase = buildPythonPackage rec { + name = "Products.i18ntestcase-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.i18ntestcase/${name}.zip"; + md5 = "f72f72e573975f15adfabfeef34fd721"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_kupu = buildPythonPackage rec { + name = "Products.kupu-1.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.kupu/${name}.zip"; + md5 = "b884fcc7f510426974d8d3c4333da4f4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mailhost = buildPythonPackage rec { + name = "Products.MailHost-2.13.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MailHost/${name}.zip"; + md5 = "1102e523435d8bf78a15b9ddb57478e1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_marshall = buildPythonPackage rec { + name = "Products.Marshall-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.Marshall/${name}.zip"; + md5 = "bde4d7f75195c1ded8371554b04d2541"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mimetools = buildPythonPackage rec { + name = "Products.MIMETools-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MIMETools/${name}.zip"; + md5 = "ad5372fc1190599a19493db0864448ec"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_mimetypesregistry = buildPythonPackage rec { + name = "Products.MimetypesRegistry-2.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/${name}.zip"; + md5 = "898166bb2aaececc8238ad4ee4826793"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_ofsp = buildPythonPackage rec { + name = "Products.OFSP-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.OFSP/${name}.zip"; + md5 = "c76d40928753c2ee56db873304e65bd5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_passwordresettool = buildPythonPackage rec { + name = "Products.PasswordResetTool-2.0.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/${name}.zip"; + md5 = "8dfd65f06c3f4a4b0742d1b44b65f014"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_placelesstranslationservice = buildPythonPackage rec { + name = "Products.PlacelessTranslationService-2.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/${name}.zip"; + md5 = "a94635eb712563c5a002520713f5d6dc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonelanguagetool = buildPythonPackage rec { + name = "Products.PloneLanguageTool-3.2.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/${name}.zip"; + md5 = "bd9eb6278bf76e8cbce99437ca362164"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonepas = buildPythonPackage rec { + name = "Products.PlonePAS-4.0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/${name}.zip"; + md5 = "c19241b558c994ff280a2e1f50aa1f19"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_plonetestcase = buildPythonPackage rec { + name = "Products.PloneTestCase-0.9.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/${name}.zip"; + md5 = "ddd5810937919ab5233ebd64893c8bae"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pluggableauthservice = buildPythonPackage rec { + name = "Products.PluggableAuthService-1.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/${name}.tar.gz"; + md5 = "f78f16e46d016c2848bc84254fa66596"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pluginregistry = buildPythonPackage rec { + name = "Products.PluginRegistry-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/${name}.tar.gz"; + md5 = "5b166193ca1eb84dfb402051f779ebab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_portaltransforms = buildPythonPackage rec { + name = "Products.PortalTransforms-2.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/${name}.zip"; + md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_pythonscripts = buildPythonPackage rec { + name = "Products.PythonScripts-2.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/${name}.zip"; + md5 = "04c86f2c45a29a162297a80dac61d14f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_resourceregistries = buildPythonPackage rec { + name = "Products.ResourceRegistries-2.2.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/${name}.zip"; + md5 = "9cf6efbcf2a6510033c06e1d3af94080"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_securemailhost = buildPythonPackage rec { + name = "Products.SecureMailHost-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/${name}.zip"; + md5 = "7db0f1fa867bd0df972082f502a7a707"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_standardcachemanagers = buildPythonPackage rec { + name = "Products.StandardCacheManagers-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/${name}.zip"; + md5 = "c5088b2b62bd26d63d9579a04369cb73"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_statusmessages = buildPythonPackage rec { + name = "Products.statusmessages-4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.statusmessages/${name}.zip"; + md5 = "265324b0a58a032dd0ed038103ed0473"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_tinymce = buildPythonPackage rec { + name = "Products.TinyMCE-1.2.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/${name}.zip"; + md5 = "108b919bfcff711d2116e41eccbede58"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_validation = buildPythonPackage rec { + name = "Products.validation-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.validation/${name}.zip"; + md5 = "afa217e2306637d1dccbebf337caa8bf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zcatalog = buildPythonPackage rec { + name = "Products.ZCatalog-2.13.23"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/${name}.zip"; + md5 = "d425171516dfc70e543a4e2b852301cb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zctextindex = buildPythonPackage rec { + name = "Products.ZCTextIndex-2.13.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/${name}.zip"; + md5 = "8bbfa5fcd3609246990a9314d6f826b4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zopeversioncontrol = buildPythonPackage rec { + name = "Products.ZopeVersionControl-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/${name}.zip"; + md5 = "238239102f3ac798ee4f4c53343a561f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + products_zsqlmethods = buildPythonPackage rec { + name = "Products.ZSQLMethods-2.13.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/${name}.zip"; + md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + py = buildPythonPackage rec { + name = "py-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/py/${name}.tar.gz"; + md5 = "b64d73a04121c1c4e27c7ec335ef87c8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pygments = buildPythonPackage rec { + name = "Pygments-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; + md5 = "54be67c04834f13d7e255e1797d629a5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_dateutil = buildPythonPackage rec { + name = "python-dateutil-1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz"; + md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_gettext = buildPythonPackage rec { + name = "python-gettext-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-gettext/${name}.zip"; + md5 = "cd4201d440126d1296d1d2bc2b4795f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + python_openid = buildPythonPackage rec { + name = "python-openid-2.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/python-openid/${name}.zip"; + md5 = "f89d9d4f4dccfd33b5ce34eb4725f751"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + pytz = buildPythonPackage rec { + name = "pytz-2012c"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.tar.gz"; + md5 = "1aa85f072e3d34ae310665967a0ce053"; + }; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + record = buildPythonPackage rec { + name = "Record-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/R/Record/${name}.zip"; + md5 = "cfed6a89d4fb2c9cb995e9084c3071b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_retry = buildPythonPackage rec { + name = "repoze.retry-1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.retry/${name}.tar.gz"; + md5 = "55f9dbde5d7f939d93c352fef0f2ce8b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_tm2 = buildPythonPackage rec { + name = "repoze.tm2-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.tm2/${name}.tar.gz"; + md5 = "c645a878874c8876c9c6b3467246afbc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_who = buildPythonPackage rec { + name = "repoze.who-2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz"; + md5 = "eab01991b6a2979678ce6015815262e2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + repoze_xmliter = buildPythonPackage rec { + name = "repoze.xmliter-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/repoze.xmliter/${name}.zip"; + md5 = "99da76bcbad6fbaced4a273bde29b10e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + restrictedpython = buildPythonPackage rec { + name = "RestrictedPython-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/R/RestrictedPython/${name}.zip"; + md5 = "aa75a7dcc7fbc966357837cc66cacec6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + roman = buildPythonPackage rec { + name = "roman-1.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/roman/${name}.tar.gz"; + md5 = "4f8832ed4108174b159c2afb4bd1d1dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + rwproperty = buildPythonPackage rec { + name = "rwproperty-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/rwproperty/${name}.tar.gz"; + md5 = "050bdf066492b3cd82a3399f8efea6b1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + simplejson = buildPythonPackage rec { + name = "simplejson-2.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz"; + md5 = "d7a7acf0bd7681bd116b5c981d2f7959"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + sphinx = buildPythonPackage rec { + name = "Sphinx-1.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; + md5 = "8f55a6d4f87fc6d528120c5d1f983e98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + tempstorage = buildPythonPackage rec { + name = "tempstorage-2.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tempstorage/${name}.zip"; + md5 = "7a2b76b39839e229249b1bb175604480"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + tl_eggdeps = buildPythonPackage rec { + name = "tl.eggdeps-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tl.eggdeps/${name}.tar.gz"; + md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + transaction = buildPythonPackage rec { + name = "transaction-1.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; + md5 = "30b062baa34fe1521ad979fb088c8c55"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + unidecode = buildPythonPackage rec { + name = "Unidecode-0.04.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/U/Unidecode/${name}2.tar.gz"; + md5 = "351dc98f4512bdd2e93f7a6c498730eb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + unittest2 = buildPythonPackage rec { + name = "unittest2-0.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz"; + md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + webob = buildPythonPackage rec { + name = "WebOb-1.0.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/W/WebOb/${name}.zip"; + md5 = "9809f9fb64fca8690a7da533fa29a272"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + wicked = buildPythonPackage rec { + name = "wicked-1.1.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/wicked/${name}.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + wsgi_intercept = buildPythonPackage rec { + name = "wsgi-intercept-0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip"; + md5 = "f65611f11d547d7dc8e623bf87d3929d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_autoinclude = buildPythonPackage rec { + name = "z3c.autoinclude-0.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/${name}.zip"; + md5 = "6a615ae18c12b459bceb3ae28e8e7709"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_batching = buildPythonPackage rec { + name = "z3c.batching-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.batching/${name}.tar.gz"; + md5 = "d1dc834781d228127ca6d15301757863"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_blobfile = buildPythonPackage rec { + name = "z3c.blobfile-0.1.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.blobfile/${name}.zip"; + md5 = "2e806640aa2f3b51e4578f35c44f567a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_caching = buildPythonPackage rec { + name = "z3c.caching-2.0a1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.caching/${name}.tar.gz"; + md5 = "17f250b5084c2324a7d15c6810ee628e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_checkversions = buildPythonPackage rec { + name = "z3c.checkversions-0.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.checkversions/${name}.tar.gz"; + md5 = "907f3a28aac04ad98fb3c4c5879a1eaf"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_coverage = buildPythonPackage rec { + name = "z3c.coverage-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.coverage/${name}.tar.gz"; + md5 = "d7f323a6c89f848fab38209f2162294d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_form = buildPythonPackage rec { + name = "z3c.form-2.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.form/${name}.tar.gz"; + md5 = "f029f83dd226f695f55049ed1ecee95e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_formwidget_query = buildPythonPackage rec { + name = "z3c.formwidget.query-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/${name}.zip"; + md5 = "d9f7960b1a5a81d8ba5241530f496522"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_objpath = buildPythonPackage rec { + name = "z3c.objpath-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.objpath/${name}.tar.gz"; + md5 = "63641934441b255ebeeaeabc618f01ed"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_ptcompat = buildPythonPackage rec { + name = "z3c.ptcompat-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.ptcompat/${name}.tar.gz"; + md5 = "bfe1ba6f9a38679705bd3eb5a5a2d7c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_compattest = buildPythonPackage rec { + name = "z3c.recipe.compattest-0.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.compattest/${name}.tar.gz"; + md5 = "ed5a1bde7ce384154721913846c736c7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_depgraph = buildPythonPackage rec { + name = "z3c.recipe.depgraph-0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.depgraph/${name}.zip"; + md5 = "eb734419815146eb5b7080b5e17346dc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_recipe_sphinxdoc = buildPythonPackage rec { + name = "z3c.recipe.sphinxdoc-0.0.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.recipe.sphinxdoc/${name}.tar.gz"; + md5 = "86e6965c919b43fa1de07588580f8790"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_relationfield = buildPythonPackage rec { + name = "z3c.relationfield-0.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.relationfield/${name}.zip"; + md5 = "e34a6230cdfbd4a0bc1c90a77600e0e7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_template = buildPythonPackage rec { + name = "z3c.template-1.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.template/${name}.tar.gz"; + md5 = "330e2dba8cd064d5790392afd9f460dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + z3c_zcmlhook = buildPythonPackage rec { + name = "z3c.zcmlhook-1.0b1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/${name}.tar.gz"; + md5 = "7b6c80146f5930409eb0b355ddf3daeb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_lockfile = buildPythonPackage rec { + name = "zc.lockfile-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz"; + md5 = "6cf83766ef9935c33e240b0904c7a45e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_recipe_egg = buildPythonPackage rec { + name = "zc.recipe.egg-1.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/${name}.tar.gz"; + md5 = "1cb6af73f527490dde461d3614a36475"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_recipe_testrunner = buildPythonPackage rec { + name = "zc.recipe.testrunner-1.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.recipe.testrunner/${name}.tar.gz"; + md5 = "1be4a1518e5b94890634468118242850"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_relation = buildPythonPackage rec { + name = "zc.relation-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.relation/${name}.tar.gz"; + md5 = "7e479095954fc6d8f648951434695837"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_resourcelibrary = buildPythonPackage rec { + name = "zc.resourcelibrary-1.3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.resourcelibrary/${name}.tar.gz"; + md5 = "bebe49f3e930f896a8ea75531bf3fae8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zc_sourcefactory = buildPythonPackage rec { + name = "zc.sourcefactory-0.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.sourcefactory/${name}.tar.gz"; + md5 = "532dfd0a72489023268c19e3788b105d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zconfig = buildPythonPackage rec { + name = "ZConfig-2.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZConfig/${name}.zip"; + md5 = "5c932690a70c8907efd240cdd76a7bc4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zdaemon = buildPythonPackage rec { + name = "zdaemon-2.0.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; + md5 = "291a875f82e812110557eb6704af8afe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zexceptions = buildPythonPackage rec { + name = "zExceptions-2.13.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zExceptions/${name}.zip"; + md5 = "4c679696c959040d8e656ef85ae40136"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zlog = buildPythonPackage rec { + name = "zLOG-2.11.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zLOG/${name}.tar.gz"; + md5 = "68073679aaa79ac5a7b6a5c025467147"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zodb3 = buildPythonPackage rec { + name = "ZODB3-3.10.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB3/${name}.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zodbcode = buildPythonPackage rec { + name = "zodbcode-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zodbcode/${name}.tar.gz"; + md5 = "9b128f89aa2a2117fae4f74757eefeff"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope2 = buildPythonPackage rec { + name = "Zope2-2.13.19"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/Zope2/${name}.zip"; + md5 = "26fee311aace7c12e406543ea91eb42a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_annotation = buildPythonPackage rec { + name = "zope.annotation-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.annotation/${name}.tar.gz"; + md5 = "4238153279d3f30ab5613438c8e76380"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_apidoc = buildPythonPackage rec { + name = "zope.app.apidoc-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.apidoc/${name}.zip"; + md5 = "91e969b2d1089bb0a6a303990d269f0a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_applicationcontrol = buildPythonPackage rec { + name = "zope.app.applicationcontrol-3.5.10"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.applicationcontrol/${name}.tar.gz"; + md5 = "f785c13698192c83024fda75f1f3d822"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_appsetup = buildPythonPackage rec { + name = "zope.app.appsetup-3.14.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.appsetup/${name}.tar.gz"; + md5 = "2c3da1f514e6793e2bf612cb06ad9076"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_authentication = buildPythonPackage rec { + name = "zope.app.authentication-3.8.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.authentication/${name}.tar.gz"; + md5 = "f8eb74fbdeebfd32c5e15c0f03aa3623"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_basicskin = buildPythonPackage rec { + name = "zope.app.basicskin-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.basicskin/${name}.tar.gz"; + md5 = "75915a315f336a5b614db67df1093eb3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_broken = buildPythonPackage rec { + name = "zope.app.broken-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.broken/${name}.tar.gz"; + md5 = "e6a7efdd1ea1facfd8c5ba4b25d395cb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_cache = buildPythonPackage rec { + name = "zope.app.cache-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.cache/${name}.zip"; + md5 = "8dd74574e869ce236ced0de7e349bb5c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_catalog = buildPythonPackage rec { + name = "zope.app.catalog-3.8.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.catalog/${name}.tar.gz"; + md5 = "1ce21dee4e8256cfe254f8ee24c6ecef"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_component = buildPythonPackage rec { + name = "zope.app.component-3.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.component/${name}.tar.gz"; + md5 = "bc2dce245d2afe462529c350956711e0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_container = buildPythonPackage rec { + name = "zope.app.container-3.9.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.container/${name}.tar.gz"; + md5 = "1e286c59f0166e517d67ddd723641c84"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_content = buildPythonPackage rec { + name = "zope.app.content-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.content/${name}.tar.gz"; + md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_dav = buildPythonPackage rec { + name = "zope.app.dav-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.dav/${name}.tar.gz"; + md5 = "19ec8dc5f7ad21468dea1c46e86d95dd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_debug = buildPythonPackage rec { + name = "zope.app.debug-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.debug/${name}.tar.gz"; + md5 = "1a9d349b14d91137b57da52a2b9d185f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_debugskin = buildPythonPackage rec { + name = "zope.app.debugskin-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.debugskin/${name}.tar.gz"; + md5 = "bd95d2848aa3108e53717d13b3c0924d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_dependable = buildPythonPackage rec { + name = "zope.app.dependable-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.dependable/${name}.zip"; + md5 = "5f180620a880e6ec754e3a34bd110891"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_error = buildPythonPackage rec { + name = "zope.app.error-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.error/${name}.tar.gz"; + md5 = "bab82dd06233e9b5e34e9709e8993ace"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_exception = buildPythonPackage rec { + name = "zope.app.exception-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.exception/${name}.tar.gz"; + md5 = "af161d3e7c17db7f56f7816a6f2d980c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_file = buildPythonPackage rec { + name = "zope.app.file-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.file/${name}.tar.gz"; + md5 = "fff140c36a2872c85b55433835ac3b98"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_folder = buildPythonPackage rec { + name = "zope.app.folder-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.folder/${name}.tar.gz"; + md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_form = buildPythonPackage rec { + name = "zope.app.form-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.form/${name}.tar.gz"; + md5 = "3d2b164d9d37a71490a024aaeb412e91"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_ftp = buildPythonPackage rec { + name = "zope.app.ftp-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.ftp/${name}.tar.gz"; + md5 = "b0769f90023156a86cb3f46040e6b5b0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_generations = buildPythonPackage rec { + name = "zope.app.generations-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.generations/${name}.tar.gz"; + md5 = "ca74e0f4a01ad8767e1bba6332c39aa2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_http = buildPythonPackage rec { + name = "zope.app.http-3.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.http/${name}.tar.gz"; + md5 = "26f73a3affecefc3aff960cd8b088681"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_i18n = buildPythonPackage rec { + name = "zope.app.i18n-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.i18n/${name}.tar.gz"; + md5 = "c8573307ba08926214b7944a05e43632"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_interface = buildPythonPackage rec { + name = "zope.app.interface-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.interface/${name}.tar.gz"; + md5 = "b15522275a435c609bd44f2f019bd13c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_interpreter = buildPythonPackage rec { + name = "zope.app.interpreter-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.interpreter/${name}.tar.gz"; + md5 = "fb8a2aa57dcfa3af2f30801dfafc78c4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_intid = buildPythonPackage rec { + name = "zope.app.intid-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.intid/${name}.tar.gz"; + md5 = "0d2c1daf5d1d6fd09351b652042a2dac"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_keyreference = buildPythonPackage rec { + name = "zope.app.keyreference-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.keyreference/${name}.tar.gz"; + md5 = "78539e472016a8ca57b34b6ea0ab7d9d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_locales = buildPythonPackage rec { + name = "zope.app.locales-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.locales/${name}.tar.gz"; + md5 = "bd2b4c6040e768f33004b1210d3207fa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_localpermission = buildPythonPackage rec { + name = "zope.app.localpermission-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.localpermission/${name}.tar.gz"; + md5 = "121509781b19ce55ebe890fa408702fc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_locking = buildPythonPackage rec { + name = "zope.app.locking-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.locking/${name}.tar.gz"; + md5 = "4edce1ba26f6c56b0eb79f703d8a80fe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_onlinehelp = buildPythonPackage rec { + name = "zope.app.onlinehelp-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.onlinehelp/${name}.tar.gz"; + md5 = "67d0be66965e34b24ef18c269da62e4c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_pagetemplate = buildPythonPackage rec { + name = "zope.app.pagetemplate-3.11.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/${name}.tar.gz"; + md5 = "2d304729c0d6a9ab67dd5ea852f19476"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_preference = buildPythonPackage rec { + name = "zope.app.preference-3.8.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.preference/${name}.tar.gz"; + md5 = "ab6906261854c61ff9f0a13c7612d3e8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_preview = buildPythonPackage rec { + name = "zope.app.preview-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.preview/${name}.tar.gz"; + md5 = "e698c10b043fb944150a825af9af536e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_principalannotation = buildPythonPackage rec { + name = "zope.app.principalannotation-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.principalannotation/${name}.tar.gz"; + md5 = "29c6bf8e817330b0d29de253686a68f2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_publication = buildPythonPackage rec { + name = "zope.app.publication-3.12.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.publication/${name}.zip"; + md5 = "d8c521287f52fb9f40fa9b8c2acb4675"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_publisher = buildPythonPackage rec { + name = "zope.app.publisher-3.10.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.publisher/${name}.zip"; + md5 = "66e9110e2967d8d204a65a98e2227404"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_renderer = buildPythonPackage rec { + name = "zope.app.renderer-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.renderer/${name}.tar.gz"; + md5 = "1cc605baf5dab7db50b0a0fd218566f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_rotterdam = buildPythonPackage rec { + name = "zope.app.rotterdam-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.rotterdam/${name}.tar.gz"; + md5 = "4cb3c53844bc7481f9b7d60f3c5e3a85"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_schema = buildPythonPackage rec { + name = "zope.app.schema-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.schema/${name}.tar.gz"; + md5 = "92b7c3f4512f3433acc931ecb6ffc936"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_security = buildPythonPackage rec { + name = "zope.app.security-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.security/${name}.tar.gz"; + md5 = "c7cec00f6d8379b93180faf6ffaa89ea"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_securitypolicy = buildPythonPackage rec { + name = "zope.app.securitypolicy-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.securitypolicy/${name}.tar.gz"; + md5 = "e3c6ef1db3228dbbb60a452c1a2a8f27"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_server = buildPythonPackage rec { + name = "zope.app.server-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.server/${name}.tar.gz"; + md5 = "d3a75eaf2a3f4759352dd3243dfb1d50"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_session = buildPythonPackage rec { + name = "zope.app.session-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.session/${name}.tar.gz"; + md5 = "93467bf6854d714b53e71f36a9d770f3"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_skins = buildPythonPackage rec { + name = "zope.app.skins-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.skins/${name}.tar.gz"; + md5 = "a0bc210720ee50e40adb93e9c685e884"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_testing = buildPythonPackage rec { + name = "zope.app.testing-3.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.testing/${name}.tar.gz"; + md5 = "6fd3eb11e24973a3dbdf5f1ab655c0d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_tree = buildPythonPackage rec { + name = "zope.app.tree-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.tree/${name}.tar.gz"; + md5 = "fbde3403c682bc7cf7b73d43cd2eed3a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_twisted = buildPythonPackage rec { + name = "zope.app.twisted-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.twisted/${name}.tar.gz"; + md5 = "9e98868b8be8a0c4f720036366364a67"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_undo = buildPythonPackage rec { + name = "zope.app.undo-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.undo/${name}.tar.gz"; + md5 = "7a40060aa0451a635a31d6e12d17a82e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_wsgi = buildPythonPackage rec { + name = "zope.app.wsgi-3.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.wsgi/${name}.tar.gz"; + md5 = "9c766908b720d777e02e0b0a9ac8a8a1"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zcmlfiles = buildPythonPackage rec { + name = "zope.app.zcmlfiles-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zcmlfiles/${name}.tar.gz"; + md5 = "0e8991d2bed71ee6b98a2c48d21e1126"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zopeappgenerations = buildPythonPackage rec { + name = "zope.app.zopeappgenerations-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zopeappgenerations/${name}.tar.gz"; + md5 = "4c8a0bc409677f8b17dc57737d41f919"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_app_zptpage = buildPythonPackage rec { + name = "zope.app.zptpage-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.app.zptpage/${name}.tar.gz"; + md5 = "aed8ec49e10911bd1e9d2c9d467fd098"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_applicationcontrol = buildPythonPackage rec { + name = "zope.applicationcontrol-3.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.applicationcontrol/${name}.tar.gz"; + md5 = "5e4bb54afe55185e15bd9d1ba3750857"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_authentication = buildPythonPackage rec { + name = "zope.authentication-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.authentication/${name}.zip"; + md5 = "7d6bb340610518f2fc71213cfeccda68"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_broken = buildPythonPackage rec { + name = "zope.broken-3.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip"; + md5 = "eff24d7918099a3e899ee63a9c31bee6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browser = buildPythonPackage rec { + name = "zope.browser-1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip"; + md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browsermenu = buildPythonPackage rec { + name = "zope.browsermenu-3.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browsermenu/${name}.zip"; + md5 = "a47c7b1e786661c912a1150bf8d1f83f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browserpage = buildPythonPackage rec { + name = "zope.browserpage-3.12.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browserpage/${name}.tar.gz"; + md5 = "a543ef3cb1b42f7233b3fca23dc9ea60"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_browserresource = buildPythonPackage rec { + name = "zope.browserresource-3.10.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.browserresource/${name}.zip"; + md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_cachedescriptors = buildPythonPackage rec { + name = "zope.cachedescriptors-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/${name}.zip"; + md5 = "263459a95238fd61d17e815d97ca49ce"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_catalog = buildPythonPackage rec { + name = "zope.catalog-3.8.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.catalog/${name}.tar.gz"; + md5 = "f9baff3997e337f0a23ac158258c8842"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_component = buildPythonPackage rec { + name = "zope.component-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.component/${name}.tar.gz"; + md5 = "22780b445b1b479701c05978055d1c82"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_componentvocabulary = buildPythonPackage rec { + name = "zope.componentvocabulary-1.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/${name}.tar.gz"; + md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_configuration = buildPythonPackage rec { + name = "zope.configuration-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.configuration/${name}.zip"; + md5 = "5b0271908ef26c05059eda76928896ea"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_container = buildPythonPackage rec { + name = "zope.container-3.11.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz"; + md5 = "fc66d85a17b8ffb701091c9328983dcc"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_contentprovider = buildPythonPackage rec { + name = "zope.contentprovider-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.contentprovider/${name}.tar.gz"; + md5 = "1bb2132551175c0123f17939a793f812"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_contenttype = buildPythonPackage rec { + name = "zope.contenttype-3.5.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip"; + md5 = "c6ac80e6887de4108a383f349fbdf332"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_copy = buildPythonPackage rec { + name = "zope.copy-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.tar.gz"; + md5 = "a9836a5d36cd548be45210eb00407337"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_copypastemove = buildPythonPackage rec { + name = "zope.copypastemove-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.copypastemove/${name}.tar.gz"; + md5 = "f335940686d15cfc5520c42f2494a924"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_datetime = buildPythonPackage rec { + name = "zope.datetime-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.datetime/${name}.tar.gz"; + md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_deferredimport = buildPythonPackage rec { + name = "zope.deferredimport-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.deferredimport/${name}.tar.gz"; + md5 = "68fce3bf4f011d4a840902fd763884ee"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_deprecation = buildPythonPackage rec { + name = "zope.deprecation-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz"; + md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_documenttemplate = buildPythonPackage rec { + name = "zope.documenttemplate-3.4.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.documenttemplate/${name}.tar.gz"; + md5 = "d5c302534ee0913c39bdc227e1592cb7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_dottedname = buildPythonPackage rec { + name = "zope.dottedname-3.4.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz"; + md5 = "62d639f75b31d2d864fe5982cb23959c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_dublincore = buildPythonPackage rec { + name = "zope.dublincore-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.dublincore/${name}.tar.gz"; + md5 = "2e34e42e454d896feb101ac74af62ded"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_error = buildPythonPackage rec { + name = "zope.error-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.error/${name}.tar.gz"; + md5 = "281445a906458ff5f18f56923699a127"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_event = buildPythonPackage rec { + name = "zope.event-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz"; + md5 = "6e8af2a16157a74885d4f0d88137cefb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_exceptions = buildPythonPackage rec { + name = "zope.exceptions-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz"; + md5 = "d7234d99d728abe3d9275346e8d24fd9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_file = buildPythonPackage rec { + name = "zope.file-0.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.file/${name}.tar.gz"; + md5 = "5df3b63c678f4b445be345f1dff1bc9b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_filerepresentation = buildPythonPackage rec { + name = "zope.filerepresentation-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz"; + md5 = "4a7a434094f4bfa99a7f22e75966c359"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_formlib = buildPythonPackage rec { + name = "zope.formlib-4.0.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.formlib/${name}.zip"; + md5 = "eed9c94382d11a4dececd0a48ac1d3f2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_globalrequest = buildPythonPackage rec { + name = "zope.globalrequest-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.globalrequest/${name}.zip"; + md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_hookable = buildPythonPackage rec { + name = "zope.hookable-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.hookable/${name}.tar.gz"; + md5 = "fe6713aef5b6c0f4963fb984bf326da0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_html = buildPythonPackage rec { + name = "zope.html-2.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.html/${name}.tar.gz"; + md5 = "868cb987e400b9a290355a1207d47143"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_i18n = buildPythonPackage rec { + name = "zope.i18n-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz"; + md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_i18nmessageid = buildPythonPackage rec { + name = "zope.i18nmessageid-3.5.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/${name}.tar.gz"; + md5 = "cb84bf61c2b7353e3b7578057fbaa264"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_index = buildPythonPackage rec { + name = "zope.index-3.6.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.index/${name}.tar.gz"; + md5 = "65c34f446f54ffd711e34ede9eb89dad"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_interface = buildPythonPackage rec { + name = "zope.interface-3.6.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.zip"; + md5 = "9df962180fbbb54eb1875cff9fe436e5"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_intid = buildPythonPackage rec { + name = "zope.intid-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.intid/${name}.zip"; + md5 = "241f2fe62fb60f6319d9902b12bc333d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_keyreference = buildPythonPackage rec { + name = "zope.keyreference-3.6.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.keyreference/${name}.tar.gz"; + md5 = "3774c90f236f880547f4c042ee0997e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_kgs = buildPythonPackage rec { + name = "zope.kgs-1.2.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.kgs/${name}.tar.gz"; + md5 = "15ed01a270bddcf253b1c08479549692"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_lifecycleevent = buildPythonPackage rec { + name = "zope.lifecycleevent-3.6.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz"; + md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_location = buildPythonPackage rec { + name = "zope.location-3.9.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.location/${name}.tar.gz"; + md5 = "1684a8f986099d15296f670c58e713d8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_login = buildPythonPackage rec { + name = "zope.login-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.login/${name}.zip"; + md5 = "4eceb766329125a80aee1b4b4809869a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_mimetype = buildPythonPackage rec { + name = "zope.mimetype-1.3.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.mimetype/${name}.tar.gz"; + md5 = "c865758c896707287f86ba603f06a84b"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_minmax = buildPythonPackage rec { + name = "zope.minmax-1.1.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.minmax/${name}.tar.gz"; + md5 = "0c3fbac9623f402ed758dace80080d55"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_mkzeoinstance = buildPythonPackage rec { + name = "zope.mkzeoinstance-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/${name}.tar.gz"; + md5 = "2c2dcf7cc7de58f7d009ca3294f54377"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_modulealias = buildPythonPackage rec { + name = "zope.modulealias-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.modulealias/${name}.tar.gz"; + md5 = "77f4603524b578a5c6b4b4fdde58a484"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_pagetemplate = buildPythonPackage rec { + name = "zope.pagetemplate-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/${name}.zip"; + md5 = "834a4bf702c05fba1e669677b4dc871f"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_password = buildPythonPackage rec { + name = "zope.password-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.password/${name}.tar.gz"; + md5 = "230f93a79020c8a3dc01d79832546e3c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_pluggableauth = buildPythonPackage rec { + name = "zope.pluggableauth-1.0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.pluggableauth/${name}.tar.gz"; + md5 = "85d16cb2e5b41bf2a438828857719566"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_preference = buildPythonPackage rec { + name = "zope.preference-3.8.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.preference/${name}.tar.gz"; + md5 = "bb8b1c9f65387a51be429407528cc453"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_principalannotation = buildPythonPackage rec { + name = "zope.principalannotation-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.principalannotation/${name}.tar.gz"; + md5 = "652685ca13cefaad78dbc5c6507fc9ab"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_principalregistry = buildPythonPackage rec { + name = "zope.principalregistry-3.7.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.principalregistry/${name}.tar.gz"; + md5 = "9b90adc7915d9bbed4237db432fc70c2"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_processlifetime = buildPythonPackage rec { + name = "zope.processlifetime-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.processlifetime/${name}.tar.gz"; + md5 = "69604bfd668a01ebebdd616a8f26ccfe"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_proxy = buildPythonPackage rec { + name = "zope.proxy-3.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.zip"; + md5 = "a400b0a26624b17fa889dbcaa989d440"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_ptresource = buildPythonPackage rec { + name = "zope.ptresource-3.9.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.ptresource/${name}.tar.gz"; + md5 = "f4645e51c15289d3fdfb4139039e18e9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_publisher = buildPythonPackage rec { + name = "zope.publisher-3.12.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz"; + md5 = "495131970cc7cb14de8e517fb3857ade"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_ramcache = buildPythonPackage rec { + name = "zope.ramcache-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.ramcache/${name}.zip"; + md5 = "87289e15f0e51f50704adda1557c02a7"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_rdb = buildPythonPackage rec { + name = "zope.rdb-3.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.rdb/${name}.tar.gz"; + md5 = "2068b469c07c9c0b41392cd9839e3728"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_schema = buildPythonPackage rec { + name = "zope.schema-4.2.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.zip"; + md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_security = buildPythonPackage rec { + name = "zope.security-3.7.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz"; + md5 = "072ab8d11adc083eace11262da08630c"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_securitypolicy = buildPythonPackage rec { + name = "zope.securitypolicy-3.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.securitypolicy/${name}.tar.gz"; + md5 = "fe9ba029384c0640b2ba175ba1805cd8"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_sendmail = buildPythonPackage rec { + name = "zope.sendmail-3.7.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.sendmail/${name}.tar.gz"; + md5 = "8a513ecf2b41cad849f6607bf16d6818"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_sequencesort = buildPythonPackage rec { + name = "zope.sequencesort-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.sequencesort/${name}.tar.gz"; + md5 = "cfc35fc426a47f5c0ee43c416224b864"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_server = buildPythonPackage rec { + name = "zope.server-3.6.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.server/${name}.tar.gz"; + md5 = "2a758720fd6d9bdfb1cea8d644c27923"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_session = buildPythonPackage rec { + name = "zope.session-3.9.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.session/${name}.tar.gz"; + md5 = "2934e9f2daa01555e9a7a1f9945c3493"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_site = buildPythonPackage rec { + name = "zope.site-3.9.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.site/${name}.tar.gz"; + md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_size = buildPythonPackage rec { + name = "zope.size-3.4.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz"; + md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_structuredtext = buildPythonPackage rec { + name = "zope.structuredtext-3.5.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.structuredtext/${name}.tar.gz"; + md5 = "eabbfb983485d0879322bc878d2478a0"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_tal = buildPythonPackage rec { + name = "zope.tal-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.tal/${name}.zip"; + md5 = "13869f292ba36b294736b7330b1396fd"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_tales = buildPythonPackage rec { + name = "zope.tales-3.5.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.tales/${name}.tar.gz"; + md5 = "1c5060bd766a0a18632b7879fc9e4e1e"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_testbrowser = buildPythonPackage rec { + name = "zope.testbrowser-3.11.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testbrowser/${name}.tar.gz"; + md5 = "64abbee892121e7f1a91aed12cfc155a"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_testing = buildPythonPackage rec { + name = "zope.testing-3.9.7"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; + md5 = "8999f3d143d416dc3c8b2a5bd6f33e28"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_thread = buildPythonPackage rec { + name = "zope.thread-3.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.thread/${name}.tar.gz"; + md5 = "3567037865b746c933d4af86e5aefa35"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_traversing = buildPythonPackage rec { + name = "zope.traversing-3.13.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip"; + md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_viewlet = buildPythonPackage rec { + name = "zope.viewlet-3.7.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.viewlet/${name}.tar.gz"; + md5 = "367e03096df57e2f9b74fff43f7901f9"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zope_xmlpickle = buildPythonPackage rec { + name = "zope.xmlpickle-3.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.xmlpickle/${name}.tar.gz"; + md5 = "b579f35546b095aec2c890d3f8a46911"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + zopeundo = buildPythonPackage rec { + name = "ZopeUndo-2.12.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZopeUndo/${name}.zip"; + md5 = "2b8da09d1b98d5558f62e12f6e52c401"; + }; + + # ignore dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + buildInputs = [ pkgs.unzip ]; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + + + eggtestinfo = buildPythonPackage rec { + name = "eggtestinfo-0.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/eggtestinfo/${name}.tar.gz"; + md5 = "6f0507aee05f00c640c0d64b5073f840"; + }; + + # circular dependencies + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ + stdenv.lib.maintainers.chaoflow + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.goibhniu + ]; + }; + }; + +}; in plone42Packages + +# Not Found: ['nt-svcutils', 'PIL', 'wsgi-intercept'] +# Version Error: ['collective.z3cform.datagridfield-demo'] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0c59f18833..e7c2890fb1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5333,6 +5333,11 @@ let python = python27; }); + plone42Packages = recurseIntoAttrs (import ../development/web/plone { + inherit pkgs buildPythonPackage; + python = python27; + }); + foursuite = callPackage ../development/python-modules/4suite { }; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; From 30658882e8ea409f32ca0a83ab5183acbb5536ec Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 5 Feb 2013 20:24:42 -0500 Subject: [PATCH 048/248] Rubygems: Fix deps. Gem nix in nixpkgs is broken, will have to update it. --- .../interpreters/ruby/generated.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 6d0356c14e5b..92c5189e1055 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -116,7 +116,7 @@ installed versions.''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; name = ''actionmailer-3.2.11''; - requiredGems = [ g.mail_2_4_4 ]; + requiredGems = [ g.actionpack_3_2_11 g.mail_2_4_4 ]; sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn''; }; actionpack_3_2_11 = { @@ -127,7 +127,7 @@ installed versions.''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; name = ''actionpack-3.2.11''; - requiredGems = [ g.activemodel_3_2_11 g.rack_cache_1_2 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; }; activemodel_3_2_11 = { @@ -138,7 +138,7 @@ installed versions.''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; name = ''activemodel-3.2.11''; - requiredGems = [ g.builder_3_0_4 ]; + requiredGems = [ g.activesupport_3_2_11 g.builder_3_0_4 ]; sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf''; }; activerecord_3_2_11 = { @@ -149,7 +149,7 @@ installed versions.''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; name = ''activerecord-3.2.11''; - requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_35 ]; + requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.arel_3_0_2 g.tzinfo_0_3_35 ]; sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw''; }; activeresource_3_2_11 = { @@ -160,7 +160,7 @@ installed versions.''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; name = ''activeresource-3.2.11''; - requiredGems = [ ]; + requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 ]; sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h''; }; activesupport_3_2_11 = { @@ -431,7 +431,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Process manager for applications with multiple components''; }; name = ''foreman-0.61.0''; - requiredGems = [ ]; + requiredGems = [ g.thor_0_17_0 ]; sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z''; }; highline_1_6_2 = { @@ -565,7 +565,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 ]; + requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 g.i18n_0_6_1 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; mime_types_1_20_1 = { @@ -750,7 +750,7 @@ Also see http://rack.github.com/. longDescription = ''You should use protection!''; }; name = ''rack-protection-1.3.2''; - requiredGems = [ ]; + requiredGems = [ g.rack_1_5_1 ]; sha256 = ''0f69d491xciq1hb3mm26nxnsb3pvlf3gdkggj4ryiphimsy05n0k''; }; rack_ssl_1_3_3 = { @@ -762,7 +762,7 @@ Also see http://rack.github.com/. ''; }; name = ''rack-ssl-1.3.3''; - requiredGems = [ ]; + requiredGems = [ g.rack_1_5_1 ]; sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5''; }; rack_test_0_6_2 = { @@ -776,7 +776,7 @@ to build on. Most of its initial functionality is an extraction of Merb 1.0's request helpers feature.''; }; name = ''rack-test-0.6.2''; - requiredGems = [ ]; + requiredGems = [ g.rack_1_5_1 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; rails_3_2_11 = { @@ -798,7 +798,7 @@ request helpers feature.''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; name = ''railties-3.2.11''; - requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.rdoc_3_12 ]; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12 g.activesupport_3_2_11 g.actionpack_3_2_11 ]; sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; }; rake_0_9_2_2 = { @@ -857,7 +857,7 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ ]; + requiredGems = [ g.json_1_7_6 ]; sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; rjb_1_4_2 = { @@ -892,7 +892,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''BDD for Ruby''; }; name = ''rspec-2.11.0''; - requiredGems = [ ]; + requiredGems = [ g.rspec_core_2_11_1 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 ]; sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs''; }; rspec_core_2_11_1 = { @@ -914,7 +914,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; name = ''rspec-expectations-2.11.3''; - requiredGems = [ ]; + requiredGems = [ g.diff_lcs_1_1_3 ]; sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5''; }; rspec_mocks_2_11_3 = { @@ -979,7 +979,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.29.0''; - requiredGems = [ g.childprocess_0_3_7 g.websocket_1_0_7 ]; + requiredGems = [ g.multi_json_1_5_0 g.rubyzip_0_9_9 g.childprocess_0_3_7 g.websocket_1_0_7 ]; sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; sinatra_1_3_2 = { @@ -990,7 +990,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; name = ''sinatra-1.3.2''; - requiredGems = [ g.rack_protection_1_3_2 ]; + requiredGems = [ g.rack_1_5_1 g.rack_protection_1_3_2 g.tilt_1_3_3 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; sprockets_2_2_2 = { @@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; + requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_1 g.tilt_1_3_3 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; systemu_2_5_2 = { @@ -1023,7 +1023,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''A thin and fast web server''; }; name = ''thin-1.5.0''; - requiredGems = [ g.eventmachine_1_0_0 g.daemons_1_1_9 ]; + requiredGems = [ g.rack_1_5_1 g.eventmachine_1_0_0 g.daemons_1_1_9 ]; sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1''; }; thor_0_17_0 = { @@ -1055,7 +1055,7 @@ See RDoc for a description of RDoc's markup and basic use.''; homepage = ''https://github.com/cjheath/treetop''; }; name = ''treetop-1.4.12''; - requiredGems = [ g.polyglot_0_3_3 ]; + requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; }; tzinfo_0_3_35 = { From f921baec94c0072135e2dc1c96af685312eb18d6 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 6 Feb 2013 10:46:25 +0100 Subject: [PATCH 049/248] nvidia-x11: fix build with the latest Linux kernel --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 ++ .../linux/nvidia-x11/version-test.patch | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/os-specific/linux/nvidia-x11/version-test.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e3630db2d5b6..c965ef01c72b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { builder = ./builder.sh; + patches = [ ./version-test.patch ]; + src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch new file mode 100644 index 000000000000..9b6908ee5c0a --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/version-test.patch @@ -0,0 +1,19 @@ +diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh +--- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430 ++++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430 +@@ -1699,11 +1699,13 @@ + # kernel older than 2.6.6, that's all we require to + # build the module. + # ++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) + PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) + SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) + +- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ +- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then ++ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \ ++ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \ ++ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then + SELECTED_MAKEFILE=Makefile.kbuild + RET=0 + fi From 3334f33daffe102a0efca1e3edd3f267a14e6bef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 11:31:49 +0100 Subject: [PATCH 050/248] atlas: update to version 3.10.1 This patch fixes issue #297. --- .../libraries/science/math/atlas/default.nix | 22 +++++++++++-------- .../atlas/disable-timing-accuracy-check.patch | 22 +++++++++++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 75f9de5e96a2..b61204d8bf48 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,27 +1,32 @@ { stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: let + version = "3.10.1"; + optionalString = stdenv.lib.optionalString; + optional = stdenv.lib.optional; in stdenv.mkDerivation { - name = "atlas-3.9.67"; + name = "atlas-${version}"; src = fetchurl { - url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; - sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; + url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; + sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2"; }; + # Atlas aborts the build if it detects that some kind of CPU frequency + # scaling is active on the build machine because that feature offsets the + # performance timings. We ignore that check, however, because with binaries + # being pre-built on Hydra those timings aren't accurate for the local + # machine in the first place. + patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch; + # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; # * -fPIC allows to build atlas inside shared objects, as octave does. # - # * Atlas aborts the build if it detects that some kind of CPU frequency - # scaling is active on the build machine because that feature offsets the - # performance timings. We ignore that check, however, because with binaries - # being pre-built on Hydra those timings aren't accurate for the local - # machine in the first place. # * Atlas detects the cpu and does some tricks. For example, notices the # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) # available, for what I know, only in that family. So we hardcode K7 @@ -33,7 +38,6 @@ stdenv.mkDerivation { configureFlags = "-Fa alg -fPIC -t 0" + optionalString stdenv.isi686 " -b 32 -A 18 -V 1" + optionalString stdenv.isx86_64 " -A 31 -V 192" - + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0" + optionalString shared " --shared " ; diff --git a/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch new file mode 100644 index 000000000000..ddacc742d142 --- /dev/null +++ b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch @@ -0,0 +1,22 @@ +diff -ubr ATLAS-orig/CONFIG/src/config.c ATLAS/CONFIG/src/config.c +--- ATLAS-orig/CONFIG/src/config.c 2013-02-06 11:23:47.078036878 +0100 ++++ ATLAS/CONFIG/src/config.c 2013-02-06 11:24:16.481120888 +0100 +@@ -711,17 +711,7 @@ + + int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb) + { +- int i, iret; +- char *ln; +- i = strlen(targarg) + 22 + 12; +- ln = malloc(i*sizeof(char)); +- assert(ln); +- sprintf(ln, "%s -O %d -s %d -t", targarg, OS, asmb); +- iret = GetIntProbe(verb, ln, "arch", "CPU THROTTLE", 0); +- free(ln); +- if (iret) printf("CPU Throttling apparently enabled!\n"); +- else printf("Cannot detect CPU throttling.\n"); +- return(iret); ++ return 0; + } + + char *NewAppendedString_SFLAG(char *old, char *flag, char *str) From 83df975ba84a991610bbc9d33f6e473fc70cfdb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:26:59 +0100 Subject: [PATCH 051/248] atlas: allow users to override the CPU configuration used to build ATLAS --- .../libraries/science/math/atlas/default.nix | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index b61204d8bf48..9aab09094a0c 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,4 +1,24 @@ -{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false }: +{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false +, cpuConfig ? if stdenv.isi686 then "-b 32 -A 18 -V 1" else "-b 64 -A 31 -V 192" +}: + +# Atlas detects the CPU and optimizes its build accordingly. This is great when +# the code is run on the same machine that built the binary, but in case of a +# central build farm like Hydra, this feature is dangerous because the code may +# be generated utilizing fancy features that users who download the binary +# cannot execute. +# +# To avoid these issues, the build is configured using the 'cpuConfig' +# parameter as follows: +# +# | x86 CPU | x86_64 CPU | +# |---------------------------------------------+------------------------| +# | -b 32 | -b 64 | +# | -A 18 (Pentium II) | -A 31 (Athlon K7) | +# | -V 1 (No SIMD: Pentium II doesn't have SSE) | -V 192 (SSE1 and SSE2) | +# +# Users who want to compile a highly optimized version of ATLAS that's suitable +# for their local machine can override these settings accordingly. let version = "3.10.1"; @@ -15,6 +35,8 @@ stdenv.mkDerivation { sha256 = "11ncgdc7kzb2y2gqb3sgarm5saj9fr07r3h2yh2h5bja429b85d2"; }; + buildInputs = [ gfortran ]; + # Atlas aborts the build if it detects that some kind of CPU frequency # scaling is active on the build machine because that feature offsets the # performance timings. We ignore that check, however, because with binaries @@ -25,30 +47,19 @@ stdenv.mkDerivation { # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - # * -fPIC allows to build atlas inside shared objects, as octave does. + # * -fPIC is passed even in non-shared builds so that the ATLAS code can be + # used to inside of shared libraries, like Octave does. # - # * Atlas detects the cpu and does some tricks. For example, notices the - # hydra AMD Family 10h computer, and uses a SSE trick for it (bit 17 of MXCSR) - # available, for what I know, only in that family. So we hardcode K7 - # -A 31 = Athlon K7 - # -A 18 = Pentium II - # -V 192 = SSE1|SSE2 (Or it takes SSE3 somehow in my machine without SSE3) - # -V 1 = No SIMD (Pentium II does not have any SSE) - # -t 0 = No threading - configureFlags = "-Fa alg -fPIC -t 0" - + optionalString stdenv.isi686 " -b 32 -A 18 -V 1" - + optionalString stdenv.isx86_64 " -A 31 -V 192" - + optionalString shared " --shared " - ; - - buildInputs = [ gfortran ]; + # * -t 0 disables use of multi-threading. It's not quite clear what the + # consequences of that setting are and whether it's necessary or not. + configureFlags = "-Fa alg -fPIC -t 0 ${cpuConfig}" + optionalString shared " --shared"; doCheck = true; meta = { homepage = "http://math-atlas.sourceforge.net/"; description = "Automatically Tuned Linear Algebra Software (ATLAS)"; - license = "GPL"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing From 1f92b14d1f703446f6cf72c091bcc77777b1686a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 11:36:30 +0100 Subject: [PATCH 052/248] haskell-heist: jailbreak to support the latest version of 'errors' --- pkgs/development/libraries/haskell/heist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 7547fcff4101..780e949c7144 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; From 4548458a3e9bf743f971c2a31790f16e097f702b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 053/248] haskell-contravariant: update to version 0.4 --- .../libraries/haskell/contravariant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index 571632d09b5a..2c967d26085a 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers, transformersCompat }: +{ cabal, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.3"; - sha256 = "025rmangj0g8vls1ymh1dz4xq6ljnn8fsbcfrds3030s325v4zl9"; - buildDepends = [ transformers transformersCompat ]; + version = "0.4"; + sha256 = "1nqslc9vcx6v6c33fn7mvb1xhr33yl3ja92p788zx8z1drx9cqc3"; + buildDepends = [ tagged transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Haskell 98 contravariant functors"; From b76e4059c47215533d7548e7a7f10ad42c3cf3b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 054/248] haskell-either: update to version 3.4 --- pkgs/development/libraries/haskell/either/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 91b24e56378d..4730af585697 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "3.1"; - sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm"; + version = "3.4"; + sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2"; buildDepends = [ MonadRandom mtl semigroupoids semigroups transformers ]; From 8b0b674d650cbed4e529bf01680bb5fa277eba00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 055/248] haskell-errors: update to version 1.4.1 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index d2e68670eb0e..7ed890c513c5 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.3.1"; - sha256 = "0vfpnpkiz362bvjyaf35spfk3h6vw7xi1x3f8agzs7kmxrdvrfik"; + version = "1.4.1"; + sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40"; buildDepends = [ either safe transformers ]; meta = { description = "Simplified error-handling"; From f4be8d4ec7ce592404c0070f358be5f1d96aa110 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 056/248] haskell-ghc-heap-view: update to version 0.4.2.0 --- pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 99aa99fc9d31..6e0cd15c248a 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.4.1.0"; - sha256 = "1icq5620j37n85d08yfpln75f9944flbqyqhjqsf0qr72zsm3w11"; + version = "0.4.2.0"; + sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp"; buildDepends = [ transformers ]; meta = { description = "Extract the heap representation of Haskell values and thunks"; From 87f83b6bce776ed2e59848403fc1572ed83f0b5a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 057/248] haskell-hamlet: update to version 1.1.6.1 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 06c415ea978f..1f5d67321986 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.5"; - sha256 = "18rv53bqf07w0y1qs96v3krimvjx5salq9mn168l01vl98blwhvv"; + version = "1.1.6.1"; + sha256 = "15jqlfb7l49xqd2szzjhffbnxs7azq85a759bbwx3jfxdz89cv0k"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 7cd1885725f00007a264b6673fbd63cb38d7d28b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:27:09 +0100 Subject: [PATCH 058/248] haskell-happstack-server: update to version 7.1.2 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index b2311bde6ca9..226877ff6dc2 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.1"; - sha256 = "0q12l93kq5ixvam682ys3a6i3q59amz9cyr1bb06f2zf8qr57b7a"; + version = "7.1.2"; + sha256 = "1pqrwsgdp1qf5jd2nzdrj2wkd2bq9n0ciwyzvzn8nmwyqgkdzs4f"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From af9747c1ef1af07c76ba107f8099e4bd5cf1e1d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:33:55 +0100 Subject: [PATCH 059/248] boost: add version 1.53.0 The default 'boost' attribute has not been updated yet as this needs further testing. --- .../libraries/boost/1.53-headers.nix | 26 ++++++ pkgs/development/libraries/boost/1.53.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 119 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.53-headers.nix create mode 100644 pkgs/development/libraries/boost/1.53.nix diff --git a/pkgs/development/libraries/boost/1.53-headers.nix b/pkgs/development/libraries/boost/1.53-headers.nix new file mode 100644 index 000000000000..04bad16bd70b --- /dev/null +++ b/pkgs/development/libraries/boost/1.53-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-headers-1.53.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost + ''; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/boost/1.53.nix b/pkgs/development/libraries/boost/1.53.nix new file mode 100644 index 000000000000..7de750efd916 --- /dev/null +++ b/pkgs/development/libraries/boost/1.53.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.53.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f33fa6c1bfd..7425d68a9cc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3435,11 +3435,13 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; boost152 = callPackage ../development/libraries/boost/1.52.nix { }; + boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; + boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders152; botan = callPackage ../development/libraries/botan { }; From 4aa56c21c85792284ae2b301ad86766202a22592 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:35:00 +0100 Subject: [PATCH 060/248] Rename "boost-x.y.z-headers" derivation to "boost-headers-x.y.z" to ensure that nix-env picks the full boost distribution when "nix-env -i boost" is installed. --- pkgs/development/libraries/boost/1.49-headers.nix | 2 +- pkgs/development/libraries/boost/1.51-headers.nix | 2 +- pkgs/development/libraries/boost/1.52-headers.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix index 58c0c19a17bc..afb094a3cad5 100644 --- a/pkgs/development/libraries/boost/1.49-headers.nix +++ b/pkgs/development/libraries/boost/1.49-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.49.0-headers"; + name = "boost-headers-1.49.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; diff --git a/pkgs/development/libraries/boost/1.51-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix index 4b1c1f80c541..6004eb799c01 100644 --- a/pkgs/development/libraries/boost/1.51-headers.nix +++ b/pkgs/development/libraries/boost/1.51-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.51.0-headers"; + name = "boost-headers-1.51.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix index 72a4b419f2d5..b9e594cf5f91 100644 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.52.0-headers"; + name = "boost-headers-1.52.0"; src = fetchurl { url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; From 6b702f23eaf6c99d4d8a3aaee88804fa14d68bfc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 13:15:12 +0100 Subject: [PATCH 061/248] lzip: add version 1.14-rc3 --- pkgs/tools/compression/lzip/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/compression/lzip/default.nix diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix new file mode 100644 index 000000000000..710c58029aa0 --- /dev/null +++ b/pkgs/tools/compression/lzip/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "lzip-1.14-rc3"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz"; + sha256 = "040mmfadvhry68bv10baqi1bs8g5wwbf5rx0widyz69llpn64mw9"; + }; + + doCheck = true; + + meta = { + homepage = "http://www.nongnu.org/lzip/lzip.html"; + description = "a lossless data compressor based on the LZMA algorithm"; + license = stdenv.lib.licenses.gpl3Plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7425d68a9cc6..dc71cdf14f12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1067,6 +1067,8 @@ let lxc = callPackage ../os-specific/linux/lxc { }; + lzip = callPackage ../tools/compression/lzip { }; + lzma = xz; xz = callPackage ../tools/compression/xz { }; From f590891ac26c07fc1049dc84abbc33348860c016 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 5 Feb 2013 19:58:31 +0100 Subject: [PATCH 062/248] hplip: start work on making python programs work --- pkgs/misc/drivers/hplip/default.nix | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 514655bd727f..965efb9dc918 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4 +{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus +, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4 }: stdenv.mkDerivation rec { @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in + sed -i s,/etc/hp/,$out/etc/hp/, base/g.py ''; # --disable-network-build Until we have snmp @@ -41,9 +42,28 @@ stdenv.mkDerivation rec { "; ''; - buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++ + postInstall = '' + wrapPythonPrograms + ''; + + buildInputs = [ + libjpeg + cups + libusb + pythonPackages.python + pythonPackages.wrapPython + pythonPackages.recursivePthLoader # does not seem to work? + saneBackends + dbus + pkgconfig] ++ stdenv.lib.optional qtSupport qt4; + pythonPath = with pythonPackages; [ + pythonDBus + pyqt4 + pygobject + ]; + meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; From b5e2a027c4ea346f7472a0ed47655a326575f2d4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 5 Feb 2013 20:27:51 +0100 Subject: [PATCH 063/248] hplip: now hp-setup actually shows a dialog --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 965efb9dc918..e848c4df5b96 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { libusb pythonPackages.python pythonPackages.wrapPython - pythonPackages.recursivePthLoader # does not seem to work? saneBackends dbus pkgconfig] ++ @@ -62,6 +61,7 @@ stdenv.mkDerivation rec { pythonDBus pyqt4 pygobject + recursivePthLoader ]; meta = with stdenv.lib; { From b73dff89f78854ebbeb95abd5e27d752994bc204 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 6 Feb 2013 14:08:27 +0100 Subject: [PATCH 064/248] enable networking support for hplip, net_snmp is available now --- pkgs/misc/drivers/hplip/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index e848c4df5b96..8abdb232905e 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus -, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4 +, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit - --disable-network-build" + " export makeFlags=" halpredir=$out/share/hal/fdi/preprobe/10osvendor @@ -54,8 +54,9 @@ stdenv.mkDerivation rec { pythonPackages.wrapPython saneBackends dbus - pkgconfig] ++ - stdenv.lib.optional qtSupport qt4; + pkgconfig + net_snmp + ] ++ stdenv.lib.optional qtSupport qt4; pythonPath = with pythonPackages; [ pythonDBus From f337ab4430e972c183ef9aa6c54275bf8c996ab2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Feb 2013 15:00:33 +0100 Subject: [PATCH 065/248] fetchurl: Remove some compatibility hacks --- pkgs/build-support/fetchurl/builder.sh | 14 -------------- pkgs/build-support/fetchurl/default.nix | 16 +++++----------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 808bf9f7cdec..4af060cadc68 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -29,20 +29,6 @@ tryDownload() { finish() { - # On old versions of Nix, verify the hash of the output. On newer - # versions, Nix verifies the hash itself. - if test "$NIX_OUTPUT_CHECKED" != "1"; then - if test "$outputHashAlgo" != "md5"; then - echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8" - exit 1 - fi - actual=$(md5sum -b "$out" | cut -c1-32) - if test "$actual" != "$id"; then - echo "hash is $actual, expected $id" - exit 1 - fi - fi - stopNest exit 0 } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index cc59dd7fab1e..02af2aaf5712 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv. +{ stdenv, curl }: # Note that `curl' may be `null', in case of the native stdenv. let @@ -17,10 +17,7 @@ let # Names of the master sites that are mirrored (i.e., "sourceforge", # "gnu", etc.). - sites = - if builtins ? attrNames - then builtins.attrNames mirrors - else [] /* backwards compatibility */; + sites = builtins.attrNames mirrors; impureEnvVars = [ # We borrow these environment variables from the caller to allow @@ -38,7 +35,7 @@ let ] ++ (map (site: "NIX_MIRRORS_${site}") sites); in - + { # URL to fetch. url ? "" @@ -79,9 +76,9 @@ stdenv.mkDerivation { if showURLs then "urls" else if name != "" then name else baseNameOf (toString (builtins.head urls_)); - + builder = ./builder.sh; - + buildInputs = [curl]; urls = urls_; @@ -90,9 +87,6 @@ stdenv.mkDerivation { # (http://nixos.org/tarballs) over the original URLs. preferHashedMirrors = true; - # Compatibility with Nix <= 0.7. - id = md5; - # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; From 04765da09a4355ee94a38a591f4e59a88f658f27 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 Feb 2013 15:15:28 +0100 Subject: [PATCH 066/248] fetchurl: Don't wait too long for the hashed mirrors If the hashed mirror (nixos.org/tarballs) doesn't respond in 15 seconds, give up and try the original URL. --- pkgs/build-support/fetchurl/builder.sh | 7 ++++--- pkgs/build-support/fetchurl/default.nix | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 4af060cadc68..177b1e016a6b 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -6,7 +6,7 @@ source $mirrorsFile # Curl flags to handle redirects, not use EPSV, handle cookies for # servers to need them during redirects, and work on SSL without a # certificate (this isn't a security problem because we check the -# cryptographic hash of the output anyway). +# cryptographic hash of the output anyway). curl="curl \ --location --max-redirs 20 \ --retry 3 @@ -38,10 +38,11 @@ tryHashedMirrors() { if test -n "$NIX_HASHED_MIRRORS"; then hashedMirrors="$NIX_HASHED_MIRRORS" fi - + for mirror in $hashedMirrors; do url="$mirror/$outputHashAlgo/$outputHash" - if $curl --fail --silent --show-error --head "$url" \ + if $curl --retry 0 --connect-timeout "${NIX_CONNECT_TIMEOUT:-15}" \ + --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then tryDownload "$url" if test -n "$success"; then finish; fi diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 02af2aaf5712..09816d9ba8e4 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -32,6 +32,10 @@ let # This variable allows the user to override hashedMirrors from the # command-line. "NIX_HASHED_MIRRORS" + + # This variable allows overriding the timeout for connecting to + # the hashed mirrors. + "NIX_CONNECT_TIMEOUT" ] ++ (map (site: "NIX_MIRRORS_${site}") sites); in From b4231634543f8f7ba228d47af9533d47380dec55 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 6 Feb 2013 16:32:35 +0100 Subject: [PATCH 067/248] Add Haskell package vty-ui --- .../libraries/haskell/vty-ui/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vty-ui/default.nix diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix new file mode 100644 index 000000000000..5d0c9ffd91a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -0,0 +1,20 @@ +{ cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text +, time, vector, vty +}: + +cabal.mkDerivation (self: { + pname = "vty-ui"; + version = "1.6"; + sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + filepath mtl QuickCheck random regexBase stm text time vector vty + ]; + meta = { + homepage = "http://jtdaugherty.github.com/vty-ui/"; + description = "An interactive terminal user interface library for Vty"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be8744c44939..ced07f324278 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1782,6 +1782,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vty = callPackage ../development/libraries/haskell/vty {}; + vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; + wai = callPackage ../development/libraries/haskell/wai {}; waiAppStatic = callPackage ../development/libraries/haskell/wai-app-static {}; From 6666acc77c0289b5c5280a9c538c2da28c2b0e7d Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 6 Feb 2013 16:54:27 +0100 Subject: [PATCH 068/248] Add Haskell package dyre This adds the Haskell package xdg-basedir as well. --- .../libraries/haskell/dyre/default.nix | 18 ++++++++++++++++++ .../libraries/haskell/xdg-basedir/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dyre/default.nix create mode 100644 pkgs/development/libraries/haskell/xdg-basedir/default.nix diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix new file mode 100644 index 000000000000..8b3d2cab677a --- /dev/null +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -0,0 +1,18 @@ +{ cabal, binary, executablePath, filepath, ghcPaths, ioStorage +, time, xdgBasedir +}: + +cabal.mkDerivation (self: { + pname = "dyre"; + version = "0.8.11"; + sha256 = "0sg5csshznbbyvq72s4sps7bkjlkfxiwcy4i3ip83lrxjw1msvr8"; + buildDepends = [ + binary executablePath filepath ghcPaths ioStorage time xdgBasedir + ]; + meta = { + homepage = "http://github.com/willdonnelly/dyre"; + description = "Dynamic reconfiguration in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix new file mode 100644 index 000000000000..3a12faf07c9e --- /dev/null +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -0,0 +1,14 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "xdg-basedir"; + version = "0.2.2"; + sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4"; + buildDepends = [ filepath ]; + meta = { + homepage = "http://github.com/willdonnelly/xdg-basedir"; + description = "A basic implementation of the XDG Base Directory specification"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be8744c44939..8a2302094760 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -751,6 +751,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dualTree = callPackage ../development/libraries/haskell/dual-tree {}; + dyre = callPackage ../development/libraries/haskell/dyre {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; editline = callPackage ../development/libraries/haskell/editline {}; @@ -1833,6 +1835,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; + xdgBasedir = callPackage ../development/libraries/haskell/xdg-basedir {}; + xdot = callPackage ../development/libraries/haskell/xdot { polyparse = self.polyparse_1_7; }; From b3ec511a1a3691825289b800faed4536ff63064a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 6 Feb 2013 15:38:44 -0500 Subject: [PATCH 069/248] sysbench: Fix URL --- pkgs/development/tools/misc/sysbench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 2860ac3731f0..f09ab2af7d1d 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; buildInputs = [ autoreconfHook mysql libxslt zlib ]; src = fetchurl { - url = mirror://sourceforge/sysbench/0.4.12/sysbench-0.4.12.tar.gz; + url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; preAutoreconf = '' From 9bd4d4e8a488976cf2faa0fb7bd6d3fcc305077e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Thu, 7 Feb 2013 03:37:50 +0400 Subject: [PATCH 070/248] warsow: Update to 1.03. --- pkgs/games/warsow/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index fc9beb239876..eac49f9ec69b 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { name = "warsow-${version}"; - version = "1.02"; + version = "1.03"; mversion = "1.02"; # sometimes only engine is updated src1 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/1.02/warsow_1.02_sdk.tar.gz"; - sha256 = "0b5vra4qihkkcw4jn54r8l2lyl2mp67b4y1m76nyz7f34vng1hdy"; + url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz"; + sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq"; }; src2 = fetchurl { - url = "http://www.warsow.net:1337/~warsow/1.02/warsow_1.02.tar.gz"; + url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz"; sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy"; }; unpackPhase = '' From 41b4931100afadd05b4904557ebcdbd9d628ddad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Feb 2013 13:47:41 +0100 Subject: [PATCH 071/248] firefox: Update to 18.0.2 --- pkgs/applications/networking/browsers/firefox/18.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix index 66acae130847..f9258792a2ec 100644 --- a/pkgs/applications/networking/browsers/firefox/18.0.nix +++ b/pkgs/applications/networking/browsers/firefox/18.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "18.0.1"; + firefoxVersion = "18.0.2"; - xulVersion = "18.0.1"; # this attribute is used by other packages + xulVersion = "18.0.2"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef"; + sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b"; }; commonConfigureFlags = From c4216ed1a0def62eadab5390feb58da7d4c89266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 7 Feb 2013 16:21:03 +0100 Subject: [PATCH 072/248] linux kernel: enabling SUNRPC_DEBUG Much easier debugging of nfs issues. If I understand correctly, it was enabled in 3.2 and below; I enable it for next kernels. --- pkgs/os-specific/linux/kernel/linux-3.3.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.4.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.5.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.6.nix | 3 +++ pkgs/os-specific/linux/kernel/linux-3.7.nix | 3 +++ 5 files changed, 15 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index b3660afaabbb..01b00b499cb5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -230,6 +230,9 @@ let # Devtmpfs support. DEVTMPFS y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 067f4be97dc0..aa568eb6d258 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -233,6 +233,9 @@ let # Devtmpfs support. DEVTMPFS y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index c5d694cfc5af..273697da6e3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -234,6 +234,9 @@ let # Devtmpfs support. DEVTMPFS y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 3447c9968e3c..987f14f09215 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -238,6 +238,9 @@ let MEDIA_CAMERA_SUPPORT? y MEDIA_RC_SUPPORT? y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 25e6f181defb..b5a28baca3ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -239,6 +239,9 @@ let MEDIA_RC_SUPPORT? y MEDIA_USB_SUPPORT y + # Easier debug of NFS issues + SUNRPC_DEBUG y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 4515ba0e488ecc73c3b844f86a984bc90f4047d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Feb 2013 16:32:00 +0100 Subject: [PATCH 073/248] postgresql: Update to latest versions CVE-2013-0255 --- pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index 713d85377380..b7f2d7d2a502 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.22"; in +let version = "8.3.23"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1iphzr8mpfz050f95vhcji4k22mih3wl65z4559y4hh4kiqg7f0p"; + sha256 = "1n8qj1bvyx83jsn2x2l8xzk53c014gkz8hwvswvnzcdyvlbnd90p"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index eef39aa40d61..37713d87fd57 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.15"; in +let version = "8.4.16"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0kdwg598c7ws2bvi5q5qgn2pbvznzpxs63chvp0xj6nzpcdpg0va"; + sha256 = "0bv10jh9pg523rzgbqjq4lzq4ai3275pqhkg0qkr40ap756xj0wd"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 4f87cbd55ae7..c0766ba2813b 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.11"; in +let version = "9.0.12"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0b3vw1a1x658famvgsfi1dladrbkc5j3h1ibaasgx9ffqn6xrp56"; + sha256 = "090m5cxw7jv9q2jgwbs3qm57z6ldf0mcavc0wsmqk1ywrdrniw40"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 83097f52124a..18716707fd9b 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.7"; in +let version = "9.1.8"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "10iw6c6v1s7a00s0dr8agvb2fg2dmdvg84mk05206rb0islyl6fz"; + sha256 = "0vacnhqs9mrjrx9vh4r66a9smwl1d4qrmjlsq3ydnqj0lbfzk20x"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 6341fa952f5b..45173ad6511a 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.2"; in +let version = "9.2.3"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1wzphj8vdqpzaihqmrkm9p4wlfvgr9psg5hnrmzwp5l8m5aai9z1"; + sha256 = "0zszqgp64pn7z9ab36bi989apj6hi20yxvcrk26jvhy0j0radxf4"; }; buildInputs = [ zlib readline ]; From 047f174801ed01877d97651c51759e5abe691354 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 7 Feb 2013 22:09:32 +0100 Subject: [PATCH 074/248] Remove old static versions of aterm/sdf2-bundle, don't build currently and not used anywhere. --- pkgs/development/compilers/strategoxt/0.18.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index c467b635423d..85d373afa0d8 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -4,20 +4,6 @@ rec { inherit aterm; - atermStatic = stdenv.mkDerivation ( rec { - name = "${aterm.name}-static"; - configureFlags = "--enable-shared=no --enable-static=yes"; - - inherit (aterm) src meta patches; - } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; - - sdfStatic = stdenv.mkDerivation ( rec { - name = "${sdf.name}-static"; - configureFlags = "--enable-shared=no --enable-static=yes"; - - inherit (sdf) src buildInputs preConfigure meta; - } // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ; - sdf = stdenv.mkDerivation ( rec { name = "sdf2-bundle-2.4"; From 2656f1df25284d82e59d534b9296709e47424b4d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 7 Feb 2013 22:19:09 +0100 Subject: [PATCH 075/248] Fix Firefox 13.0 URL. 13.0 is still used by selenium. --- pkgs/applications/networking/browsers/firefox/13.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index fbbf3275ad1a..1717a476e9ca 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -21,8 +21,8 @@ rec { src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1"; + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "1qwvs3rdmrnkjnjvhi3vh4mjdpxr43zcm7llc6z5qws9n9yx15n1"; }; commonConfigureFlags = From b2afb45b8dd8093011c96d879ac878c00377d747 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 8 Feb 2013 00:27:07 +0100 Subject: [PATCH 076/248] hplip: make pyqt4 dependency conditional on qtSupport --- pkgs/misc/drivers/hplip/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 8abdb232905e..5b9ef87a1297 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -60,10 +60,9 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ pythonDBus - pyqt4 pygobject recursivePthLoader - ]; + ] ++ stdenv.lib.optional qtSupport pyqt4; meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; From a328bce51bed0bad5b33c33bab4072aadd276b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 8 Feb 2013 00:52:59 +0100 Subject: [PATCH 077/248] Add Pillow, a fork of PIL (Python Imaging Library) This fork is used by Plone and other Python web platforms/frameworks because it is well maintained and setuptools friendly --- pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb2b301fa060..5efb56fe05fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1997,6 +1997,45 @@ pythonPackages = python.modules // rec { doCheck = false; }; + + pillow = buildPythonPackage rec { + name = "Pillow-1.7.8"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; + md5 = "41d8688d4db72673069a6dc63b5289d6"; + }; + + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib ]; + + configurePhase = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;' + ''; + + doCheck = true; + + meta = { + homepage = http://python-imaging.github.com/Pillow; + + description = "Fork of The Python Imaging Library (PIL)"; + + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + + license = "http://www.pythonware.com/products/pil/license.htm"; + + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + polib = buildPythonPackage rec { name = "polib-${version}"; version = "1.0.1"; From 8f51038a13f81cdb18603140936520782ed228a2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 7 Feb 2013 20:44:02 -0500 Subject: [PATCH 078/248] qemu-1.3.1 Also, old qemu is unreferenced in nixos and nixpkgs tree, so remove it absent explicit need. --- .../applications/virtualization/qemu/0.15.nix | 19 ----------------- pkgs/applications/virtualization/qemu/1.0.nix | 19 ----------------- .../virtualization/qemu/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +--- 4 files changed, 22 insertions(+), 41 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/0.15.nix delete mode 100644 pkgs/applications/virtualization/qemu/1.0.nix create mode 100644 pkgs/applications/virtualization/qemu/default.nix diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix deleted file mode 100644 index f75b21292430..000000000000 --- a/pkgs/applications/virtualization/qemu/0.15.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-0.15.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/1.0.nix b/pkgs/applications/virtualization/qemu/1.0.nix deleted file mode 100644 index daa0b74ee329..000000000000 --- a/pkgs/applications/virtualization/qemu/1.0.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }: - -stdenv.mkDerivation rec { - name = "qemu-1.0.1"; - - src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.gz"; - sha256 = "0y43v5ls3j7iqczfswxkksiqww77nllydncygih7ylc20zhh528r"; - }; - - buildInputs = [ python zlib pkgconfig glib SDL ncurses ]; - - meta = { - description = "QEmu processor emulator"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix new file mode 100644 index 000000000000..fabe3fed47df --- /dev/null +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }: + +stdenv.mkDerivation rec { + name = "qemu-1.3.1"; + + src = fetchurl { + url = "http://wiki.qemu.org/download/${name}.tar.bz2"; + sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip"; + }; + + buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ]; + + enableParallelBuilding = true; + + meta = { + description = "QEmu processor emulator"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ viric shlevy ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc71cdf14f12..2ae3e192c37a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7722,9 +7722,7 @@ let pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qemu = callPackage ../applications/virtualization/qemu/0.15.nix { }; - - qemu_1_0 = callPackage ../applications/virtualization/qemu/1.0.nix { }; + qemu = callPackage ../applications/virtualization/qemu { }; qemuImage = callPackage ../applications/virtualization/qemu/linux-img { }; From 01cbb17c12cee32d90ea17dd901284498c6f30e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Feb 2013 08:33:01 +0100 Subject: [PATCH 079/248] chromium: Fix updater to handle versions > 26. Starting with version 26, there is a chromium-$version-lite package and it is an LZMA archive as well, so download size is reduced by about 44%. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/update.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 2d95d466b2a8..cc38125c1933 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -78,7 +78,12 @@ get_channel_exprs() do channel="${chline%%,*}"; version="${chline##*,}"; - url="${bucket_url%/}/chromium-$version.tar.bz2"; + + # XXX: Remove case after version 26 is stable: + case "${version%%.*}" in + 26) url="${bucket_url%/}/chromium-$version-lite.tar.xz";; + *) url="${bucket_url%/}/chromium-$version.tar.bz2";; + esac; echo -n "Checking if sha256 of version $version is cached..." >&2; if sha256="$(sha_lookup "$version")"; From 9b726e94a82b735fd9e64c23410e245af0dbbca7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 7 Feb 2013 06:46:17 +0100 Subject: [PATCH 080/248] chromium: Update stable channel to v24.0.1312.69. Let's begin with the most trivial one: The stable version. This version just contains a few bug fixes and builds fine so far. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index a7687e731f5c..99919d3f772e 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -11,8 +11,8 @@ sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; stable = { - version = "24.0.1312.52"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; - sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; + version = "24.0.1312.69"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2"; + sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr"; }; } From dd832a3e8ffb5b7442e762139df688eacba4fbc8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 7 Feb 2013 06:48:15 +0100 Subject: [PATCH 081/248] chromium: Update beta channel to v25.0.1364.68. This update is a bit more problematic, as the bundled version of libpng is version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with libpng12 from nixpkgs, it seems to collide with parts of the bundled version. So, until this is either fixed upstream or we have a good solution, we're using bundled libpng for chromium version 25 and higher. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e32b31dc8569..3aeaf41ad571 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -50,7 +50,7 @@ let use_system_libexpat = true; use_system_libexif = true; use_system_libjpeg = true; - use_system_libpng = true; + use_system_libpng = !post24; use_system_libusb = true; use_system_libxml = true; use_system_speex = true; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 99919d3f772e..700aa9a4e001 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,9 +6,9 @@ sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; beta = { - version = "25.0.1364.36"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; - sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; + version = "25.0.1364.68"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2"; + sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9"; }; stable = { version = "24.0.1312.69"; From 59d79e97e844357de4c80bfb540f1a2de6e5a4c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 8 Feb 2013 07:02:32 +0100 Subject: [PATCH 082/248] virtualbox: Fix unpacking of extension pack. This fixes a typo introduced by 5a3f9c08b0e1e004606fe331bf34ad112c710bcd. Signed-off-by: aszlig --- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f699119c5f04..ea98d1ce7a9d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -121,7 +121,7 @@ in stdenv.mkDerivation { --base-dir "$libexec/ExtensionPacks" \ --cert-dir "$libexec/ExtPackCertificates" \ --name "Oracle VM VirtualBox Extension Pack" \ - --tarball "${extensionPack}" + --tarball "${extensionPack}" \ --sha-256 "${extensionPack.outputHash}" ''} From 265fea5788eb8ba21244263081064c5c306fe386 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 8 Feb 2013 08:45:15 +0100 Subject: [PATCH 083/248] google-talkplugin: Note how to get latest version. This is just in order to make it easier to determine the latest upstream version from the Packages file of Google's APT repository. Signed-off-by: aszlig --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 811847920c5d..365fd1e26131 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,6 +45,8 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; + # Use the following to determine the current upstream version: + # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' version = "3.10.2.0"; src = From 03bf52084969e0ee72898c4edd13b86305f1042e Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 8 Feb 2013 12:41:24 +0100 Subject: [PATCH 084/248] Update BLCR to version 0.8.5 --- pkgs/os-specific/linux/blcr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 169b020befd3..9c2821d7776f 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) -# BLCR 0.8.5_beta3 should works for kernel version up to 3.7.1 +# BLCR 0.8.5 should works for kernel version up to 3.7.1 assert stdenv.isLinux; -#assert builtins.compareVersions "2.6.39" kernel.version == 1; assert builtins.compareVersions "3.7.2" kernel.version == 1; stdenv.mkDerivation { - name = "blcr_${kernel.version}-0.8.5pre3"; + name = "blcr_${kernel.version}-0.8.5"; src = fetchurl { - url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.5_b3.tar.gz; - sha256 = "1xp2k140w79zqbnfnb2q7z91hv15d5a6p39zdc97f9pfxmyyc8fn"; + url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz; + sha256 = "01a809nfbr715pnidlslv55pxadm3021l97p98zkqy8chyrnkjb0"; }; buildInputs = [ perl makeWrapper ]; From 34411286a60c48f4b6c0bd45d0640ca10854269c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 15 Jan 2013 17:58:18 +0100 Subject: [PATCH 085/248] Update HOL Light to revision 154 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e62751cde9d4..ec5ab18a8b4f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20121213"; + name = "hol_light-20130106"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "153"; - sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0"; + rev = "154"; + sha256 = "191232kmbmjvk1f0n7pz0bydqvcnhbi4p2i6jidv7vm01m3nz9f9"; }; buildInputs = [ ocaml findlib camlp5 ]; From 42a4178c2b38c713aa57da413e62d7e7bd1b0f92 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Fri, 8 Feb 2013 15:26:35 +0100 Subject: [PATCH 086/248] Update HOL Light to revision 155 --- pkgs/applications/science/logic/hol_light/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index ec5ab18a8b4f..3ba9e7eb49f6 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20130106"; + name = "hol_light-20130124"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "154"; - sha256 = "191232kmbmjvk1f0n7pz0bydqvcnhbi4p2i6jidv7vm01m3nz9f9"; + rev = "155"; + sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr"; }; buildInputs = [ ocaml findlib camlp5 ]; From 86feda11066dfc41e527a4c7e7370b897a6c9534 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 8 Feb 2013 14:27:42 -0500 Subject: [PATCH 087/248] Add multilib gcc-4.6. libquadmath seems to require that the bootstrap gcc be multilib too. --- pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index c94a9285b29b..b77fd0885016 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; configureFlags = " - ${if enableMultilib then "" else "--disable-multilib"} + ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} ${if enablePlugin then "--enable-plugin" else ""} ${if ppl != null then "--with-ppl=${ppl}" else ""} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae3e192c37a..3cdec8938be4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2135,6 +2135,12 @@ let binutilsCross = null; })); + gcc46_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); + profiledCompiler = false; + enableMultilib = true; + })); + gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; # I'm not sure if profiling with enableParallelBuilding helps a lot. From 95452fa0f89f8c7ca2fdea3c88902f2434c1847d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 8 Feb 2013 14:58:30 -0500 Subject: [PATCH 088/248] stdenv_32bit: Use gcc46_multi. Fixes #80. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cdec8938be4..ab680b665b2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -229,7 +229,7 @@ let # just the plain stdenv. stdenv_32bit = lowPrio ( if system == "x86_64-linux" then - overrideGCC stdenv gcc43_multi + overrideGCC stdenv gcc46_multi else stdenv); From 831d72cede82b6228766ab36e902ef4977889c75 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 8 Feb 2013 18:26:38 -0500 Subject: [PATCH 089/248] Update rubygems. Particularly for rack-1.5.2, fixes CVE-2013-0263 and CVE-2013-0262. --- .../interpreters/ruby/generated.nix | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 92c5189e1055..aa64a7439266 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,7 +3,7 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_8_4; + ZenTest = g.ZenTest_4_9_0; actionmailer = g.actionmailer_3_2_11; actionpack = g.actionpack_3_2_11; activemodel = g.activemodel_3_2_11; @@ -39,11 +39,11 @@ g: # Get dependencies from patched gems minitar = g.minitar_0_5_3; multi_json = g.multi_json_1_5_0; net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_6_3; + net_ssh = g.net_ssh_2_6_5; nix = g.nix_0_1_1; nokogiri = g.nokogiri_1_5_6; polyglot = g.polyglot_0_3_3; - rack = g.rack_1_5_1; + rack = g.rack_1_5_2; rack_cache = g.rack_cache_1_2; rack_protection = g.rack_protection_1_3_2; rack_ssl = g.rack_ssl_1_3_3; @@ -52,7 +52,7 @@ g: # Get dependencies from patched gems railties = g.railties_3_2_11; rake = g.rake_10_0_3; rb_fsevent = g.rb_fsevent_0_9_3; - rdoc = g.rdoc_3_12; + rdoc = g.rdoc_3_12_1; rjb = g.rjb_1_4_6; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; @@ -77,7 +77,7 @@ g: # Get dependencies from patched gems }; gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''buildr'' ''fakes3'' ''foreman'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; gems = { - ZenTest_4_8_4 = { + ZenTest_4_9_0 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -104,9 +104,9 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.8.4''; + name = ''ZenTest-4.9.0''; requiredGems = [ ]; - sha256 = ''074k8smn2qfyyh32r0pja0wpcxbvlb6bhsc7rqrcjrisdjkngkrr''; + sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96''; }; actionmailer_3_2_11 = { basename = ''actionmailer''; @@ -127,7 +127,7 @@ installed versions.''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; name = ''actionpack-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; }; activemodel_3_2_11 = { @@ -223,7 +223,7 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_8_4 ]; + requiredGems = [ g.ZenTest_4_9_0 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; aws_sdk_1_8_1_2 = { @@ -630,7 +630,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_6_3 ]; + requiredGems = [ g.net_ssh_2_6_5 ]; sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; net_ssh_2_6_0 = { @@ -644,16 +644,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ g.jruby_pageant_1_1_1 ]; sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; }; - net_ssh_2_6_3 = { + net_ssh_2_6_5 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; + homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.3''; + name = ''net-ssh-2.6.5''; requiredGems = [ ]; - sha256 = ''1gmrchx9cn7s7ca97kwhrdxvlw5vs3cxpprrvqmhmi3knmnqcp9m''; + sha256 = ''1f21r78b0rm9gyzdc96fzih27nrags3pk00zlhfviqlfbmb1c48x''; }; nix_0_1_1 = { basename = ''nix''; @@ -695,7 +695,7 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_4_4 = { + rack_1_4_5 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -709,11 +709,11 @@ middleware) into a single method call. Also see http://rack.github.com/. ''; }; - name = ''rack-1.4.4''; + name = ''rack-1.4.5''; requiredGems = [ ]; - sha256 = ''1h0x50ng1s2jy6h5adw4a430vz8x28nskq099x3pjlpns6q632vz''; + sha256 = ''027k0nbb8d7cl24x2cywdc6lgrr4lwvdwwjk8wkgz8h9ism3zgzp''; }; - rack_1_5_1 = { + rack_1_5_2 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; @@ -727,9 +727,9 @@ middleware) into a single method call. Also see http://rack.github.com/. ''; }; - name = ''rack-1.5.1''; + name = ''rack-1.5.2''; requiredGems = [ ]; - sha256 = ''113gzaha2qx74y0wl940zlzrn9357yww6zrbyva05d09l749d21r''; + sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6''; }; rack_cache_1_2 = { basename = ''rack_cache''; @@ -739,7 +739,7 @@ Also see http://rack.github.com/. longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.''; }; name = ''rack-cache-1.2''; - requiredGems = [ g.rack_1_5_1 ]; + requiredGems = [ g.rack_1_5_2 ]; sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; }; rack_protection_1_3_2 = { @@ -750,7 +750,7 @@ Also see http://rack.github.com/. longDescription = ''You should use protection!''; }; name = ''rack-protection-1.3.2''; - requiredGems = [ g.rack_1_5_1 ]; + requiredGems = [ g.rack_1_5_2 ]; sha256 = ''0f69d491xciq1hb3mm26nxnsb3pvlf3gdkggj4ryiphimsy05n0k''; }; rack_ssl_1_3_3 = { @@ -762,7 +762,7 @@ Also see http://rack.github.com/. ''; }; name = ''rack-ssl-1.3.3''; - requiredGems = [ g.rack_1_5_1 ]; + requiredGems = [ g.rack_1_5_2 ]; sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5''; }; rack_test_0_6_2 = { @@ -776,7 +776,7 @@ to build on. Most of its initial functionality is an extraction of Merb 1.0's request helpers feature.''; }; name = ''rack-test-0.6.2''; - requiredGems = [ g.rack_1_5_1 ]; + requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; rails_3_2_11 = { @@ -798,7 +798,7 @@ request helpers feature.''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; name = ''railties-3.2.11''; - requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12 g.activesupport_3_2_11 g.actionpack_3_2_11 ]; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_11 g.actionpack_3_2_11 ]; sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; }; rake_0_9_2_2 = { @@ -845,7 +845,7 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; - rdoc_3_12 = { + rdoc_3_12_1 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -856,9 +856,9 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; - name = ''rdoc-3.12''; + name = ''rdoc-3.12.1''; requiredGems = [ g.json_1_7_6 ]; - sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; + sha256 = ''1hflgw2v0lyx38kdwj71jyibc14j6ghb6zmp2l3g47v7d2m47z4g''; }; rjb_1_4_2 = { basename = ''rjb''; @@ -990,7 +990,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; name = ''sinatra-1.3.2''; - requiredGems = [ g.rack_1_5_1 g.rack_protection_1_3_2 g.tilt_1_3_3 ]; + requiredGems = [ g.rack_1_5_2 g.rack_protection_1_3_2 g.tilt_1_3_3 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; sprockets_2_2_2 = { @@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_1 g.tilt_1_3_3 ]; + requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_2 g.tilt_1_3_3 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; systemu_2_5_2 = { @@ -1023,7 +1023,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''A thin and fast web server''; }; name = ''thin-1.5.0''; - requiredGems = [ g.rack_1_5_1 g.eventmachine_1_0_0 g.daemons_1_1_9 ]; + requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_0 g.daemons_1_1_9 ]; sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1''; }; thor_0_17_0 = { From fd2cff94796fdc7b9a2f816403de2496cf76d0d7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 8 Feb 2013 08:48:50 +0100 Subject: [PATCH 090/248] curl: Update to version 7.29.0. This version contains a security fix for CVE-2013-0249, for details please have a look at: http://curl.haxx.se/docs/adv_20130206.html Thanks to @roconnor for pointing this out. I'm pushing this to stdenv-updates because I'm not quite sure if it will break other things because 7.29.0 is now non-blocking by default. Plus the security vulnerability only affects IMAP, POP3 and SMTP protocol support. Signed-off-by: aszlig Cherry-picked into master, this won't change stdenv. Signed-off-by: Shea Levy --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 028b672380cf..bf6aaa249d0b 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.28.0"; + name = "curl-7.29.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b"; + sha256 = "0bw3sclhjqb2zwgcp6njjpaca62rwlj2mrw2r9wic47sqsxfhy4x"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From 0f66b8cb2066b9498776d46b2c3473f4cd06caea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 9 Feb 2013 10:01:02 -0500 Subject: [PATCH 091/248] gcc46_multi: Don't try to build on non-64-bit-linux --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab680b665b2b..be69751947c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2135,11 +2135,12 @@ let binutilsCross = null; })); - gcc46_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); - profiledCompiler = false; - enableMultilib = true; - })); + gcc46_multi = if system == "x86_64-linux" then lowPrio ( + wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); + profiledCompiler = false; + enableMultilib = true; + })) else throw "Multilib gcc not supported on this system"; gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; From 93ce537e10f4ac2a065a934208898eded7604c2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:12:56 +0100 Subject: [PATCH 092/248] tex4ht: texLiveAggregationFun expects the texmf directory in $out, not $out/share I also made some cosmetic changes to the expression. --- pkgs/tools/typesetting/tex/tex4ht/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 5d5d85d3c1d9..24612de549e0 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -4,9 +4,8 @@ stdenv.mkDerivation rec { name = "tex4ht-1.0.2009_06_11_1038"; src = fetchurl { - url = "http://www.tug.org/applications/tex4ht/tex4ht.zip"; - # http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${name}.tar.gz"; - sha1 = "2970cec5f4afc9039b82d6a4210f21d70ded2f5a"; + url = "http://tug.org/applications/tex4ht/tex4ht.zip"; + sha256 = "15gj18ihds6530af42clpa4zskak5kah9wzs2hd19a9ymwjsccd6"; }; buildInputs = [ tetex unzip ]; @@ -22,17 +21,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - for f in src/tex4ht src/t4ht src/htcmd bin/unix/*; do # */ - mv $f $out/bin/. + for f in src/tex4ht src/t4ht src/htcmd "bin/unix/"*; do + mv $f $out/bin/ done - - mkdir -p $out/share - cp -r texmf $out/share/. + mv texmf $out/ ''; meta = { - homepage = http://www.cse.ohio-state.edu/~gurari/TeX4ht/mn.html; - # LaTeX Project Public License - license = "LPPL"; + homepage = "http://tug.org/tex4ht/"; + description = "a system to convert (La)TeX documents to HTML and various other formats"; + license = "LPPL"; # LaTeX Project Public License }; -} \ No newline at end of file +} From 89c34e18ceb7394bcbd811307c67b5bbc75692d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:13:06 +0100 Subject: [PATCH 093/248] texLiveFull: add tex4ht --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be69751947c0..bb005d996238 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9078,7 +9078,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa ]; + texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions From fcac0afb3a1bb4b3da1aadd883512c1fa16cc49e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:17:32 +0100 Subject: [PATCH 094/248] haskell-Agda: jailbreak to support the latest version of 'hashtables' --- pkgs/development/libraries/haskell/Agda/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index a9d05596495c..ea32e6358987 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { xhtml zlib ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; From 2191cbb0a1b99d06e1b74eccb1a488fac352fbdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 095/248] haskell-darcs: update to version 2.8.4 --- pkgs/applications/version-management/darcs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 8ac93af8c466..86f9be93f685 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,18 +1,18 @@ { cabal, curl, extensibleExceptions, filepath, hashedStorage , haskeline, html, HTTP, mmap, mtl, network, parsec, random -, regexCompat, tar, terminfo, text, vector, zlib +, regexCompat, tar, terminfo, text, utf8String, vector, zlib }: cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.3"; - sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch"; + version = "2.8.4"; + sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz"; isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network parsec random regexCompat tar terminfo text vector - zlib + mmap mtl network parsec random regexCompat tar terminfo text + utf8String vector zlib ]; extraLibraries = [ curl ]; postInstall = '' From 4b3cd9711adfea09c75131c82c01af2768567f4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 096/248] haskell-HSH: update to version 2.1.0 --- pkgs/development/libraries/haskell/HSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index 40620901839d..f80f74a3dc2b 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HSH"; - version = "2.0.4"; - sha256 = "1ddpazmk82716hqd1riqs7vnl4aildgwkjgk80iam49df9p5b8v8"; + version = "2.1.0"; + sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; isLibrary = true; isExecutable = true; buildDepends = [ From a49ff02e7f3877b61ab6e813b8c29f642bf357b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 097/248] haskell-SDL-ttf: update to version 0.6.2 --- pkgs/development/libraries/haskell/SDL-ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f58674f25200..f1a0489167e5 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL-ttf"; - version = "0.6.1"; - sha256 = "0n6vbigkjfvvk98bp7ys14snpd1zmbz69ndhhpnrn02h363vwkal"; + version = "0.6.2"; + sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a"; buildDepends = [ SDL ]; extraLibraries = [ SDL_ttf ]; meta = { From 1a5b329cfd99970fa68bf91a618bf66ddec49d16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 098/248] haskell-base64-bytestring: update to version 1.0.0.1 --- .../libraries/haskell/base64-bytestring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index bc3eca3050df..5891131d7e85 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "1.0.0.0"; - sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; + version = "1.0.0.1"; + sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db"; meta = { homepage = "https://github.com/bos/base64-bytestring"; - description = "Fast base64 encoding and deconding for ByteStrings"; + description = "Fast base64 encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 256a2997f2c48c52b1788fae302a9d4fe1515365 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 099/248] haskell-classy-prelude-conduit: update to version 0.5.0 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 66a5b51b1896..0b4ae85c73a1 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.4.4"; - sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn"; + version = "0.5.0"; + sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit From fdf9782914b110aae344fbb2989a2c7d9b0fadba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 100/248] haskell-classy-prelude: update to version 0.5.0 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 4514e587051e..4033c3827669 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.4.4"; - sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all"; + version = "0.5.0"; + sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp"; buildDepends = [ basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector From e36304f9036e1d7dda55a33796f0c9d5bbdcee1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 101/248] haskell-hashtables: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 8b8616fce208..ae62c051ec5e 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.8"; - sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8"; + version = "1.1.0.2"; + sha256 = "0d103cvr168hgyghm6fp67r4lz1p592x45igwld6xq3nyxjxnbp9"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; From 58eedef652f34e5d75dc93dfd8eecf4cd268b40a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 102/248] haskell-project-template: update to version 0.1.2 --- .../libraries/haskell/project-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 04b0de35465c..a9a105358463 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.1"; - sha256 = "186hqfhhl77yq9gqiw59jbnkk7xmpljqfwwilzjkjknf3ifhs5na"; + version = "0.1.2"; + sha256 = "16rgarx78jwiimh3q8flxvmfraxmc1dxl8r04q4j1p9ap3mnvg61"; buildDepends = [ base64Bytestring base64Conduit classyPreludeConduit conduit mtl resourcet systemFileio systemFilepath text transformers From 587e82e085fb7c4fc58722d19fa86ddec429bfcc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 103/248] haskell-reflection: update to version 1.1.7 --- pkgs/development/libraries/haskell/reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index fbcaa58d777e..1819b3d217df 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.1.6"; - sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw"; + version = "1.1.7"; + sha256 = "073v9y09fvh7nsfqp1jp2ncrq0xkcv5fvikl769ghv2ycgkfxl4z"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; From e8de5bd8d91d0606595937304f66874ae6c37807 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 104/248] haskell-snap-core: update to version 0.9.3.1 --- pkgs/development/libraries/haskell/snap/core.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 8174c897a8c5..a20ec8e7ca5a 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,15 +7,14 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2.2"; - sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf"; + version = "0.9.3.1"; + sha256 = "1q2lk70l0hk4l6ksjnal1bfkby0i08gdzvj9cscvxs4njxmgdapq"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit MonadCatchIOTransformers mtl random regexPosix text time unixCompat unorderedContainers vector zlibEnum ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; From f5e1c00c68839aee954fe9e9d1f902de97376a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 105/248] haskell-snap-server: update to version 0.9.3.1 --- pkgs/development/libraries/haskell/snap/server.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 9250666430cb..3d25c6c215f4 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,14 +6,13 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.4"; - sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl"; + version = "0.9.3.1"; + sha256 = "0wagx1zy52fi4fldbzpsvk5hpdrma9lwsip9zrrbszxf446amd53"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator MonadCatchIOTransformers mtl network snapCore text time unixCompat ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; From 221e8b16495fd861e86ab83596d7881b1cd96026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 18:24:50 +0100 Subject: [PATCH 106/248] haskell-stylish-haskell: update to version 0.5.6.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 03ab9a2b84de..1ca325cbf172 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.5.2"; - sha256 = "1whl8qdqyw2saic70kav8srg4f6bcn77mc86m0vk8i8n5mb3q4ny"; + version = "0.5.6.0"; + sha256 = "1cy40b7csna3fwq0bm5mx9d09x52vj517mf38yn8ymd0afff67sb"; isLibrary = true; isExecutable = true; buildDepends = [ From 361b2facee31019dba39b7f210d33c85fc8d759f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 20:27:44 +0100 Subject: [PATCH 107/248] petidomo: add version 4.2 --- pkgs/servers/mail/petidomo/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/mail/petidomo/default.nix diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix new file mode 100644 index 000000000000..f6de9b7c9274 --- /dev/null +++ b/pkgs/servers/mail/petidomo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + +stdenv.mkDerivation rec { + name = "petidomo-4.2"; + + src = fetchurl { + url = "mirror://sourceforge/petidomo/${name}.tar.gz"; + sha256 = "0rckzsiqg819ids5784gmlf5p1lbjvavz0f5mwn10h34kclhi8bz"; + }; + + buildInputs = [ flex bison ]; + + configureFlags = "--with-mta=${sendmailPath}"; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + homepage = "http://petidomo.sourceforge.net/"; + description = "a simple and easy to administer mailing list server"; + license = stdenv.lib.licenses.gpl3plus; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb005d996238..53df74acf5b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5504,6 +5504,8 @@ let nginx = callPackage ../servers/http/nginx { }; + petidomo = callPackage ../servers/mail/petidomo { }; + popa3d = callPackage ../servers/mail/popa3d { }; postfix = callPackage ../servers/mail/postfix { }; From ad934df59769cb9a41d38acb065b9453be9371b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:02:48 +0100 Subject: [PATCH 108/248] boost: remove obsolete version 1.46.0 --- pkgs/development/libraries/boost/1.46.nix | 80 ----------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 81 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.46.nix diff --git a/pkgs/development/libraries/boost/1.46.nix b/pkgs/development/libraries/boost/1.46.nix deleted file mode 100644 index 0a64efdeb3bd..000000000000 --- a/pkgs/development/libraries/boost/1.46.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.46.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_46_0.tar.bz2"; - sha256 = "0ndsiv06332gbh6wj68pcnci3l5qrc5pm1ca9dkmxhpxj83zd41g"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53df74acf5b6..bdec4cb4672a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3439,7 +3439,6 @@ let boolstuff = callPackage ../development/libraries/boolstuff { }; boost144 = callPackage ../development/libraries/boost/1.44.nix { }; - boost146 = callPackage ../development/libraries/boost/1.46.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; From 37db55f3ec61481fa6a465b539552f8f3435cde2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:03:26 +0100 Subject: [PATCH 109/248] boost: remove obsolete version 1.51.0 --- .../libraries/boost/1.51-headers.nix | 26 ------ pkgs/development/libraries/boost/1.51.nix | 86 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 114 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.51-headers.nix delete mode 100644 pkgs/development/libraries/boost/1.51.nix diff --git a/pkgs/development/libraries/boost/1.51-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix deleted file mode 100644 index 6004eb799c01..000000000000 --- a/pkgs/development/libraries/boost/1.51-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.51.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; - sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 ./boost_1_51_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix deleted file mode 100644 index 8b040dd86473..000000000000 --- a/pkgs/development/libraries/boost/1.51.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if (enablePIC && enableExceptions) then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.51.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; - sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; - - crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdec4cb4672a..1a41c55173b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3441,13 +3441,11 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost151 = callPackage ../development/libraries/boost/1.51.nix { }; boost152 = callPackage ../development/libraries/boost/1.52.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; - boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders152; From e0cb8cb5e45765c00c317ae2c165fe11e75a4686 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:05:39 +0100 Subject: [PATCH 110/248] boost: switch default version from 1.52.0 to 1.53.0 --- 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 1a41c55173b8..74ec836b84d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3443,12 +3443,12 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost152 = callPackage ../development/libraries/boost/1.52.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; - boost = boost152; + boost = boost153; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; - boostHeaders = boostHeaders152; + boostHeaders = boostHeaders153; botan = callPackage ../development/libraries/botan { }; From 0edf39f1f8380519a5f88e12096cbea103e9dc53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:06:23 +0100 Subject: [PATCH 111/248] boost-headers: remove obsolete version 1.49.0 --- .../libraries/boost/1.49-headers.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.49-headers.nix diff --git a/pkgs/development/libraries/boost/1.49-headers.nix b/pkgs/development/libraries/boost/1.49-headers.nix deleted file mode 100644 index afb094a3cad5..000000000000 --- a/pkgs/development/libraries/boost/1.49-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.49.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2"; - sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xvf $src -C $out/include --strip-components=1 boost_1_49_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74ec836b84d4..cf86e21cdf7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3445,7 +3445,6 @@ let boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost153; - boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders153; From 227dd2695c43ae80efd0715f0f63fd3c95b5bbeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:06:45 +0100 Subject: [PATCH 112/248] boost: remove obsolete version 1.52.0 --- .../libraries/boost/1.52-headers.nix | 26 ------ pkgs/development/libraries/boost/1.52.nix | 91 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 119 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.52-headers.nix delete mode 100644 pkgs/development/libraries/boost/1.52.nix diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix deleted file mode 100644 index b9e594cf5f91..000000000000 --- a/pkgs/development/libraries/boost/1.52-headers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "boost-headers-1.52.0"; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 boost_1_52_0/boost - ''; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix deleted file mode 100644 index 367c2426b782..000000000000 --- a/pkgs/development/libraries/boost/1.52.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if (enablePIC && enableExceptions) then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.52.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; - sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - # normal install does not install bjam, this is a separate step - installPhase = '' - cd tools/build/v2 - sh bootstrap.sh - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install - ''; - - crossAttrs = rec { - buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; - # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to - # override them. - propagatedBuildInputs = buildInputs; - # We want to substitute the contents of configureFlags, removing thus the - # usual --build and --host added on cross building. - preConfigure = '' - export configureFlags="--prefix=$out --without-icu" - ''; - buildPhase = '' - set -x - cat << EOF > user-config.jam - using gcc : cross : $crossConfig-g++ ; - EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf86e21cdf7e..651589f29a9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3441,11 +3441,9 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; - boost152 = callPackage ../development/libraries/boost/1.52.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost153; - boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders153; From 28752752c0a0e542594a673b9d22786476c6c326 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 21:07:27 +0100 Subject: [PATCH 113/248] boost: rename patch for version 1.47.0 to include its version number in the file name --- pkgs/development/libraries/boost/1.47.nix | 2 +- .../{boost_filesystem.patch => boost_filesystem_1_47_0.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/libraries/boost/{boost_filesystem.patch => boost_filesystem_1_47_0.patch} (100%) diff --git a/pkgs/development/libraries/boost/1.47.nix b/pkgs/development/libraries/boost/1.47.nix index 4b0c4d3f1409..b8774b70265c 100644 --- a/pkgs/development/libraries/boost/1.47.nix +++ b/pkgs/development/libraries/boost/1.47.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { }; # See . - patches = [ ./boost_filesystem.patch ]; + patches = [ ./boost_filesystem_1_47_0.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boost/boost_filesystem.patch b/pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch similarity index 100% rename from pkgs/development/libraries/boost/boost_filesystem.patch rename to pkgs/development/libraries/boost/boost_filesystem_1_47_0.patch From 1b4fc7a095ab6a00e576969f04bc8b2fc0c7699f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 9 Feb 2013 15:09:46 -0500 Subject: [PATCH 114/248] rng-tools: add meta.platforms --- pkgs/tools/security/rng-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 3c99b22c1e14..446e25772f17 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } From f1b54f8ee2cb7c3b08972e6d5d6010e7a203edca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 22:50:50 +0100 Subject: [PATCH 115/248] mini-httpd: update to version 1.2 --- pkgs/servers/http/mini-httpd/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index a6ae56b65341..f853b3ebacc7 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boostHeaders }: -stdenv.mkDerivation { - name = "mini-httpd-1.1"; +stdenv.mkDerivation rec { + name = "mini-httpd-1.2"; src = fetchurl { - url = "mirror://savannah/mini-httpd/mini-httpd-1.1.tar.gz"; - sha256 = "12hqvh67hgxmc9b3fhb8gb5ash7j6f7d0mxv47zkmjl7k3vw3ny7"; + url = "mirror://savannah/mini-httpd/${name}.tar.gz"; + sha256 = "1547312rg2phxwny9vm1bkyid251n7wy4p1mgs6f5yq6ypwrsr6p"; }; - buildInputs = [ boost ]; + buildInputs = [ boostHeaders ]; + + enableParallelBuilding = true; meta = { homepage = "http://mini-httpd.nongnu.org/"; From 3c9386e19f7e0016afcc2a1fad90bcc3b44069e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 10 Feb 2013 00:08:29 +0100 Subject: [PATCH 116/248] Adding libeatmydata. It doesn't run very well with our symlinks in PATH, but I don't know what patch can make it work still. This is better than nothing; calling it with its full path makes it work. --- .../libraries/libeatmydata/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libeatmydata/default.nix diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix new file mode 100644 index 000000000000..48a0423653d6 --- /dev/null +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libeatmydata-65"; + + src = fetchurl { + url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la"; + }; + + meta = { + homepage = http://www.flamingspork.com/projects/libeatmydata/; + license = "GPLv3+"; + description = "Small LD_PRELOAD library to disable fsync and friends"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 651589f29a9b..1b20cb17856f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4204,6 +4204,8 @@ let libdwarf = callPackage ../development/libraries/libdwarf { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libebml = callPackage ../development/libraries/libebml { }; libedit = callPackage ../development/libraries/libedit { }; From 790af9124c28588d3006aeb57c9b14bcae462038 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Feb 2013 15:41:37 +0100 Subject: [PATCH 117/248] haskell-digestive-functors: update to version 0.6.0.1 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index df474e632719..4ba8b16ec46e 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.0.0"; - sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd"; + version = "0.6.0.1"; + sha256 = "1ni1hfmpz14yvgjphwz64hqhg7xbhvvqbdnapspipplvnl0rcmhi"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 09a3f9f7752fffff18a2ebb5c904acd844aff868 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Feb 2013 15:41:37 +0100 Subject: [PATCH 118/248] haskell-gitit: update to version 0.10.2 --- pkgs/development/libraries/haskell/gitit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index aa06d0178bed..db1b3c6c4671 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.1.2"; - sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; + version = "0.10.2"; + sha256 = "07zdc1qx429rmisb39gdamwn9b1jblvjg7py4fcxx3qj01b6mvxx"; isLibrary = true; isExecutable = true; buildDepends = [ From fde87b3a9bfb776e0873f0d97dc0e1e99907cab5 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 3 Feb 2013 10:06:51 -0800 Subject: [PATCH 119/248] add winetricks, modified by vcunat@gmail.com Originally from #89. --- pkgs/misc/emulators/wine/build_winetricks.sh | 17 ++++++++++++ pkgs/misc/emulators/wine/winetricks.nix | 28 ++++++++++++++++++++ pkgs/misc/emulators/wine/winetricks.patch | 21 +++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 4 files changed, 72 insertions(+) create mode 100644 pkgs/misc/emulators/wine/build_winetricks.sh create mode 100644 pkgs/misc/emulators/wine/winetricks.nix create mode 100644 pkgs/misc/emulators/wine/winetricks.patch diff --git a/pkgs/misc/emulators/wine/build_winetricks.sh b/pkgs/misc/emulators/wine/build_winetricks.sh new file mode 100644 index 000000000000..2d19e749f2db --- /dev/null +++ b/pkgs/misc/emulators/wine/build_winetricks.sh @@ -0,0 +1,17 @@ +#!bash +source $stdenv/setup +mkdir -p $out/bin +cp $src/src/winetricks $out/bin/winetricks +chmod +x $out/bin/winetricks +cd $out/bin +patch -u -p0 < $patch + +mkdir -p "$out/share/man/man1" +cp "$src/src/winetricks.1" "$out/share/man/man1/" + +patchShebangs "$out" + +substituteInPlace "$out/bin/winetricks" --replace "/usr/bin/perl" `which perl` + +# add stuff to PATH +sed -i "2i PATH=\"${pathAdd}:\${PATH}\"" "$out/bin/winetricks" diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix new file mode 100644 index 000000000000..8a0901ddb803 --- /dev/null +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } : + +stdenv.mkDerivation rec { + rev = "939"; + name = "winetricks-${rev}"; + + src = fetchsvn { + url = "http://winetricks.googlecode.com/svn/trunk"; + inherit rev; + }; + + buildInputs = [ perl which ]; + + pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum + [ wine perl which coreutils zenity curl cabextract unzip p7zip ] + + "/bin"; + + patch = ./winetricks.patch; + + builder = ./build_winetricks.sh; + + meta = { + description = "A script to install DLLs needed to work around problems in Wine"; + license = "LGPLv2.1"; + homepage = http://code.google.com/p/winetricks/; + }; +} + diff --git a/pkgs/misc/emulators/wine/winetricks.patch b/pkgs/misc/emulators/wine/winetricks.patch new file mode 100644 index 000000000000..f419a0dcee46 --- /dev/null +++ b/pkgs/misc/emulators/wine/winetricks.patch @@ -0,0 +1,21 @@ +--- upstream-winetricks 2013-01-12 13:26:12.333076904 -0800 ++++ winetricks 2013-01-12 14:37:39.675092352 -0800 +@@ -3398,7 +3398,7 @@ + WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0} + + # Mac folks tend to not have sha1sum, but we can make do with openssl +- if [ -x "`which sha1sum 2>/dev/null`" ] ++ if [ -e "`which sha1sum 2>/dev/null`" ] + then + WINETRICKS_SHA1SUM="sha1sum" + elif [ -x "`which openssl 2>/dev/null`" ] +@@ -3628,7 +3628,7 @@ + if ! test "$WINETRICKS_LIB" + then + WINETRICKS_SRCDIR=`dirname "$0"` +- WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; /bin/pwd` ++ WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; pwd` + + # Which GUI helper to use (none/zenity/kdialog). See winetricks_detect_gui. + WINETRICKS_GUI=none + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a2b8bc261fe..6ea9f4e7cd70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9142,6 +9142,12 @@ let # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; + # winetricks is a shell script with no binary components. Safe to just use the current platforms + # build instead of the i686 specific build. + winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + inherit (gnome2) zenity; + }; + x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; From 9299b2ed3e50e3292ddbf51eb7df7aa2bfb845bd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 Feb 2013 11:02:27 -0500 Subject: [PATCH 120/248] Fix petidomo license meta attribute --- pkgs/servers/mail/petidomo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index f6de9b7c9274..dfff754caf61 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://petidomo.sourceforge.net/"; description = "a simple and easy to administer mailing list server"; - license = stdenv.lib.licenses.gpl3plus; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; From ec4f56b3473a07cbaf7194d8ea374c4514499f73 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 Feb 2013 11:37:14 -0500 Subject: [PATCH 121/248] Revert "curl: Update to version 7.29.0." This reverts commit fd2cff94796fdc7b9a2f816403de2496cf76d0d7. nix's substituter fails with this curl, so revert it until that's fixed. --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bf6aaa249d0b..028b672380cf 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.29.0"; + name = "curl-7.28.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0bw3sclhjqb2zwgcp6njjpaca62rwlj2mrw2r9wic47sqsxfhy4x"; + sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains From 1c515819ef9df39ef309c58e052972a67159e276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 10 Feb 2013 21:23:45 +0400 Subject: [PATCH 122/248] e17: Update libs to 1.7.5, enlightenment to 0.17.1. --- pkgs/desktops/e17/default.nix | 8 +++++++ pkgs/desktops/e17/e_dbus/default.nix | 5 +++-- pkgs/desktops/e17/ecore/default.nix | 11 ++++++---- pkgs/desktops/e17/edje/default.nix | 8 +++++-- pkgs/desktops/e17/eet/default.nix | 4 ++-- pkgs/desktops/e17/eeze/default.nix | 4 ++-- pkgs/desktops/e17/efreet/default.nix | 4 ++-- pkgs/desktops/e17/eina/default.nix | 4 ++-- pkgs/desktops/e17/eio/default.nix | 24 +++++++++++++++++++++ pkgs/desktops/e17/elementary/default.nix | 19 ++++++++++++++++ pkgs/desktops/e17/embryo/default.nix | 4 ++-- pkgs/desktops/e17/emotion/default.nix | 19 ++++++++++++++++ pkgs/desktops/e17/enlightenment/default.nix | 12 ++++++----- pkgs/desktops/e17/ethumb/default.nix | 22 +++++++++++++++++++ pkgs/desktops/e17/evas/default.nix | 4 ++-- 15 files changed, 127 insertions(+), 25 deletions(-) create mode 100644 pkgs/desktops/e17/eio/default.nix create mode 100644 pkgs/desktops/e17/elementary/default.nix create mode 100644 pkgs/desktops/e17/emotion/default.nix create mode 100644 pkgs/desktops/e17/ethumb/default.nix diff --git a/pkgs/desktops/e17/default.nix b/pkgs/desktops/e17/default.nix index 6822c6419136..f241f3ff0a6d 100644 --- a/pkgs/desktops/e17/default.nix +++ b/pkgs/desktops/e17/default.nix @@ -10,6 +10,8 @@ rec { ecore = callPackage ./ecore { }; + eio = callPackage ./eio { }; + embryo = callPackage ./embryo { }; edje = callPackage ./edje { lua = pkgs.lua5; }; @@ -20,6 +22,12 @@ rec { eeze = callPackage ./eeze { }; + emotion = callPackage ./emotion { }; + + ethumb = callPackage ./ethumb { }; + + elementary = callPackage ./elementary { }; + #### WINDOW MANAGER diff --git a/pkgs/desktops/e17/e_dbus/default.nix b/pkgs/desktops/e17/e_dbus/default.nix index 1b3ba2c7256d..44eaf2328ec2 100644 --- a/pkgs/desktops/e17/e_dbus/default.nix +++ b/pkgs/desktops/e17/e_dbus/default.nix @@ -2,10 +2,10 @@ , dbus_libs }: stdenv.mkDerivation rec { name = "e_dbus-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1kky76v7yydsjihgi1hbwpyqhdmbxmxj2dw4p7kiqbl67dmsjhxg"; + sha256 = "16ckrpzzw5x1cs0fwqkk8431al55xil5magihkp9l3s77g0qd26q"; }; buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ]; propagatedBuildInputs = [ dbus_libs ]; @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { --disable-edbus-test-client --disable-edbus-notify-send --disable-edbus-notify-test + --disable-edbus-async-test ''; meta = { description = "Enlightenment's D-Bus wrapping and glue layer library"; diff --git a/pkgs/desktops/e17/ecore/default.nix b/pkgs/desktops/e17/ecore/default.nix index 47e9e05fd652..4a3eef4ec490 100644 --- a/pkgs/desktops/e17/ecore/default.nix +++ b/pkgs/desktops/e17/ecore/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }: +{ stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext, libXrender +, libXcomposite, libXfixes, libXdamage }: stdenv.mkDerivation rec { name = "ecore-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1fq3prr2i9n14jppfpns3dg1mkk3iy0ijv2d47pm4krymd7l4hs4"; + sha256 = "08ljda6p0zj1h5sq3l0js6mihw8cr6ydynn42dnka36vachvmfjb"; }; buildInputs = [ pkgconfig eina evas ]; - propagatedBuildInputs = [ libX11 libXext ]; + propagatedBuildInputs = [ libX11 libXext libXcomposite libXrender libXfixes + libXdamage + ]; meta = { description = "Enlightenment's core mainloop, display abstraction and utility library"; longDescription = '' diff --git a/pkgs/desktops/e17/edje/default.nix b/pkgs/desktops/e17/edje/default.nix index b48794e147ea..62758b2094e5 100644 --- a/pkgs/desktops/e17/edje/default.nix +++ b/pkgs/desktops/e17/edje/default.nix @@ -2,12 +2,16 @@ , ecore, embryo }: stdenv.mkDerivation rec { name = "edje-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "15vh0plb9gb75q0lgbqv4kjz0pyhbfxk39x3inzn87ih567z73xx"; + sha256 = "1hsyj46bk94yd9ymf9425pf4ygy36h5gdkg9fhf8qds8cnn2kcy7"; }; buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ]; + patchPhase = '' + substituteInPlace src/bin/edje_cc_out.c --replace '%s/embryo_cc' '${embryo}/bin/embryo_cc' + substituteInPlace src/bin/edje_cc_out.c --replace 'eina_prefix_bin_get(pfx),' "" + ''; meta = { description = "Enlightenment's abstract GUI layout and animation object library"; longDescription = '' diff --git a/pkgs/desktops/e17/eet/default.nix b/pkgs/desktops/e17/eet/default.nix index 6ac119161c52..079d07187ff4 100644 --- a/pkgs/desktops/e17/eet/default.nix +++ b/pkgs/desktops/e17/eet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }: stdenv.mkDerivation rec { name = "eet-${version}"; - version = "1.6.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1cq6i9g020mi5mr069jykx1fvihd18k1y4x49skmhzfh7dv10dfp"; + sha256 = "0ys2579v45f9x2n47shq0k63g0sdbj1ndhh72dvfajihsgjwd767"; }; buildInputs = [ pkgconfig eina zlib libjpeg ]; meta = { diff --git a/pkgs/desktops/e17/eeze/default.nix b/pkgs/desktops/e17/eeze/default.nix index 4931dbf62035..162fbcf1aef1 100644 --- a/pkgs/desktops/e17/eeze/default.nix +++ b/pkgs/desktops/e17/eeze/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, ecore, udev }: stdenv.mkDerivation rec { name = "eeze-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1v0n6bn3g04bjq0cxp6ixw7hb4kjbqpvywpvgik960xkn4pva76p"; + sha256 = "0274fs4cxgw6420yyz9frrc8zhj0qqyvwczzslq3kih3sx1nikxr"; }; buildInputs = [ pkgconfig eina ecore ]; propagatedBuildInputs = [ udev ]; diff --git a/pkgs/desktops/e17/efreet/default.nix b/pkgs/desktops/e17/efreet/default.nix index 960a8694b865..dfe755db5978 100644 --- a/pkgs/desktops/e17/efreet/default.nix +++ b/pkgs/desktops/e17/efreet/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina, eet, ecore }: stdenv.mkDerivation rec { name = "efreet-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1nydy3ahdq7q6b0xxaj79a8kd4b4xy3hzf1fdh117c9pwp4fxhl0"; + sha256 = "1yw7qjddqcnsz1vb693pa57v9wydvzfy198dc23mz46qfqx08nlg"; }; buildInputs = [ pkgconfig eina eet ecore ]; meta = { diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index 51b938790ec9..77d4829a8419 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1vchzb34hd9z8ghh75ch7sdf90gmzzpxryk3yq8hjcdxd0zjx9yj"; + sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; }; meta = { description = "Enlightenment's core data structure library"; diff --git a/pkgs/desktops/e17/eio/default.nix b/pkgs/desktops/e17/eio/default.nix new file mode 100644 index 000000000000..b56422fd7741 --- /dev/null +++ b/pkgs/desktops/e17/eio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, eet, eina, ecore }: +stdenv.mkDerivation rec { + name = "eio-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1bsam5q364kc4xwfv7pql6686gj0byhk42zwjqx9ajf70l23kss6"; + }; + buildInputs = [ pkgconfig eet eina ecore ]; + meta = { + description = "A library that integrates with EFL to provide efficient filesystem IO"; + longDescription = '' + Eio integrates with EFL (Ecore, Eina) to provide efficient filesystem Input/Output. + It use the best techniques to achieve such purpose, like using at-variants, splice, + properly handling errors and doing it in an asynchronous fashion by means of worker + threads. It is also ported to Windows, so multi-platform. + + Whenever you need to list a directory, copy, move or delete files, Eio will do that + task better than you'd achieve with naive implementations, and it is easy to use. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/elementary/default.nix b/pkgs/desktops/e17/elementary/default.nix new file mode 100644 index 000000000000..b0240d986dea --- /dev/null +++ b/pkgs/desktops/e17/elementary/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje }: +stdenv.mkDerivation rec { + name = "elementary-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "08cb4x9639xyrb8d4vzvhl6v385qjfswl717sicm7iimh5zlm2l9"; + }; + buildInputs = [ pkgconfig eina eet evas ecore edje ]; + meta = { + description = "Enlightenment's core data structure library"; + longDescription = '' + Enlightenment's Eina is a core data structure and common utility + library. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index f09bc6b2ded6..29f157545db1 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, eina }: stdenv.mkDerivation rec { name = "embryo-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0hcjlf0rljz4zs1y5l4h0gn2gyqb1h4msfsaps8flaym4mxrvvd9"; + sha256 = "104fsa179w2dfg00sfnap7c3b4ixcps4crxa6yav755awssdcim9"; }; buildInputs = [ pkgconfig eina ]; meta = { diff --git a/pkgs/desktops/e17/emotion/default.nix b/pkgs/desktops/e17/emotion/default.nix new file mode 100644 index 000000000000..42790162171c --- /dev/null +++ b/pkgs/desktops/e17/emotion/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }: +stdenv.mkDerivation rec { + name = "emotion-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw"; + }; + buildInputs = [ pkgconfig ecore evas eet eina edje ]; + meta = { + description = "A library to easily integrate media playback into EFL applications"; + longDescription = '' + Emotion is a library to easily integrate media playback into EFL applications, + it will take care of using Ecore's main loop and video display is done using Evas. + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index f8c57543f88f..1c3edb07ecf1 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }: +{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus +, embryo, eio, xcbutilkeysyms, libjpeg }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.16.999.65643"; + version = "0.17.1"; src = fetchurl { - url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz"; - sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz"; + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "1z2vx9r7yc55rs673jg7d685slgdv9dss45asg50wh5wxp2mfi3y"; }; - buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ]; + buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo + eio xcbutilkeysyms libjpeg ]; configureFlags = '' --with-profile=FAST_PC --disable-illume diff --git a/pkgs/desktops/e17/ethumb/default.nix b/pkgs/desktops/e17/ethumb/default.nix new file mode 100644 index 000000000000..3d1114e01717 --- /dev/null +++ b/pkgs/desktops/e17/ethumb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }: +stdenv.mkDerivation rec { + name = "ethumb-${version}"; + version = "1.7.5"; + src = fetchurl { + url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; + sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l"; + }; + buildInputs = [ pkgconfig eina evas ecore edje eet ]; + meta = { + description = "A thumbnail generation library"; + longDescription = '' + Ethumb - thumbnail generation library. Features: + * create thumbnails with a predefined frame (possibly an edje frame); + * have an option to create fdo-like thumbnails; + * have a client/server utility; + * TODO: make thumbnails from edje backgrounds, icons and themes; + ''; + homepage = http://enlightenment.org/; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix index 71b54f502a23..c271caa980d6 100644 --- a/pkgs/desktops/e17/evas/default.nix +++ b/pkgs/desktops/e17/evas/default.nix @@ -2,10 +2,10 @@ , libX11, libXext, eina, eet }: stdenv.mkDerivation rec { name = "evas-${version}"; - version = "1.2.0-alpha"; + version = "1.7.5"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "1lyya0nc8p0vs63azkflwq7lqqml94cqzjpg12h43sbvza342rsq"; + sha256 = "0x3k89q2wxgxjsbhdf4qws7jgpjl7rpqji98ca3nf25jf2lm1cvh"; }; buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg libX11 libXext eina eet From e2abed75ecc34f9da397f622f89edd8fdd5d405e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 10 Feb 2013 13:43:10 -0500 Subject: [PATCH 123/248] Revert "Revert "curl: Update to version 7.29.0."" This reverts commit ec4f56b3473a07cbaf7194d8ea374c4514499f73. With the added patch, the curl segfault seems to be fixed. --- pkgs/tools/networking/curl/default.nix | 6 ++-- .../curl/fix-curl-multi-cleanup.patch | 32 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 028b672380cf..88cdab38aafd 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.28.0"; + name = "curl-7.29.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b"; + sha256 = "0bw3sclhjqb2zwgcp6njjpaca62rwlj2mrw2r9wic47sqsxfhy4x"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { inherit sslSupport openssl; }; + patches = [ ./fix-curl-multi-cleanup.patch ]; + preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; diff --git a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch new file mode 100644 index 000000000000..f6e42040cb8e --- /dev/null +++ b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch @@ -0,0 +1,32 @@ +commit 249c981407b8c52edf2b0833a78cd3d3d8bd2823 +Author: Shea Levy +Date: Sun Feb 10 13:27:10 2013 -0500 + + curl_multi_cleanup: Don't try to cleanup the closure_handle if it is NULL. + + Without this, curl_multi_cleanup(curl_multi_init()) segfaults. + + Signed-off-by: Shea Levy + +diff --git a/lib/multi.c b/lib/multi.c +index fa0afb9..5b9d0bb 100644 +--- a/lib/multi.c ++++ b/lib/multi.c +@@ -1773,11 +1773,13 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) + /* Close all the connections in the connection cache */ + close_all_connections(multi); + +- multi->closure_handle->dns.hostcache = multi->hostcache; +- Curl_hostcache_clean(multi->closure_handle); ++ if (multi->closure_handle) { ++ multi->closure_handle->dns.hostcache = multi->hostcache; ++ Curl_hostcache_clean(multi->closure_handle); + +- Curl_close(multi->closure_handle); +- multi->closure_handle = NULL; ++ Curl_close(multi->closure_handle); ++ multi->closure_handle = NULL; ++ } + + Curl_hash_destroy(multi->sockhash); + multi->sockhash = NULL; From 956f9003311d8df56fb5306f1dccee049742af76 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 11 Feb 2013 01:18:23 +0400 Subject: [PATCH 124/248] Current Monotone needs older Boost --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ea9f4e7cd70..7a5639fe2dd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7538,6 +7538,7 @@ let monotone = callPackage ../applications/version-management/monotone { lua = lua5; + boost = boost149; }; monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) { From 18c24bab3f2f45d9222eea6743eeb26a1bf06c95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 11:16:36 +0100 Subject: [PATCH 125/248] haskell-HTTP: update to version 4000.2.8 --- .../libraries/haskell/HTTP/{4000.2.7.nix => 4000.2.8.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.7.nix => 4000.2.8.nix} (81%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.7.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 0711e47b005d..6cb7ed57b4c4 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.7"; - sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2"; + version = "4000.2.8"; + sha256 = "0p0cwzjw2102bsyfaga6m8b53s6qnhd6byg2j2qla653f6kjlsh8"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f8cfe242cbf7..ac9cdbcf28e4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_7; # 7.6 ok + HTTP = self.HTTP_4000_2_8; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_0; # 7.6 ok @@ -977,8 +977,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_7 = callPackage ../development/libraries/haskell/HTTP/4000.2.7.nix {}; - HTTP = self.HTTP_4000_2_7; + HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; + HTTP = self.HTTP_4000_2_8; httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; From 8fa1ce00f25eadcfae992f368dacbace44e28bed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 14:37:15 +0100 Subject: [PATCH 126/248] petidomo: update to version 4.3 --- pkgs/servers/mail/petidomo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index dfff754caf61..6c6cde8a46a6 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }: stdenv.mkDerivation rec { - name = "petidomo-4.2"; + name = "petidomo-4.3"; src = fetchurl { url = "mirror://sourceforge/petidomo/${name}.tar.gz"; - sha256 = "0rckzsiqg819ids5784gmlf5p1lbjvavz0f5mwn10h34kclhi8bz"; + sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm"; }; buildInputs = [ flex bison ]; From 26dd2dc4255030ea0cfc1074b040d1b3712992cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2013 15:27:18 +0100 Subject: [PATCH 127/248] nixUnstable: Update to 1.4pre3056_79a3ba7 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 61fe8295a903..38dd3fa809bc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.4pre3048_99ed558"; + name = "nix-1.4pre3056_79a3ba7"; src = fetchurl { - url = "http://hydra.nixos.org/build/3851906/download/5/${name}.tar.xz"; - sha256 = "4b2a75200d8b7ac21887f061b68b4e34d1edd69616916f86072d6f5bc7260d90"; + url = "http://hydra.nixos.org/build/4070551/download/5/${name}.tar.xz"; + sha256 = "7478fd6fea91ec094645e8487b9ef001abd300703d79e04743f4d212469cf13d"; }; buildNativeInputs = [ perl pkgconfig ]; From e4ce304333965231338bdefe0f53409d2055323c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2013 15:28:41 +0100 Subject: [PATCH 128/248] =?UTF-8?q?types.nix:=20Add=20a=20=E2=80=98lines?= =?UTF-8?q?=E2=80=99=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is like types.string, but values are merged by putting a newline in between them. This is mostly useful for configuration file options, where we don't want values accidentally ending up on the same line. Note that almost all options with string type in NixOS should either be unmergable (i.e. should be marked with ‘types.uniq’) or should actually be of type ‘lines’. So it might make sense to remove the merge function for the ‘string’ type eventually. --- pkgs/lib/types.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 1cb1185b8bb8..6ddac61d91bf 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -68,6 +68,14 @@ rec { merge = lib.concatStrings; }; + # Like ‘string’, but add newlines between every value. Useful for + # configuration file contents. + lines = mkOptionType { + name = "string"; + check = lib.traceValIfNot builtins.isString; + merge = lib.concatStringsSep "\n"; + }; + envVar = mkOptionType { name = "environment variable"; inherit (string) check; From 76a5e89a1c2720b86ccc8eebe90ee0c839264dbb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2013 15:34:30 +0100 Subject: [PATCH 129/248] linux: Update to 3.2.38 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index b44caef147f3..afa62fe7798e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.2.37"; + version = "3.2.38"; testing = false; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948"; + sha256 = "10hm4cy56xjl5ckv3jj3grw31qfhwrgia0wq71c34dw0mv3bix8w"; }; config = configWithPlatform stdenv.platform; From b58e991272dca9dd906f71870da10ded1a61f6cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 16:50:39 +0100 Subject: [PATCH 130/248] all-packages.nix: provide a variant of Darcs that includes the executable, but not the library The reduced 'darcs' derivation is supposed to be run-time independent of the Haskell compiler. Unfortunately, this isn't quite true yet because the HTTP package bakes its own store path into the library. This causes Darcs -- which links the HTTP library statically -- to depend on 'HTTP', which in turn depends on lot of other Haskell stuff. Patching HTTP to get rid of that reference looks feasible, though. --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a5639fe2dd9..1a3b1043e25c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6813,7 +6813,14 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = lib.setName "darcs-${haskellPackages.darcs.version}" haskellPackages.darcs; + darcs = haskellPackages.darcs.override { + # A variant of the Darcs derivation that containts only the executable and + # thus has no dependencies on other Haskell packages. + cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; + }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; From 70c94bf5c6082a0a90c84f6aa7b2897f6895b8fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 16:52:13 +0100 Subject: [PATCH 131/248] darcs: build against the latest versions of the 'tar' and 'haskeline' dependencies --- pkgs/top-level/haskell-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ac9cdbcf28e4..6d877b866dc2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2000,10 +2000,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs { - tar = self.tar_0_3_2_0; - haskeline = self.haskeline_0_6_4_7; - }; + darcs = callPackage ../applications/version-management/darcs {}; leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; From 7c2e9cf2bf781e588a02794145dab49cdf9380d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2013 17:45:42 +0100 Subject: [PATCH 132/248] dhcpcd: Update to 5.6.7 --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index dc2a84982239..6ed89adee6ee 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.5.6"; + name = "dhcpcd-5.6.7"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5"; + sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h"; }; configureFlags = "--sysconfdir=/etc"; From a3da633b840bfcd6748f4cfd62e697b924c68edb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Feb 2013 17:45:56 +0100 Subject: [PATCH 133/248] openresolv: Update to 3.5.4 --- pkgs/tools/networking/openresolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3aa818db7281..2879c5cc1a15 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openresolv-3.4.6"; + name = "openresolv-3.5.4"; src = fetchurl { url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; - sha256 = "026z4973b0vqp5acr6mn5fyxyc84y4ahg1f8fddh8dph86jcnhba"; + sha256 = "0in40iha4ghk12lr2p65v0by3h0jp7qsdajmj4vm7iis0plzr4db"; }; configurePhase = From 170b0c9e2ebc4f9603a7776bba1a8eed5295ad9a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 11 Feb 2013 12:34:14 -0500 Subject: [PATCH 134/248] Linux 3.7.7 --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index b5a28baca3ec..fb9ff3e50535 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -250,7 +250,7 @@ in import ./generic.nix ( rec { - version = "3.7.6"; + version = "3.7.7"; testing = false; preConfigure = '' @@ -259,7 +259,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0r5njypz4ypcq1g7wpfzscc267k0zm0xh916rk3ypi0vj55k6pdv"; + sha256 = "176jhdpsyma1h4vz94jba3qxjnzlxakki1rqh8xf25zmdd25iygz"; }; config = configWithPlatform stdenv.platform; From 45e877f706669a75963f5f4daf462c548370afd2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 11 Feb 2013 12:53:43 -0500 Subject: [PATCH 135/248] Linux 3.0.63 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 18ef471f4afb..0050c7085b08 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.62"; + version = "3.0.63"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0bmvsh3n8llx2zynd2q3z0hg3i3ib36yr4j5pd7jlapf8pzmgi25"; + sha256 = "04c3f49sssm7vad41axk314ccw368ybww4ag2rymmsmygfy32g92"; }; config = configWithPlatform stdenv.platform; From 3a8631201e8b5be8f72df254d31c87a28ffe7754 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 11 Feb 2013 12:57:40 -0500 Subject: [PATCH 136/248] Linux 3.4.30 --- 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 aa568eb6d258..c614bdd7ff2a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.4.29"; + version = "3.4.30"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "117s6q71hf0p88bfpj7nsa7rdmz35b0c1vw5x87fd2ysb5lvnz4i"; + sha256 = "1vfw4l3g5fsvxk6pihmcyyfvfmwpsn7vcd6kqg6vm8hcjzdx2iq0"; }; config = configWithPlatform stdenv.platform; From b97aa0c4b126b34d40834380f353eeb91d1e8d96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 11 Feb 2013 14:31:12 -0500 Subject: [PATCH 137/248] Update rubygems. More vulnerabilities: https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58 https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/KtmwSbEpzrU https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8 --- .../interpreters/ruby/generated.nix | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index aa64a7439266..08c07a719735 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -4,12 +4,12 @@ g: # Get dependencies from patched gems { aliases = { ZenTest = g.ZenTest_4_9_0; - actionmailer = g.actionmailer_3_2_11; - actionpack = g.actionpack_3_2_11; - activemodel = g.activemodel_3_2_11; - activerecord = g.activerecord_3_2_11; - activeresource = g.activeresource_3_2_11; - activesupport = g.activesupport_3_2_11; + actionmailer = g.actionmailer_3_2_12; + actionpack = g.actionpack_3_2_12; + activemodel = g.activemodel_3_2_12; + activerecord = g.activerecord_3_2_12; + activeresource = g.activeresource_3_2_12; + activesupport = g.activesupport_3_2_12; arel = g.arel_3_0_2; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; @@ -17,7 +17,7 @@ g: # Get dependencies from patched gems builder = g.builder_3_1_4; buildr = g.buildr_1_4_9; bundler = g.bundler_1_2_3; - childprocess = g.childprocess_0_3_7; + childprocess = g.childprocess_0_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; @@ -31,13 +31,13 @@ g: # Get dependencies from patched gems i18n = g.i18n_0_6_1; journey = g.journey_1_0_4; jruby_pageant = g.jruby_pageant_1_1_1; - json = g.json_1_7_6; - json_pure = g.json_pure_1_7_6; + json = g.json_1_7_7; + json_pure = g.json_pure_1_7_7; macaddr = g.macaddr_1_6_1; mail = g.mail_2_4_4; - mime_types = g.mime_types_1_20_1; + mime_types = g.mime_types_1_21; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_5_0; + multi_json = g.multi_json_1_5_1; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_5; nix = g.nix_0_1_1; @@ -48,8 +48,8 @@ g: # Get dependencies from patched gems rack_protection = g.rack_protection_1_3_2; rack_ssl = g.rack_ssl_1_3_3; rack_test = g.rack_test_0_6_2; - rails = g.rails_3_2_11; - railties = g.railties_3_2_11; + rails = g.rails_3_2_12; + railties = g.railties_3_2_12; rake = g.rake_10_0_3; rb_fsevent = g.rb_fsevent_0_9_3; rdoc = g.rdoc_3_12_1; @@ -108,71 +108,71 @@ installed versions.''; requiredGems = [ ]; sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96''; }; - actionmailer_3_2_11 = { + actionmailer_3_2_12 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.11''; - requiredGems = [ g.actionpack_3_2_11 g.mail_2_4_4 ]; - sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn''; + name = ''actionmailer-3.2.12''; + requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ]; + sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7''; }; - actionpack_3_2_11 = { + actionpack_3_2_12 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; - sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; + name = ''actionpack-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk''; }; - activemodel_3_2_11 = { + activemodel_3_2_12 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.builder_3_0_4 ]; - sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf''; + name = ''activemodel-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ]; + sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf''; }; - activerecord_3_2_11 = { + activerecord_3_2_12 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.arel_3_0_2 g.tzinfo_0_3_35 ]; - sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw''; + name = ''activerecord-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_35 ]; + sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi''; }; - activeresource_3_2_11 = { + activeresource_3_2_12 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 ]; - sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h''; + name = ''activeresource-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ]; + sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi''; }; - activesupport_3_2_11 = { + activesupport_3_2_12 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.11''; - requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ]; - sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s''; + name = ''activesupport-3.2.12''; + requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ]; + sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg''; }; arel_3_0_2 = { basename = ''arel''; @@ -234,7 +234,7 @@ rails support and extra plugins for migrations and fixtures.''; longDescription = ''AWS SDK for Ruby''; }; name = ''aws-sdk-1.8.1.2''; - requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_6 ]; + requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ]; sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x''; }; builder_3_0_4 = { @@ -312,16 +312,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w''; }; - childprocess_0_3_7 = { + childprocess_0_3_8 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.7''; + name = ''childprocess-0.3.8''; requiredGems = [ g.ffi_1_3_1 ]; - sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84''; + sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4''; }; daemons_1_1_9 = { basename = ''daemons''; @@ -513,16 +513,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; }; - json_1_7_6 = { + json_1_7_7 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.6''; + name = ''json-1.7.7''; requiredGems = [ ]; - sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a''; + sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x''; }; json_pure_1_7_5 = { basename = ''json_pure''; @@ -535,16 +535,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; }; - json_pure_1_7_6 = { + json_pure_1_7_7 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.6''; + name = ''json_pure-1.7.7''; requiredGems = [ ]; - sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00''; + sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6''; }; macaddr_1_6_1 = { basename = ''macaddr''; @@ -565,16 +565,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 g.i18n_0_6_1 ]; + requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_1 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; - mime_types_1_20_1 = { + mime_types_1_21 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.20.1 with new MIME types. The identification of MIME +type. This is release 1.21 with new MIME types. The identification of MIME content type is based on a file's filename extensions. MIME types are used in MIME-compliant communications, as in e-mail or @@ -596,9 +596,9 @@ follows the official {IANA registry}[http://www.iana.org/assignments/media-types ({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].''; }; - name = ''mime-types-1.20.1''; + name = ''mime-types-1.21''; requiredGems = [ ]; - sha256 = ''13l7avr24nwzk0xpyqh04iqpf58vqsb3bbqjmjr04bsryq8azlb0''; + sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw''; }; minitar_0_5_3 = { basename = ''minitar''; @@ -611,16 +611,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_5_0 = { + multi_json_1_5_1 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.5.0''; + name = ''multi_json-1.5.1''; requiredGems = [ ]; - sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79''; + sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -779,27 +779,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_3_2_11 = { + rails_3_2_12 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ]; - sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m''; + name = ''rails-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ]; + sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz''; }; - railties_3_2_11 = { + railties_3_2_12 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.11''; - requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_11 g.actionpack_3_2_11 ]; - sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; + name = ''railties-3.2.12''; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_12 g.actionpack_3_2_12 ]; + sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -857,7 +857,7 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12.1''; - requiredGems = [ g.json_1_7_6 ]; + requiredGems = [ g.json_1_7_7 ]; sha256 = ''1hflgw2v0lyx38kdwj71jyibc14j6ghb6zmp2l3g47v7d2m47z4g''; }; rjb_1_4_2 = { @@ -943,7 +943,7 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.4''; - requiredGems = [ g.json_pure_1_7_6 ]; + requiredGems = [ g.json_pure_1_7_7 ]; sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; }; rubyzip_0_9_9 = { @@ -979,7 +979,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.29.0''; - requiredGems = [ g.multi_json_1_5_0 g.rubyzip_0_9_9 g.childprocess_0_3_7 g.websocket_1_0_7 ]; + requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ]; sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; sinatra_1_3_2 = { @@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_2 g.tilt_1_3_3 ]; + requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; systemu_2_5_2 = { From e8982e11a46cb923b70a69a7f0560b26fa606010 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 21:15:17 +0100 Subject: [PATCH 138/248] texlive-moderncv: update to version 1.3.0 --- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 2d422385bd55..e490d55bc5f8 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,10 +1,10 @@ args: with args; rec { - version = "1.1.1"; + version = "1.3.0"; name = "moderncv-${version}"; src = fetchurl { url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; - sha256 = "929c118eff339a5c59ed58cc961ddee787e9a5933d12ec8801613fd2e2500e9f"; + sha256 = "0wdj90shi04v97b2d6chhvm9qrp0bcvsm46441730ils1y74wisq"; }; buildInputs = [texLive unzip]; From 4cb80bdb1e3bcd89dbc1d7e55d6465cd825f63f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Tue, 12 Feb 2013 00:59:26 +0400 Subject: [PATCH 139/248] warsow: Fix for ui module downloaded from server. --- pkgs/games/warsow/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index eac49f9ec69b..aeb7e37cd7e4 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype +, makeWrapper }: stdenv.mkDerivation rec { name = "warsow-${version}"; @@ -25,18 +26,20 @@ stdenv.mkDerivation rec { substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; + libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper + ]; installPhase = '' dest=$out/opt/warsow cd release - for f in warsow wsw_server wswtv_server; do - substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest - done mkdir -p $dest mkdir -p $out/bin - cp -v {warsow,wsw_server,wswtv_server}.* $dest + cp -v {warsow,wsw_server,wswtv_server}* $dest cp -rv basewsw libs $dest - cp -v warsow wsw_server wswtv_server $out/bin + # Since 1.03 some modules are _always_ downloaded from server, thus + makeWrapper $dest/warsow $out/bin/warsow \ + --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib" + makeWrapper $dest/wsw_server $out/bin/wsw_server + makeWrapper $dest/wswtv_server $out/bin/wswtv_server ''; postFixup = '' p=$out/opt/warsow/warsow.* From 97faa4c319c5784ba1ee52fc3715e2432c73305c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 23:25:19 +0100 Subject: [PATCH 140/248] ghc-with-packages.nix: include man pages in the generated profile --- pkgs/development/compilers/ghc/with-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 07071ef8414a..3494f63c11c8 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { ln -s $f $out/etc/bash_completion.d/ echo -n . done + for s in 1 2 3 4 5 6 7 8 9; do + for f in "$currentPath/share/man/man$s/"*; do + mkdir -p $out/share/man/man$s + ln -sv $f $out/share/man/man$s/ + echo -n . + done + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . From 801237ceb28f362266ac15438b688bb7eacca468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 11 Feb 2013 23:25:37 +0100 Subject: [PATCH 141/248] xmonad: install man page into the proper location --- pkgs/applications/window-managers/xmonad/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index a15755205ee6..0b8b71db7e92 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions filepath mtl utf8String X11 ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ + ''; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; From ec9c096e25b6403a9b8a0f217ada3870c1cad556 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 12 Feb 2013 10:42:19 +0100 Subject: [PATCH 142/248] flashplayer-11: Update to version 11.2.202.262. This update contains security fixes for two vulnerabilities, for details please have a look at: http://www.adobe.com/support/security/bulletins/apsb13-04.html Signed-off-by: aszlig --- .../mozilla-plugins/flashplayer-11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 7e2bfb692a3e..47f99a1d555c 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,9 +44,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz"; - sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +55,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz"; - sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx"; } else throw "Flash Player is not supported on this platform"; From 5d6ffdb623f1f5d1a0e8e0007016faea65369258 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 12 Feb 2013 11:35:21 +0100 Subject: [PATCH 143/248] xcodeenv: Allow app names with with spaces in them --- pkgs/development/mobile/xcodeenv/simulate-app.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 456732abe1f4..e3eff458d272 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -2,14 +2,14 @@ {name, app, device ? "iPhone", baseDir ? ""}: stdenv.mkDerivation { - inherit name; + name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' ensureDir $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd ${app}/${baseDir}/${name}.app - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}' + cd '${app}/${baseDir}/${name}.app' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator ''; From 95c04df02d1bd1e4e76eddc1b449ffba68fed69d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Feb 2013 23:07:35 +0100 Subject: [PATCH 144/248] haskell-hsdns: update to version 1.6 --- pkgs/development/libraries/haskell/hsdns/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 2a83df47f090..b72f4d947c48 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "hsdns"; - version = "1.5"; - sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; + version = "1.6"; + sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa"; buildDepends = [ network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { - homepage = "http://gitorious.org/hsdns"; + homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; - license = "LGPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres From 7d5936856af03100e5824304d06d84414d1b9465 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 12 Feb 2013 23:07:35 +0100 Subject: [PATCH 145/248] haskell-hsyslog: update to version 1.5 --- pkgs/development/libraries/haskell/hsyslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index d5043024fd63..e26a9d9e02a3 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "hsyslog"; - version = "1.4"; - sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; + version = "1.5"; + sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp"; meta = { - homepage = "http://gitorious.org/hsyslog"; + homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From a0a6f0edfd5e304f00a44c98dc03898b2fa8b2c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 13 Feb 2013 13:53:41 +0100 Subject: [PATCH 146/248] releaseTools.nixBuild: Support builds with multiple outputs --- pkgs/build-support/release/nix-build.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 336563ae285f..a107e6522913 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -46,17 +46,17 @@ stdenv.mkDerivation ( header "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR - stopNest + stopNest fi fi ''; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' . ${./functions.sh} origSrc=$src @@ -75,7 +75,10 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doCoverageAnalysis}" ]; then - echo "nix-build none $out" >> $out/nix-support/hydra-build-products + for i in $outputs; do + if [ "$i" = out ]; then j=none; else j="$i"; fi + echo "nix-build $j ''${!i}" >> $out/nix-support/hydra-build-products + done fi ''; From e8f590c3d996b8da348a0c92ca471373aa03afd5 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 13 Feb 2013 14:36:28 +0100 Subject: [PATCH 147/248] Make the source of the titanium SDK configurable --- .../mobile/titaniumenv/titaniumsdk.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index d3831a9c2bea..b4cd1a98fb06 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { name = "titanium-mobilesdk-2.1.5.v20121112144658"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; - sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; - sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = if src == null then + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; + sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; + sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; + } + else throw "Platform: ${stdenv.system} not supported!" + else src; buildInputs = [ unzip makeWrapper ]; From 9642adef3222a2cf9f883b97b7c5de6e172ca50b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 13 Feb 2013 15:57:16 +0100 Subject: [PATCH 148/248] libsoup: Update to 2.40.3 --- pkgs/development/libraries/libsoup/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 87aaafabcc4b..e0c00d07044f 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-2.40.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz; + sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9"; }; + buildNativeInputs = [ pkgconfig intltool python ]; - buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + preConfigure = '' + substituteInPlace libsoup/tld-parser.py \ + --replace "/usr/bin/env python" ${python}/bin/python + ''; + meta = { inherit (glib.meta) maintainers platforms; }; From 603aacf97fe9bcc322b7d433981522457e76f2b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:33:58 +0100 Subject: [PATCH 149/248] haskell-bmp: update to version 1.2.4.1 --- .../libraries/haskell/bmp/{1.2.3.4.nix => 1.2.4.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/bmp/{1.2.3.4.nix => 1.2.4.1.nix} (81%) diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix similarity index 81% rename from pkgs/development/libraries/haskell/bmp/1.2.3.4.nix rename to pkgs/development/libraries/haskell/bmp/1.2.4.1.nix index 404229cf7636..a3de1d11830c 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.3.4"; - sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6"; + version = "1.2.4.1"; + sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6d877b866dc2..077583399be3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -525,7 +525,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; - bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {}; + bmp_1_2_4_1 = callPackage ../development/libraries/haskell/bmp/1.2.4.1.nix {}; bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond Boolean = callPackage ../development/libraries/haskell/Boolean {}; From 56afb5a5d01197a4cecf1ea6e4e32d5261882bf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:39:46 +0100 Subject: [PATCH 150/248] haskell-filestore: jailbreak to enable the build with the latest version of 'Diff' --- pkgs/development/libraries/haskell/filestore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 43492d73fae5..d114a5aa3afd 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; From 4720d14dfad6b155d00f6f8edbccc988e6890a88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:07 +0100 Subject: [PATCH 151/248] haskell-Diff: update to version 0.3.0 --- pkgs/development/libraries/haskell/Diff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 86e219ac91d2..04149400ff8c 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Diff"; - version = "0.2.0"; - sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k"; + version = "0.3.0"; + sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; From d0eafca26bbac345e014644a1573fa84bcb2e34a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:07 +0100 Subject: [PATCH 152/248] haskell-HStringTemplate: update to version 0.7.0 --- .../libraries/haskell/HStringTemplate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index c2c4f70b47ee..3011f3a44466 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb -, sybWithClass, text, time, utf8String +{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text +, time, utf8String, void }: cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.12"; - sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p"; + version = "0.7.0"; + sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai"; buildDepends = [ - blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time - utf8String + blazeBuilder deepseq filepath mtl parsec syb text time utf8String + void ]; meta = { description = "StringTemplate implementation in Haskell"; From 157cec457961bb77d9bab52dc64d433c75aa9d1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:07 +0100 Subject: [PATCH 153/248] haskell-SMTPClient: update to version 1.1.0 --- pkgs/development/libraries/haskell/SMTPClient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 1e2dee4fcdcc..91c128756f42 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SMTPClient"; - version = "1.0.4"; - sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; + version = "1.1.0"; + sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk"; buildDepends = [ extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; From fc5f145334afc647951b378a9d59fee5be866143 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 154/248] haskell-authenticate: update to version 1.3.2.4 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 835cdce2e914..c6624208048a 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.1"; - sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7"; + version = "1.3.2.4"; + sha256 = "1xakp54g5dyppzpm1q3bbx6g4pvs7p2903pyq6bya1n82zsk7yg7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From 4e1d3ddba73ea7db41a494b626d20f59a472ce5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 155/248] haskell-gloss: update to version 1.7.8.2 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a0fb693acbba..ededea21fcc1 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.1"; - sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf"; + version = "1.7.8.2"; + sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { From 924f2d7dde0931182e62ac930e974b24ca836386 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 156/248] haskell-graphviz: update to version 2999.16.0.0 --- pkgs/development/libraries/haskell/graphviz/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 637bb5ba45ac..609863e808fa 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,13 +1,14 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, text +{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text , transformers, wlPprintText }: cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.15.0.1"; - sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy"; + version = "2999.16.0.0"; + sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8"; buildDepends = [ - colour dlist fgl filepath polyparse text transformers wlPprintText + colour dlist fgl filepath polyparse temporary text transformers + wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; From 609cc4fbf38b66f5e4bbcb17807a1edff196ab3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 157/248] haskell-hamlet: update to version 1.1.6.2 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 1f5d67321986..40c6f44739c7 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.6.1"; - sha256 = "15jqlfb7l49xqd2szzjhffbnxs7azq85a759bbwx3jfxdz89cv0k"; + version = "1.1.6.2"; + sha256 = "00asrmyb4k9xpsbwwafm3rj1lisssrc3hj3dsr827w9x86xxargy"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 8ad4b9fc8bc56216b08b7ef8241a0ddfaefb6f71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 158/248] haskell-happstack-server: update to version 7.1.4 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 226877ff6dc2..2d50deeef651 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.2"; - sha256 = "1pqrwsgdp1qf5jd2nzdrj2wkd2bq9n0ciwyzvzn8nmwyqgkdzs4f"; + version = "7.1.4"; + sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From 5314503a1fbb4664f6190be9f82b37779d8674d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 159/248] haskell-heist: update to version 0.11.0.1 --- pkgs/development/libraries/haskell/heist/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 780e949c7144..c1d357fdb9ef 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.11.0"; - sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w"; + version = "0.11.0.1"; + sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time unorderedContainers vector xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; From e12d217534e9f77f9d1f2a555f7ccb07002e26e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 160/248] haskell-http-reverse-proxy: update to version 0.1.1.2 --- .../haskell/http-reverse-proxy/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index e30a30fc7aa3..05e97291f378 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit -, conduit, dataDefault, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, wai, warp, word8 +{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +, dataDefault, httpConduit, httpTypes, liftedBase, monadControl +, network, networkConduit, text, wai, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.1"; - sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2"; + version = "0.1.1.2"; + sha256 = "179j6zfmx3g6gc7mzhzhl7ymxkijg9vahjvwjwm0wm15vna52iqa"; buildDepends = [ - blazeBuilder caseInsensitive classyPreludeConduit conduit - dataDefault httpConduit httpTypes liftedBase monadControl network + blazeBuilder caseInsensitive classyPrelude conduit dataDefault + httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; meta = { From 6645b88e8de4078b59b58c731844177234c19a58 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 161/248] haskell-monadcryptorandom: update to version 0.5.1 --- .../libraries/haskell/monadcryptorandom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index b702f10354cd..df63e3ec6591 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.5"; - sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b"; + version = "0.5.1"; + sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; From 130e43711a74622d3c3567cc0c20cc8583cc2210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 162/248] haskell-project-template: update to version 0.1.3 --- .../libraries/haskell/project-template/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index a9a105358463..541fa2026d98 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,15 +1,14 @@ -{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit -, conduit, mtl, resourcet, systemFileio, systemFilepath, text -, transformers +{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +, mtl, resourcet, systemFileio, systemFilepath, text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.2"; - sha256 = "16rgarx78jwiimh3q8flxvmfraxmc1dxl8r04q4j1p9ap3mnvg61"; + version = "0.1.3"; + sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; buildDepends = [ - base64Bytestring base64Conduit classyPreludeConduit conduit mtl - resourcet systemFileio systemFilepath text transformers + base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + systemFileio systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; From 47d7d8512f159432999b89c6649ecbb5e2767e7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 163/248] haskell-repa-io: update to version 3.2.3.2 --- pkgs/development/libraries/haskell/repa-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 7b15b2bbb929..046fafca43a7 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.3.1"; - sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm"; + version = "3.2.3.2"; + sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { From 07795e1f3936e1e5cda37c8fca6395b297fa87f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 164/248] haskell-shakespeare-css: update to version 1.0.2.1 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 61c783c6727b..6ed553516b60 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.2"; - sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + version = "1.0.2.1"; + sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca"; buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 3ea36a6ae4b8fed37c201e26c52606139a84f3b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 165/248] haskell-shakespeare: update to version 1.0.3.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 14a70b44c4f8..0e04ff4fd448 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.3"; - sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl"; + version = "1.0.3.1"; + sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 6687f0d1beca82f01cc06c209b191275170c62e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 166/248] haskell-snap: update to version 0.11.1 --- .../libraries/haskell/snap/snap.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 34ee639564da..7316e519d65e 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,25 +1,24 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad -, configurator, directoryTree, dlist, either, errors, filepath -, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl -, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm -, syb, text, time, transformers, unorderedContainers, vector -, vectorAlgorithms, xmlhtml +, configurator, directoryTree, dlist, errors, filepath, hashable +, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text +, time, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.0"; - sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n"; + version = "0.11.1"; + sha256 = "0dd66496fjfp80i6whl356sqk7n03rx4ycsah7x11fc9rvplmr3q"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator - directoryTree dlist either errors filepath hashable heist lens - logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast - regexPosix snapCore snapServer stm syb text time transformers + directoryTree dlist errors filepath hashable heist lens logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix + snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From 040696fca0b6294a59f8b3eb3dd0cdc1f1d1a766 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2013 12:42:08 +0100 Subject: [PATCH 167/248] haskell-vty: update to version 4.7.3 --- pkgs/development/libraries/haskell/vty/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 2642af7457e7..e475ca7e8560 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,13 +1,15 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String -, vector +{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo +, utf8String, vector }: cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.20"; - sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; + version = "4.7.3"; + sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + isLibrary = true; + isExecutable = true; buildDepends = [ - deepseq mtl parallel parsec terminfo utf8String vector + deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; From cdebe7617f19304c7d2cf311035ddbee0cbfca41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 14 Feb 2013 13:13:10 +0100 Subject: [PATCH 168/248] gparted: upgrade, use newer parted, clean expression --- pkgs/tools/misc/gparted/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 249456580d4b..1bd40025e5d1 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid -, pkgconfig, gtkmm, gnomedocutils, libxml2 }: +, pkgconfig, gtkmm, libxml2 }: -stdenv.mkDerivation { - name = "gparted-0.8.1"; +stdenv.mkDerivation rec { + name = "gparted-0.14.1"; src = fetchurl { - url = mirror://sourceforge/gparted/gparted-0.5.1/gparted-0.8.1.tar.bz2; - sha256 = "128pnrcqp3d4a4jnjxm0mqglbyrs2q841pmg5g8ilyc827b6j163"; + url = "mirror://sourceforge/gparted/${name}.tar.bz2"; + sha256 = "0697sq2dbs9cn689bk68gs9pj3k08bfp9wfg6j291zrprdd3rddi"; }; configureFlags = "--disable-doc"; - buildInputs = - [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm - gnomedocutils libxml2 - ]; + buildInputs = [ + parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 + ]; - meta = { + meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; license = "GPLv2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a3b1043e25c..1f7fd3ba06af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8296,10 +8296,7 @@ let gnugo = callPackage ../games/gnugo { }; - gparted = callPackage ../tools/misc/gparted { - parted = parted_2_3; - inherit (gnome) gnomedocutils; - }; + gparted = callPackage ../tools/misc/gparted { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; From 35f1bbc4332c7af998020b48570eadb285204bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 14 Feb 2013 13:13:51 +0100 Subject: [PATCH 169/248] parted: remove 2.3.*, no longer used --- pkgs/tools/misc/parted/2.3.nix | 56 --------------------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 57 deletions(-) delete mode 100644 pkgs/tools/misc/parted/2.3.nix diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix deleted file mode 100644 index 649def691155..000000000000 --- a/pkgs/tools/misc/parted/2.3.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, enableStatic ? false, hurd ? null }: - -stdenv.mkDerivation rec { - name = "parted-2.3"; - - src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836"; - }; - - buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper - ++ stdenv.lib.optional (hurd != null) hurd; - - configureFlags = - (if (readline != null) - then [ "--with-readline" ] - else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; - - doCheck = true; - - preCheck = - stdenv.lib.optionalString doCheck - # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinux}/sbin:$PATH\""; - - meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; - - longDescription = '' - GNU Parted is an industrial-strength package for creating, destroying, - resizing, checking and copying partitions, and the file systems on - them. This is useful for creating space for new operating systems, - reorganising disk usage, copying data on hard disks and disk imaging. - - It contains a library, libparted, and a command-line frontend, parted, - which also serves as a sample implementation and script backend. - ''; - - homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; - - maintainers = [ - # Add your name here! - stdenv.lib.maintainers.ludo - ]; - - # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f7fd3ba06af..c2ccb92e7220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1290,7 +1290,6 @@ let patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; - parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; }; hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" From e976bcffca1a5a7b059831b710b8a6e9a5ca7144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 12 Feb 2013 23:28:32 +0100 Subject: [PATCH 170/248] inkscape: bugfix update --- pkgs/applications/graphics/inkscape/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 150bb071cb16..37905f8a73f6 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,14 +4,14 @@ , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { - name = "inkscape-0.48.3.1"; + name = "inkscape-0.48.4"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7"; + sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7"; }; - patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; + patches = [ ./configure-python-libs.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from From 0d6bb2b51a3f3bc754c8739f3572faf46ad4bd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Feb 2013 17:45:27 +0100 Subject: [PATCH 171/248] meshlab: fix forgotten qt47 --- pkgs/applications/graphics/meshlab/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index a811d759f7eb..7151fc7af5c4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: +{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { name = "meshlab-1.3.2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ qt unzip ]; + buildInputs = [ qt4 unzip ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2ccb92e7220..14806a096d2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7501,9 +7501,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { - qt = qt47; - }; + meshlab = callPackage ../applications/graphics/meshlab { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; From d65e07d679afa8421abe8e3a4d5fa68b6c79a708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Feb 2013 10:36:46 +0100 Subject: [PATCH 172/248] qt47: remove, no longer used --- .../libraries/qt-4.x/4.7/default.nix | 114 ------------------ pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/release-python.nix | 1 - 3 files changed, 117 deletions(-) delete mode 100644 pkgs/development/libraries/qt-4.x/4.7/default.nix diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix deleted file mode 100644 index 47832a114b45..000000000000 --- a/pkgs/development/libraries/qt-4.x/4.7/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl -, alsaLib, pulseaudio -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql, sqlite -, perl, coreutils, libXi -, buildDemos ? false, buildExamples ? false, useDocs ? false -}: - -let - v = "4.7.4"; -in - -stdenv.mkDerivation rec { - name = "qt-${v}"; - - src = fetchurl { - url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp"; - }; - - preConfigure = - '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations - " - ''; - - configureFlags = - '' - -v -no-separate-debug-info -release -fast -confirm-license -opensource - -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng - -opengl -xrender -xrandr -xinerama -xcursor - -plugin-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - -multimedia -audio-backend -no-phonon - -webkit -javascript-jit - -make libs -make tools -make translations - ${if buildDemos == true then "-make demos" else "-nomake demos"} - ${if buildExamples == true then "-make examples" else "-nomake examples"} - ${if useDocs then "-make docs" else "-nomake docs"} - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - libmng - mysql - postgresql - libpng - which - mesa - libXmu - libXv - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - pulseaudio - ]; - - buildInputs = [ perl ]; - - prefixKey = "-prefix "; - - prePatch = '' - 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 - ''; - - postInstall = '' - ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""} - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14806a096d2b..8910261e8a08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4856,8 +4856,6 @@ let qt4 = pkgs.kde4.qt4; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { }; - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f5fc2f3a7f66..7d98a51cab51 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1501,7 +1501,6 @@ in qshowdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt47 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtpfsgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From e2faa26761a0e87dac44a1b5c692b71889bfd028 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 14 Feb 2013 17:25:02 +0100 Subject: [PATCH 173/248] titaniumsdk: Build universal versions of debug apps --- pkgs/development/mobile/titaniumenv/build-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aa46517f5718..c05bf88ffbff 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal '' else throw "Target: ${target} is not supported!"} From 6ee6cd5ec9db3519d3e1b338a4945b97dd81011a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 14 Feb 2013 20:06:54 +0100 Subject: [PATCH 174/248] Updates: kdenlive-0.9.4 mlt-0.8.8 Upstream kdenlive suggests mlt-0.8.8. --- pkgs/applications/video/kdenlive/default.nix | 6 +++--- pkgs/development/libraries/mlt/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index b518e9c7456a..8109477aa64d 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2"; - sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1"; + url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; + sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif"; }; buildInputs = diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 640bc7edc32e..4e4790bd2a0b 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.8.0"; + version = "0.8.8"; src = fetchurl { url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; + sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc"; }; buildInputs = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8910261e8a08..f13aadafda60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4630,7 +4630,9 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = callPackage ../development/libraries/mlt { + ffmpeg = ffmpeg_1_1; + }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; From 00251af1911f4b7c8f19b832a288fec737a8aa99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 8 Feb 2013 00:10:45 +0100 Subject: [PATCH 175/248] SUNRPC_DEBUG doesn't work on linux 3.3 It's as if the option isn't there. http://hydra.nixos.org/build/4015233 --- pkgs/os-specific/linux/kernel/linux-3.3.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 01b00b499cb5..b3660afaabbb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -230,9 +230,6 @@ let # Devtmpfs support. DEVTMPFS y - # Easier debug of NFS issues - SUNRPC_DEBUG y - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 2d23eb3a19997095ebb70b44946db5b810cfb78a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:24:57 -0500 Subject: [PATCH 176/248] Linux 3.0.64 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 0050c7085b08..9f736f024026 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.63"; + version = "3.0.64"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "04c3f49sssm7vad41axk314ccw368ybww4ag2rymmsmygfy32g92"; + sha256 = "0vya753ayxzjk7ymnw5i2rwcpxp8lss7xf1gl7fzakn6kz780nky"; }; config = configWithPlatform stdenv.platform; From e531913aca0d4f0331fb8840f80c0d822dacc5f7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:25:11 -0500 Subject: [PATCH 177/248] Linux 3.4.31 --- 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 c614bdd7ff2a..47ab87d2f341 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.4.30"; + version = "3.4.31"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1vfw4l3g5fsvxk6pihmcyyfvfmwpsn7vcd6kqg6vm8hcjzdx2iq0"; + sha256 = "1148f77iab0p5j61v42a4jka4ndwnjpd6lkqhwiqs61lmv3m7j2r"; }; config = configWithPlatform stdenv.platform; From ca59489e2be481d7adad8cf8315f028d43b1ec78 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:25:19 -0500 Subject: [PATCH 178/248] Linux 3.7.8 --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index fb9ff3e50535..5479edf8c44f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -250,7 +250,7 @@ in import ./generic.nix ( rec { - version = "3.7.7"; + version = "3.7.8"; testing = false; preConfigure = '' @@ -259,7 +259,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "176jhdpsyma1h4vz94jba3qxjnzlxakki1rqh8xf25zmdd25iygz"; + sha256 = "0phn7a6sfc89n3p6irk349jcxfaa5fi04in9h4wsm25klgw16vxa"; }; config = configWithPlatform stdenv.platform; From 0178a3b7b14e0c09a44ced6e4f3d78567c8af50a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:28:53 -0500 Subject: [PATCH 179/248] Remove EOL'd Linux 3.1 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 251 -------------------- pkgs/os-specific/linux/kernel/patches.nix | 14 -- pkgs/top-level/all-packages.nix | 10 - 3 files changed, 275 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.1.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix deleted file mode 100644 index 0ec50303ee2a..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ /dev/null @@ -1,251 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.1.10"; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1vcpbh7wnc9smw2l5ci27a5p0rgmc1a5dc6a1aljm6f6wcfic8lz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f886c2c49f42..ba4b9addc6c1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -119,20 +119,6 @@ rec { features.aufs3 = true; }; - aufs3_1 = rec { - name = "aufs3.1"; - version = "3.1.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "82c9fe43d197072a82cab6f02a5fd5cc4f50306a"; - sha256 = "f03d00964c9fc9975144d315fb79a1cd56d99f8c11853ed81d34afca35cd560a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13aadafda60..65aa6292ea5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5939,15 +5939,6 @@ let ]; }; - linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_1 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6141,7 +6132,6 @@ let linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); - linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); From c23084906b687475bbd353e4fb69c5d4c9fac925 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:30:31 -0500 Subject: [PATCH 180/248] Remove EOL'd Linux 3.3 --- pkgs/os-specific/linux/kernel/linux-3.3.nix | 262 -------------------- pkgs/os-specific/linux/kernel/patches.nix | 14 -- pkgs/top-level/all-packages.nix | 10 - pkgs/top-level/release-cross.nix | 1 - 4 files changed, 287 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.3.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix deleted file mode 100644 index b3660afaabbb..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ /dev/null @@ -1,262 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.3.8"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ba4b9addc6c1..d12c22a20892 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -133,20 +133,6 @@ rec { features.aufs3 = true; }; - aufs3_3 = rec { - name = "aufs3.3"; - version = "3.3.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "65ab607cfb2c411d86da8fcee25c0f6dada1c4d5"; - sha256 = "55c887932f1c12aed4ee20d9e749a80e9e0412951bd0a40fa3949ba972764a0a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_4 = rec { name = "aufs3.4"; version = "3.4.20121210"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65aa6292ea5b..190ea75f85fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5955,15 +5955,6 @@ let ''; }; - linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_3 - ]; - }; - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6134,7 +6125,6 @@ let linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); - linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d5a57337f4f2..ac066114408d 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -16,7 +16,6 @@ let #xorgserver.hostDrv = nativePlatforms; }; nixUnstable.hostDrv = nativePlatforms; - linuxPackages_3_3.kernel.hostDrv = linux; linuxPackages_3_4.kernel.hostDrv = linux; linuxPackages_3_6.kernel.hostDrv = linux; }; From 0ad870eb5e003ad65b20ed88653e9e1d4fbd66ca Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:32:44 -0500 Subject: [PATCH 181/248] Remove EOL'd Linux 3.5 --- .../linux/kernel/cifs-timeout-3.5.7.patch | 13 - pkgs/os-specific/linux/kernel/linux-3.5.nix | 271 ------------------ pkgs/os-specific/linux/kernel/patches.nix | 26 -- pkgs/os-specific/linux/kernel/perf-3.5.patch | 17 -- pkgs/top-level/all-packages.nix | 16 -- 5 files changed, 343 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.5.nix delete mode 100644 pkgs/os-specific/linux/kernel/perf-3.5.patch diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch deleted file mode 100644 index 13d17ad64850..000000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100 -+++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100 -@@ -176,8 +176,8 @@ - * after the retries we will kill the socket and - * reconnect which may clear the network problem. - */ -- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { -- cERROR(1, "sends on sock %p stuck for 15 seconds", -+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { -+ cERROR(1, "sends on sock %p stuck for 119 seconds", - ssocket); - rc = -EAGAIN; - break; diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix deleted file mode 100644 index 273697da6e3f..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ /dev/null @@ -1,271 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.5.7"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d12c22a20892..980aed4c1620 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -147,20 +147,6 @@ rec { features.aufs3 = true; }; - aufs3_5 = rec { - name = "aufs3.5"; - version = "3.5.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "1658e9080c0e49f38feee5027cf0d32940a661ca"; - sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_6 = rec { name = "aufs3.6"; version = "3.6.20121210"; @@ -216,12 +202,6 @@ rec { features.cifsTimeout = true; }; - cifs_timeout_3_5_7 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-3.5.7.patch; - features.cifsTimeout = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -233,12 +213,6 @@ rec { patch = ./dell-rfkill.patch; }; - # seems no longer necessary on 3.6 - perf3_5 = - { name = "perf-3.5"; - patch = ./perf-3.5.patch; - }; - sheevaplug_modules_2_6_35 = { name = "sheevaplug_modules-2.6.35"; patch = ./sheevaplug_modules-2.6.35.patch; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch deleted file mode 100644 index 6d62a1db80e7..000000000000 --- a/pkgs/os-specific/linux/kernel/perf-3.5.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 - -Fix to build perf. - -diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c -index 9f6cebd..d5491f1 100644 ---- a/tools/perf/util/evsel.c -+++ b/tools/perf/util/evsel.c -@@ -15,7 +15,7 @@ - #include "cpumap.h" - #include "thread_map.h" - #include "target.h" --#include "../../include/linux/perf_event.h" -+#include "../../../include/linux/perf_event.h" - - #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) - #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 190ea75f85fd..d3fe0c1290ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5967,21 +5967,6 @@ let ]; }; - linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_5 - kernelPatches.perf3_5 - kernelPatches.cifs_timeout_3_5_7 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6126,7 +6111,6 @@ let linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); - linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); From af26af6fc7aa26ca5482cc8e79d1b09422f105ee Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 14:33:42 -0500 Subject: [PATCH 182/248] Remove EOL'd Linux 3.6 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 275 -------------------- pkgs/os-specific/linux/kernel/patches.nix | 14 - pkgs/top-level/all-packages.nix | 14 - pkgs/top-level/release-cross.nix | 1 - 4 files changed, 304 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.6.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix deleted file mode 100644 index 987f14f09215..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ /dev/null @@ -1,275 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.6.11"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0cnbdhsgxxdl44gqfqlh8nyf6yzmdz7xkfa0xh2rzdscwqh8085h"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 980aed4c1620..5288050d70dc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -147,20 +147,6 @@ rec { features.aufs3 = true; }; - aufs3_6 = rec { - name = "aufs3.6"; - version = "3.6.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "f541ebfd88df0f4e6f9daf55053282e4f52cc4d9"; - sha256 = "4d615a5f3c14a6a7c49bc6d65e78a2cdb89321cbd8a53f87cc8fe9edda382c3a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - # not officially released yet, but 3.x seems to work fine aufs3_7 = rec { name = "aufs3.7"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3fe0c1290ec..98891a260480 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5967,19 +5967,6 @@ let ]; }; - linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_6 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6111,7 +6098,6 @@ let linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); - linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); # The current default kernel / kernel modules. diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ac066114408d..b80ab43b9311 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -17,7 +17,6 @@ let }; nixUnstable.hostDrv = nativePlatforms; linuxPackages_3_4.kernel.hostDrv = linux; - linuxPackages_3_6.kernel.hostDrv = linux; }; /* Basic list of packages to be natively built, From 701837017e547e12f78174eca88bf597b2e600e3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 19:54:00 -0500 Subject: [PATCH 183/248] Add websockify python package --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5efb56fe05fd..132bf7e4295e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3494,6 +3494,24 @@ pythonPackages = python.modules // rec { }; + websockify = buildPythonPackage rec { + version = "0.3.0"; + name = "websockify-${version}"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/websockify/websockify-${version}.tar.gz"; + md5 = "29b6549d3421907de4bbd881ecc2e1b1"; + }; + + buildInputs = [ numpy ]; + + meta = { + description = "WebSockets support for any application/server"; + homepage = https://github.com/kanaka/websockify; + }; + }; + + webtest = buildPythonPackage rec { version = "1.2.3"; name = "webtest-${version}"; From 3228a381dde53d5753345bc5a20d756d9584f277 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 14 Feb 2013 19:58:50 -0500 Subject: [PATCH 184/248] pythonPackages.websockify: Needs to propagate numpy --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 132bf7e4295e..ff075a5067ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3503,7 +3503,7 @@ pythonPackages = python.modules // rec { md5 = "29b6549d3421907de4bbd881ecc2e1b1"; }; - buildInputs = [ numpy ]; + propagatedBuildInputs = [ numpy ]; meta = { description = "WebSockets support for any application/server"; From 1a52c7659dda87a8186d2a5482e49170b3989afa Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 15 Feb 2013 06:14:01 +0100 Subject: [PATCH 185/248] python: fix linkme-wrapper --- pkgs/development/interpreters/python/python-linkme-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh index 606bb76d401a..42674aa83b08 100644 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.sh +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.sh @@ -14,7 +14,7 @@ PROG=$(basename "$0") SITES= pypath() { - BIN=$(realpath -s "$(dirname "$BIN")") + BIN=$(realpath -s "$(dirname "$1")") ENV=$(dirname "$BIN") SITE="$ENV/lib/python2.7/site-packages" SITES="$SITES${SITES:+:}$SITE" From 947651b6c262cc2d8e11982924583265fcae739c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 15 Feb 2013 09:26:18 -0500 Subject: [PATCH 186/248] rsnapshot: Fix URL. Thanks to ebzzry on IRC for pointing this out. --- pkgs/tools/backup/rsnapshot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index a9cba3f7deec..3da2fad21f29 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "rsnapshot-1.3.0"; src = fetchurl { - url = "mirrors://sourceforge/rsnapshot/${name}.tar.gz"; + url = "mirror://sourceforge/rsnapshot/${name}.tar.gz"; sha256 = "19p35ycm73a8vd4ccjpah18h5jagvcr11rqca6ya87sg8k0a5h9z"; }; From ad057db2d61aa1013a7b06a26d7e2167d8224be8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 16 Feb 2013 11:29:28 -0500 Subject: [PATCH 187/248] x11vnc: Fix more hard-coded /bin/su --- pkgs/tools/X11/x11vnc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 71c7046b0b7a..4c7e89971487 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { --replace '"/bin/true"' '"${coreutils}/bin/true"' substituteInPlace x11vnc/ssltools.h \ + --replace /bin/su /var/setuid-wrappers/su \ --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo ''; From bcc14b65c35f66c8e0907cebd1e376634bf5c0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sat, 16 Feb 2013 21:43:34 +0400 Subject: [PATCH 188/248] urbanterror: Update to 4.2.009. --- pkgs/games/urbanterror/default.nix | 70 ++++++++++-------------------- 1 file changed, 23 insertions(+), 47 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index bffc5ad90d18..42460dd0a848 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,72 +1,48 @@ { stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.1"; - src1 = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip"; - sha256 = "0pr6xpwq8zllc0xsdxl8cfd0zz5fhggw5fsbrizygr6hhdvra1jp"; - }; - src2 = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip"; - sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn"; - }; + version = "4.2.009"; + srcs = + [ (fetchurl { + url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip"; + sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i"; + }) + (fetchurl { + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz"; + sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn"; + }) + ]; buildInputs = [ unzip SDL mesa openal curl ]; - unpackPhase = '' - mkdir urbanterror - cd urbanterror - unzip $src1 - unzip $src2 - ''; - patches = [ ./l_script.patch ]; - patchPhase = '' - for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource - do - cd "$d" - patch -p 0 < "''${patches[0]}" - cd .. - done - ''; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007"; configurePhase = '' - cd ioUrbanTerrorClientSource echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local echo "USE_CURL = 1" >> Makefile.local echo "USE_CURL_DLOPEN = 0" >> Makefile.local - substituteInPlace code/tools/asm/Makefile --replace -Werror "" - cd .. - ''; - buildPhase = '' - for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource - do - cd $d - make - cd .. - done ''; installPhase = '' destDir="$out/opt/urbanterror" - mkdir -p "$destDir" - mkdir -p "$out/bin" - cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \ - "$destDir/ioUrbanTerror" - cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \ - "$destDir/ioUrTded" - cp -rv UrbanTerror/q3ut4 "$destDir" + ensureDir "$destDir" "$out/bin" + cp -v build/release-linux-*/Quake3-UrT.* \ + "$destDir/Quake3-UrT" + cp -v build/release-linux-*/Quake3-UrT-Ded.* \ + "$destDir/Quake3-UrT-Ded" + cp -rv ../UrbanTerror42/q3ut4 "$destDir" cat << EOF > "$out/bin/urbanterror" - #!/bin/sh + #! ${stdenv.shell} cd "$destDir" - exec ./ioUrbanTerror "\$@" + exec ./Quake3-UrT "\$@" EOF chmod +x "$out/bin/urbanterror" cat << EOF > "$out/bin/urbanterror-ded" - #!/bin/sh + #! ${stdenv.shell} cd "$destDir" - exec ./ioUrTded "\$@" + exec ./Quake3-UrT-Ded "\$@" EOF chmod +x "$out/bin/urbanterror-ded" ''; postFixup = '' - p=$out/opt/urbanterror/ioUrbanTerror + p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; From 1921086ffa55257dad79da4ebf579a7411bf694b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sat, 16 Feb 2013 21:52:36 +0400 Subject: [PATCH 189/248] urbanterror: Correction for previous commit. --- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/urbanterror/l_script.patch | 21 --------------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/games/urbanterror/l_script.patch diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 42460dd0a848..535e575fdc40 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' destDir="$out/opt/urbanterror" - ensureDir "$destDir" "$out/bin" + mkdir -p "$destDir" + mkdir -p "$out/bin" cp -v build/release-linux-*/Quake3-UrT.* \ "$destDir/Quake3-UrT" cp -v build/release-linux-*/Quake3-UrT-Ded.* \ diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch deleted file mode 100644 index 8aa176cca8cb..000000000000 --- a/pkgs/games/urbanterror/l_script.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur code/botlib/l_script.c kode/botlib/l_script.c ---- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400 -+++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400 -@@ -1118,7 +1118,7 @@ - { - if (*string == '\"') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\"') - { -@@ -1135,7 +1135,7 @@ - { - if (*string == '\'') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\'') - { From fa7b10255cb57923f9197f2dda7e166572242e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sat, 16 Feb 2013 21:56:17 +0400 Subject: [PATCH 190/248] all-packages.nix: Uncomment e17. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98891a260480..f0b2a3009744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8438,10 +8438,10 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - # e17 = recurseIntoAttrs ( - # let callPackage = newScope pkgs.e17; in - # import ../desktops/e17 { inherit callPackage pkgs; } - # ); + e17 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e17; in + import ../desktops/e17 { inherit callPackage pkgs; } + ); gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; From baf4e9309aafb84883c8cfec583668f71df535f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 16 Feb 2013 19:30:56 +0100 Subject: [PATCH 191/248] iwlwifi-4965 fix download url --- pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index 3e3ad74adb34..266c7795d230 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-4965-ucode-228.57.1.21"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz"; + url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas"; }; From 9acfcdc0b68d1dbdac02f7993fed03ea232bf7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 Feb 2013 09:59:28 +0100 Subject: [PATCH 192/248] pngcrush: update to fix compilation with libpng-1.6.* --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 7293c0db66d6..60301b9b164e 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.22"; + name = "pngcrush-1.7.50"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp"; + sha256 = "1xabqjgvwsyazs0hw7bzzm256zbd7v33alwzp0lbawm521m3m651"; }; configurePhase = '' From b79c0bd2f36e32243a4786ba3e4a497c52af16cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 19:08:43 +0100 Subject: [PATCH 193/248] httpie: fix --- pkgs/tools/networking/httpie/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 200bac53086a..d95360ccb458 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonPackage { +pythonPackages.buildPythonPackage { name = "httpie-0.3.1"; namePrefix = ""; @@ -9,6 +9,8 @@ buildPythonPackage { sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a"; }; + propagatedBuildInputs = with pythonPackages; [ pygments requests014 ]; + doCheck = false; meta = { From 48d8ab884ca279b9957cabff36ce44219254fc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 16 Feb 2013 21:07:48 +0100 Subject: [PATCH 194/248] Fix Hydrogen to build with JACK 1.9.9.5 This patches the Hydrogen scons build script to work a failure to parse the JACK version correctly. If I understand correctly upstream Hydrogen now uses cmake instead of Scons, so this shouldn't be a problem with the next Hydrogen release. --- pkgs/applications/audio/hydrogen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 6b994c7d9ae6..bb10f24b90a2 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp - ''; + sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct + ''; # why doesn't scons find librdf? buildPhase = '' From 8493b51da1efb0c4d5db8aace15ab9cb05f26906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 21:28:41 +0100 Subject: [PATCH 195/248] x86info: fix --- pkgs/os-specific/linux/x86info/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index d8840d08460d..297991ff4d95 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; + preConfigure = "patchShebangs ."; + buildInputs = [ pciutils python ]; installPhase = '' @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An identification utility for the x86 series of processors."; - longDescription = + longDescription = '' x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages the cpuid kernel module where possible. it supports parsing model specific From aaf607c5dc45b584e7e61c1c0d103f3182204587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 21:48:47 +0100 Subject: [PATCH 196/248] linphone: minor update and fix --- .../instant-messengers/linphone/default.nix | 14 +++++--- .../linphone/fix-deprecated.patch | 35 +++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 04e119afdb14..6327cf1efaed 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip -, speex, readline, mediastreamer }: - +, speex, readline, mediastreamer, libsoup }: + stdenv.mkDerivation rec { - name = "linphone-3.5.0"; + name = "linphone-3.5.2"; src = fetchurl { url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; - sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; + sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys"; }; - buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ]; + patches = [ ./fix-deprecated.patch ]; + + buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ]; buildNativeInputs = [ intltool pkgconfig ]; + preConfigure = "rm -r mediastreamer2 oRTP"; + configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; meta = { diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch new file mode 100644 index 000000000000..8978e6e66525 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch @@ -0,0 +1,35 @@ +diff --git a/gtk/main.c b/gtk/main.c +index 7079bc8..f076127 100644 +--- a/gtk/main.c ++++ b/gtk/main.c +@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){ + GdkPixbuf *pbuf; + const char *app_name="Linphone"; + +- g_thread_init(NULL); ++ g_type_init(); + gdk_threads_init(); + + progpath = strdup(argv[0]); +diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c +index 1c54fca..45c9091 100644 +--- a/gtk/setupwizard.c ++++ b/gtk/setupwizard.c +@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { + linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); + + if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { +- g_thread_create(check_username_availability, (void*)w, FALSE, NULL); ++ g_thread_new (NULL, check_username_availability, (void*)w); + } + else { + if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { +@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){ + ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); + notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); + +- g_thread_init (NULL); ++ g_type_init (); + gdk_threads_init (); + + GtkWidget *p1=create_intro(); From 954d519af7db13aec733db1bb5265f5f71b4f6e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 16 Feb 2013 21:48:37 +0100 Subject: [PATCH 197/248] minidlna: Update to 1.0.25 and use ffmpeg instead of libav --- pkgs/tools/networking/minidlna/default.nix | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 736ca980cfbc..02013d8ede6d 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,28 +1,32 @@ -{stdenv, fetchurl, libav, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }: +{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }: + +let version = "1.0.25"; in + stdenv.mkDerivation rec { - name = "minidlna-1.0.24"; + name = "minidlna-${version}"; + src = fetchurl { - url = mirror://sourceforge/project/minidlna/minidlna/1.0.24/minidlna_1.0.24_src.tar.gz; - sha256 = "0hmrrrq7d8940rckwj93bcdpdxxy3qfkjl17j5k31mi37hqc42l4"; + url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna_${version}_src.tar.gz"; + sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p"; }; + patches = [ ./config.patch ]; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libav}/include/libavutil -I${libav}/include/libavcodec -I${libav}/include/libavformat" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ffmpeg}/include/libavutil -I${ffmpeg}/include/libavcodec -I${ffmpeg}/include/libavformat" export makeFlags="INSTALLPREFIX=$out" ''; - buildInputs = [ libav flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; - patches = [ ./config.patch ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; meta = { description = "MiniDLNA Media Server"; longDescription = '' - MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully - compliant with DLNA/UPnP-AV clients. + MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully + compliant with DLNA/UPnP-AV clients. ''; homepage = http://sourceforge.net/projects/minidlna/; license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From d8bac9c657cf5d487bef57c3a309c0ca51895a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 22:21:21 +0100 Subject: [PATCH 198/248] mediastreamer: forgotten update needed for linphone --- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 3d5dff53ff4e..ebd6826bc9ed 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -2,11 +2,11 @@ libv4l, libtheora, intltool, libvpx, gsm }: stdenv.mkDerivation rec { - name = "mediastreamer-2.8.0"; + name = "mediastreamer-2.8.2"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "0h1qda2mjc76xirldlvpmzf57vcbgr113a9b0kw1xm5i58s0w34f"; + sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6"; }; # TODO: make it load plugins from *_PLUGIN_PATH From e95c97e698d128bdc918a72f7de11e78d86c0ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 22:34:40 +0100 Subject: [PATCH 199/248] vmime: fix via minor update --- pkgs/development/libraries/vmime/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 4f70b7a39a4b..24234469fa2f 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1 }: +{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }: stdenv.mkDerivation { - name = "vmime-0.9.1"; + name = "vmime-0.9.2svn"; src = fetchurl { - url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; - sha256 = "1bninkznn07zhl7gc3jnigzvb0x1sclwqwgjy47ahzdwv5vcnriv"; + url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2; + #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; + sha256 = "1jhxiy8c2cgzfjps0z4q40wygdpgm8jr7jn727cbzrscj2c48kxx"; }; - buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 ]; + buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 libgcrypt ]; meta = { homepage = http://www.vmime.org/; From 8d35dabd654bdef676eb3d743d94e8a81267ab56 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 16 Feb 2013 16:38:46 -0500 Subject: [PATCH 200/248] e17.embryo: Fix meta. Meta attributes, if they are lists, must be lists of strings. --- pkgs/desktops/e17/embryo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index 29f157545db1..59b5540f25d4 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { untouched. ''; homepage = http://enlightenment.org/; - license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure + license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure }; } From 2a1c3086079b83faaa3def3b55bbe85be9e69f91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 16 Feb 2013 21:16:00 -0500 Subject: [PATCH 201/248] Add wayland library --- .../development/libraries/wayland/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/wayland/default.nix diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix new file mode 100644 index 000000000000..9e00b0d8bcf5 --- /dev/null +++ b/pkgs/development/libraries/wayland/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: + +stdenv.mkDerivation rec { + name = "wayland-1.0.5"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + + sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; + }; + + buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; + + meta = { + description = "The reference implementation of the Wayland protocol"; + + homepage = http://wayland.freedesktop.org; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0b2a3009744..77bf48513046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5104,6 +5104,8 @@ let libpng = libpng12; }; + wayland = callPackage ../development/libraries/wayland { }; + webkit = builderDefsPackage ../development/libraries/webkit { inherit (gnome) gtkdoc libsoup; From 524d9b656e1c72d3fdeebeb674f0c494f9fc8ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Feb 2013 01:09:56 +0100 Subject: [PATCH 202/248] WIP --- .../science/misc/vite/default.nix | 25 ++++++++----------- pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 4c1cf318b5a2..db199ccfad6c 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,31 +1,28 @@ -{ fetchsvn, stdenv, cmake, qt4, mesa }: +{ stdenv, fetchurl, fetchsvn, cmake, qt4, mesa, opentrace_format, libtau }: # ViTE 1.1 has several bugs, so use the SVN version. let - rev = "1143"; + rev = "1157"; externals = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/externals"; - sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a"; + sha256 = "1yqx72q3dd53k8z6jz93nbm9yyysq4npdjh1qv3f1qcrpz75k1zj"; inherit rev; }; in stdenv.mkDerivation { - name = "vite-1.2pre${rev}"; + name = "vite-1.2"; - src = fetchsvn { - url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; - sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4"; - inherit rev; + src = fetchurl { + url = "http://gforge.inria.fr/frs/download.php/27457/vite_${rev}.tar.gz"; + sha256 = "0j894wpqgcy0dzsxrp0z2fzymcl1m406cy4xv1kdzada25zjaq7m"; }; - preConfigure = - '' rm -v externals - ln -sv "${externals}" externals - ''; - patches = [ ./larger-line-buffer.patch ]; + preConfigure = "sed -i '50i\#include ' src/render/Geometry.hpp"; - buildInputs = [ cmake qt4 mesa ]; + cmakeFlags = "-DTAU_LIBRARY=${libtau}/lib/libTAU.so -DTAU_INCLUDE_DIR=${libtau}/include"; # -DTAU_DIR:PATH=${libtau}"; + + buildInputs = [ cmake qt4 mesa opentrace_format libtau ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77bf48513046..7acb785345a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4426,6 +4426,8 @@ let libosip = callPackage ../development/libraries/osip {}; + libotf = callPackage ../development/libraries/libotf { }; + libotr = callPackage ../development/libraries/libotr { }; libp11 = callPackage ../development/libraries/libp11 { }; @@ -4469,6 +4471,8 @@ let libtasn1 = callPackage ../development/libraries/libtasn1 { }; + libtau = callPackage ../development/libraries/libtau { }; + libtheora = callPackage ../development/libraries/libtheora { }; libtiff = callPackage ../development/libraries/libtiff { }; @@ -4773,6 +4777,8 @@ let }; }; + opentrace_format = callPackage ../development/libraries/opentrace-format { }; + ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; From b2f8432ad3fc7d655c6bb41ecbdfdbbb28ced4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Feb 2013 10:59:43 +0100 Subject: [PATCH 203/248] pure: update and fix by patching --- .../development/interpreters/pure/default.nix | 12 ++-- .../interpreters/pure/new-gcc.patch | 62 +++++++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/interpreters/pure/new-gcc.patch diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index dd1982e836db..83a1c0ac5009 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , llvm, gmp, mpfr, readline + , llvm, gmp, mpfr, readline, bison, flex , ...}: builderDefsPackage (a : @@ -12,11 +12,11 @@ let sourceInfo = rec { baseName="pure"; project="pure-lang"; - version="0.49"; + version="0.56"; name="${baseName}-${version}"; extension="tar.gz"; url="http://${project}.googlecode.com/files/${name}.${extension}"; - hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x"; + hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj"; }; in rec { @@ -29,8 +29,10 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + + patches = [ ./new-gcc.patch ]; + meta = { description = "A purely functional programming language based on term rewriting"; maintainers = with a.lib.maintainers; diff --git a/pkgs/development/interpreters/pure/new-gcc.patch b/pkgs/development/interpreters/pure/new-gcc.patch new file mode 100644 index 000000000000..ea2cd8450591 --- /dev/null +++ b/pkgs/development/interpreters/pure/new-gcc.patch @@ -0,0 +1,62 @@ +diff --git a/runtime.cc b/runtime.cc +index 04cbc40..54a0b43 100644 +--- a/runtime.cc ++++ b/runtime.cc +@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs) + } + #endif + +-/* Horrible kludge to get round, trunc and the inverse hyperbolic functions +- from libmingwex.a (these are in C99, but not in the Windows system +- libraries, and LLVM doesn't know how to get them either). */ +- +-extern "C" +-double __round(double x) +-{ +- return round(x); +-} +- +-extern "C" +-double __trunc(double x) +-{ +- return trunc(x); +-} +- +-extern "C" +-double __asinh(double x) +-{ +- return asinh(x); +-} +- +-extern "C" +-double __acosh(double x) +-{ +- return acosh(x); +-} +- +-extern "C" +-double __atanh(double x) +-{ +- return atanh(x); +-} + + /* File type bits. */ + +diff --git a/util.hh b/util.hh +index ae95b79..eab3330 100644 +--- a/util.hh ++++ b/util.hh +@@ -58,13 +58,6 @@ char *default_encoding(); + double my_strtod(const char *nptr, char **endptr); + char *my_formatd(char *buffer, const char *format, double d); + +-/* Windows doesn't have strptime, so we provide a suitable replacement from +- GNU libc (see strptime.c). */ +- +-#ifndef HAVE_STRPTIME +-extern "C" +-char *strptime(const char *s, const char *format, struct tm *tm); +-#endif + + /* Windows doesn't have mkstemp, so we provide a suitable replacement. */ + From 9885d040331a9f01fdda4df0ac76e73868667790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Feb 2013 11:02:25 +0100 Subject: [PATCH 204/248] Revert "WIP", sorry, I got confused, somehow This reverts commit 524d9b656e1c72d3fdeebeb674f0c494f9fc8ba8. --- .../science/misc/vite/default.nix | 25 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 ----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index db199ccfad6c..4c1cf318b5a2 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,28 +1,31 @@ -{ stdenv, fetchurl, fetchsvn, cmake, qt4, mesa, opentrace_format, libtau }: +{ fetchsvn, stdenv, cmake, qt4, mesa }: # ViTE 1.1 has several bugs, so use the SVN version. let - rev = "1157"; + rev = "1143"; externals = fetchsvn { url = "svn://scm.gforge.inria.fr/svn/vite/externals"; - sha256 = "1yqx72q3dd53k8z6jz93nbm9yyysq4npdjh1qv3f1qcrpz75k1zj"; + sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a"; inherit rev; }; in stdenv.mkDerivation { - name = "vite-1.2"; + name = "vite-1.2pre${rev}"; - src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/27457/vite_${rev}.tar.gz"; - sha256 = "0j894wpqgcy0dzsxrp0z2fzymcl1m406cy4xv1kdzada25zjaq7m"; + src = fetchsvn { + url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; + sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4"; + inherit rev; }; + preConfigure = + '' rm -v externals + ln -sv "${externals}" externals + ''; + patches = [ ./larger-line-buffer.patch ]; - preConfigure = "sed -i '50i\#include ' src/render/Geometry.hpp"; - cmakeFlags = "-DTAU_LIBRARY=${libtau}/lib/libTAU.so -DTAU_INCLUDE_DIR=${libtau}/include"; # -DTAU_DIR:PATH=${libtau}"; - - buildInputs = [ cmake qt4 mesa opentrace_format libtau ]; + buildInputs = [ cmake qt4 mesa ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7acb785345a6..77bf48513046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4426,8 +4426,6 @@ let libosip = callPackage ../development/libraries/osip {}; - libotf = callPackage ../development/libraries/libotf { }; - libotr = callPackage ../development/libraries/libotr { }; libp11 = callPackage ../development/libraries/libp11 { }; @@ -4471,8 +4469,6 @@ let libtasn1 = callPackage ../development/libraries/libtasn1 { }; - libtau = callPackage ../development/libraries/libtau { }; - libtheora = callPackage ../development/libraries/libtheora { }; libtiff = callPackage ../development/libraries/libtiff { }; @@ -4777,8 +4773,6 @@ let }; }; - opentrace_format = callPackage ../development/libraries/opentrace-format { }; - ortp = callPackage ../development/libraries/ortp { }; p11_kit = callPackage ../development/libraries/p11-kit { }; From de8a9d676ed7c94ad0741e7e02a6eeda53efebe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 17 Feb 2013 17:44:54 +0400 Subject: [PATCH 205/248] tools/security/apg: New nixpkg. --- pkgs/tools/security/apg/default.nix | 66 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/tools/security/apg/default.nix diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix new file mode 100644 index 000000000000..7eeb491374a3 --- /dev/null +++ b/pkgs/tools/security/apg/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "apg-2.2.3"; + src = fetchurl { + url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz"; + sha256 = "1fkxpaifv925i385krsyslrig42ksws5y19hfq5asn1rwv6zmjb9"; + }; + configurePhase = '' + substituteInPlace Makefile --replace /usr/local "$out" + ''; + preInstall = '' + export CHOWNPROG=true + export CHGRPPROG=true + ''; + + meta = { + description = "A tool set for random password generation."; + longDescription = '' + APG (Automated Password Generator) is the tool set for random + password generation. + + Standalone version + + Generates some random words of required type and prints them + to standard output. + + Network version + + APG server: When client's request is arrived generates some + random words of predefined type and send them to client over + the network (according to RFC0972). + + APG client: Sends the password generation request to the APG + server, wait for generated Passwords arrival and then prints + them to the standard output. + + Advantages + + * Built-in ANSI X9.17 RNG (Random Number Generator) (CAST/SHA1) + * Built-in password quality checking system (it has support for + Bloom filter for faster access) + * Two Password Generation Algorithms: + 1. Pronounceable Password Generation Algorithm (according to + NIST FIPS 181) + 2. Random Character Password Generation Algorithm with 35 + configurable modes of operation + * Configurable password length parameters + * Configurable amount of generated passwords + * Ability to initialize RNG with user string + * Support for /dev/random + * Ability to crypt() generated passwords and print them as + additional output + * Special parameters to use APG in script + * Ability to log password generation requests for network version + * Ability to control APG service access using tcpd + * Ability to use password generation service from any type of box + (Mac, WinXX, etc.) that connected to network + * Ability to enforce remote users to use only allowed type of + password generation + ''; + homepage = http://www.adel.nursat.kz/apg/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77bf48513046..a2c6f85ef697 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -419,6 +419,8 @@ let pkgs_i686 = pkgsi686Linux; }; + apg = callPackage ../tools/security/apg { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = import ../development/mobile/titaniumenv { From 7e539f9636e8f199bffc5968d7ef045169101a7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 17 Feb 2013 22:48:20 +0100 Subject: [PATCH 206/248] gnuplot: cosmetic, no functional change --- pkgs/tools/graphics/gnuplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index ce564e8de4fe..6b1a3610f303 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "gnuplot-4.4.4"; - + src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.gnuplot.info; + homepage = "http://www.gnuplot.info"; description = "A portable command-line driven graphing utility for many platforms"; platforms = stdenv.lib.platforms.all; }; From 77f61dd9878f26dd06fc7232d8d93b9858ded3d8 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 17 Feb 2013 23:39:00 +0100 Subject: [PATCH 207/248] add deluge torrent client and it's dependencies --- .../libtorrent-rasterbar/default.nix | 14 ++- pkgs/lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 91 +++++++++++++++++++ 3 files changed, 101 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 8916e926771c..517fbf2bd430 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib }: +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }: stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.15.8"; + version = "0.16.8"; src = fetchurl { url = "http://libtorrent.googlecode.com/files/${name}.tar.gz"; - sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm"; + sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0"; }; - buildInputs = [ boost pkgconfig openssl zlib ]; + buildInputs = [ boost pkgconfig openssl zlib python ]; - configureFlags = [ "--with-boost=${boost}/include/boost" "--with-boost-libdir=${boost}/lib" ]; + configureFlags = [ + "--with-boost=${boost}/include/boost" + "--with-boost-libdir=${boost}/lib" + "--enable-python-binding" + ]; meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index bff4ffa3b196..76aa2de723de 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -20,6 +20,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + iElectric = "Domen Kozar "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff075a5067ca..bf9bea000f8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -721,6 +721,60 @@ pythonPackages = python.modules // rec { }; }; + deluge = buildPythonPackage rec { + name = "deluge-1.3.5"; + + src = fetchurl { + url = "http://download.deluge-torrent.org/source/${name}.tar.gz"; + md5 = "fbf52593a85bfa7c8520834fa9177fba"; + }; + + # TODO: gui, procsettitle + buildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ]; + propagatedBuildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ]; + + meta = { + homepage = http://deluge-torrent.org; + description = "Torrent client"; + license = "GPLv3"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + pyxdg = buildPythonPackage rec { + name = "pyxdg-0.25"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz"; + md5 = "bedcdb3a0ed85986d40044c87f23477c"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://freedesktop.org/wiki/Software/pyxdg; + description = "Contains implementations of freedesktop.org standards"; + license = "LGPLv2"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + chardet = buildPythonPackage rec { + name = "chardet-2.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; + md5 = "295367fd210d20f3febda615a88e1ef0"; + }; + + meta = { + homepage = https://github.com/erikrose/chardet; + description = "Universal encoding detector"; + license = "LGPLv2"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; django = buildPythonPackage rec { name = "Django-${version}"; @@ -1383,6 +1437,43 @@ pythonPackages = python.modules // rec { }; }; + + Mako = buildPythonPackage rec { + name = "Mako-0.7.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz"; + md5 = "daf7cc50f997533b573f9b40193139a2"; + }; + + buildInputs = [ MarkupSafe nose ]; + propagatedBuildInputs = [ MarkupSafe ]; + + meta = { + description = "Super-fast templating language."; + homepage = http://www.makotemplates.org; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + MarkupSafe = buildPythonPackage rec { + name = "MarkupSafe-0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz"; + md5 = "4e7c4d965fe5e033fa2d7bb7746bb186"; + }; + + meta = { + description = "Implements a XML/HTML/XHTML Markup safe string"; + homepage = http://dev.pocoo.org; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + manuel = buildPythonPackage rec { name = "manuel-${version}"; version = "1.6.0"; From f2bff3d088b3c869c1a642e8f226e83c9f3e0972 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 00:00:48 +0100 Subject: [PATCH 208/248] gnuplot: configure GDFONTPATH using 'fontconfig' This patch adds a wrapper script around gnuplot that uses fontconfig's fc-list(1) utility to determine the set of available fonts and makes that list available to Gnuplot in the $GDFONTPATH variable. --- pkgs/tools/graphics/gnuplot/default.nix | 19 +++++++++++++++---- .../gnuplot/set-gdfontpath-from-fontconfig.sh | 4 ++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 6b1a3610f303..5ef6db7ae47a 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gd, texinfo +{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper , texLive ? null , lua ? null , emacs ? null @@ -11,8 +11,11 @@ , cairo ? null , pkgconfig ? null , readline +, fontconfig ? null, gnused ? null, coreutils ? null }: +assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); + stdenv.mkDerivation rec { name = "gnuplot-4.4.4"; @@ -21,13 +24,21 @@ stdenv.mkDerivation rec { sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; }; - configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - buildInputs = [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig + wxGTK pango cairo pkgconfig makeWrapper ]; + configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + + postInstall = stdenv.lib.optionalString (libX11 != null) '' + wrapProgram $out/bin/gnuplot \ + --prefix PATH : '${gnused}/bin' \ + --prefix PATH : '${coreutils}/bin' \ + --prefix PATH : '${fontconfig}/bin' \ + --run '. ${./set-gdfontpath-from-fontconfig.sh}' + ''; + meta = { homepage = "http://www.gnuplot.info"; description = "A portable command-line driven graphing utility for many platforms"; diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh new file mode 100644 index 000000000000..4886b4f2b7c0 --- /dev/null +++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh @@ -0,0 +1,4 @@ +p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) ) +IFS=: +export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}" +unset IFS p From 9ff93714d769ab8c3427635a283beedfe3c470a9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 10:48:59 +0100 Subject: [PATCH 209/248] haskell-monad-par: update to version 0.3.4 --- .../libraries/haskell/monad-par/{0.3.nix => 0.3.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.nix => 0.3.4.nix} (86%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix similarity index 86% rename from pkgs/development/libraries/haskell/monad-par/0.3.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.nix index d6f83dd31683..8407daef6423 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3"; - sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd"; + version = "0.3.4"; + sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 077583399be3..8d9d75ddb7ba 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1218,8 +1218,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {}; - monadPar = self.monadPar_0_3; + monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {}; + monadPar = self.monadPar_0_3_4; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From da1f938ece5661d9bfc2ed914e174d70e343ebbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:10:40 +0100 Subject: [PATCH 210/248] jailbreak packages to support blaze-html 0.6.0.0 - hamlet - happstack-server - heist - highlighting-kate - xml-conduit - xmlhtml - yesod-auth - yesod-core - yesod-form --- pkgs/development/libraries/haskell/hamlet/default.nix | 1 + .../development/libraries/haskell/happstack/happstack-server.nix | 1 + pkgs/development/libraries/haskell/heist/default.nix | 1 + pkgs/development/libraries/haskell/highlighting-kate/default.nix | 1 + pkgs/development/libraries/haskell/xml-conduit/default.nix | 1 + pkgs/development/libraries/haskell/xmlhtml/default.nix | 1 + pkgs/development/libraries/haskell/yesod-auth/default.nix | 1 + pkgs/development/libraries/haskell/yesod-core/default.nix | 1 + pkgs/development/libraries/haskell/yesod-form/default.nix | 1 + pkgs/development/libraries/haskell/yesod/default.nix | 1 + 10 files changed, 10 insertions(+) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 40c6f44739c7..39df11063ada 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Haml-like template files that are compile-time checked"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 2d50deeef651..659745a30a5d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { text threads time timeCompat transformers transformersBase utf8String xhtml zlib ]; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index c1d357fdb9ef..526a9b6ed875 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { filepath hashable MonadCatchIOTransformers mtl random text time unorderedContainers vector xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index afb6a4be662a..9d9ecdfafc67 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal"; + jailbreak = true; meta = { homepage = "http://github.com/jgm/highlighting-kate"; description = "Syntax highlighting"; diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 09c5a5563bcf..452c75e28659 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { blazeHtml blazeMarkup conduit dataDefault failure monadControl resourcet systemFilepath text transformers xmlTypes ]; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index adbf68655caf..fc6c189db8eb 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; + jailbreak = true; meta = { description = "XML parser and renderer with HTML 5 quirks mode"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index e0bd834f1ea4..59eca41fff35 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { transformers unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index bf13f7da1741..1d9bacbe55a1 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 9ce33159d8f1..f886f1d3abfd 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { shakespeareJs text time transformers wai xssSanitize yesodCore yesodPersistent ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index c4f865d3e85f..96f3ebbd9a54 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -27,6 +27,7 @@ cabal.mkDerivation (self: { yesodAuth yesodCore yesodDefault yesodForm yesodJson yesodPersistent zlib ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From 2e14f53bfd5a7e8ae5579852fefb65b897bb6019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 211/248] haskell-Graphalyze: update to version 0.14.0.1 --- pkgs/development/libraries/haskell/Graphalyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index 489e338cba54..d61abc7a245d 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.14.0.0"; - sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg"; + version = "0.14.0.1"; + sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x"; buildDepends = [ bktrees fgl filepath graphviz pandoc random text time ]; From ff86dade69685f3a124733320451d57066872fb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 212/248] haskell-blaze-html: update to version 0.6.0.0 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 63859d5e91f5..44f0e0b0e236 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.5.1.3"; - sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w"; + version = "0.6.0.0"; + sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll"; buildDepends = [ blazeBuilder blazeMarkup text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From 4d9cf0758c0d78cc30b2fa7a58e0f826544117af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 213/248] haskell-classy-prelude: update to version 0.5.1 --- pkgs/development/libraries/haskell/classy-prelude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 4033c3827669..01c26aab79f3 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.0"; - sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp"; + version = "0.5.1"; + sha256 = "0kgnffqvh13adadp85iw4ybbs5jpa5hwrr2dsi2aj9p8lvzac1jy"; buildDepends = [ basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector From 7201dffe60205e33c3c331cede886da6335191d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 214/248] haskell-ghc-mod: update to version 1.11.4 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 266740cbaaca..f85b7f8e208a 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.11.3"; - sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2"; + version = "1.11.4"; + sha256 = "1bxmpvad415ayzwyijjm0zsck0z8aa1nfjixwb6l80i6lbxi4rfg"; isLibrary = false; isExecutable = true; buildDepends = [ From 89f20c176cfa379bf4b8991906f7502bc4f15281 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 215/248] haskell-happstack-server: update to version 7.1.5 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 659745a30a5d..4dd789b49e5a 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.4"; - sha256 = "0vnawm2m7lr7yvpd30divczxl90fayjvsysr7l1lq76qgxjsd576"; + version = "7.1.5"; + sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From 26145baa51f0f38509f30e8f6f225da09b37ebbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 216/248] haskell-highlighting-kate: update to version 0.5.3.6 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 9d9ecdfafc67..ef46b12747b1 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.5"; - sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; + version = "0.5.3.6"; + sha256 = "0ypgw56gaa2hvh05ks079lfcaaynki3da471g39f23m3scgkawlr"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From f23723864b0478bb42866001f6e05b4f8779c21a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:14 +0100 Subject: [PATCH 217/248] haskell-hledger-web: update to version 0.19.3 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 2e50b19f0116..67adcb0fbdd6 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -19,6 +19,9 @@ cabal.mkDerivation (self: { shakespeareJs shakespeareText text time transformers wai waiExtra warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic ]; + patchPhase = '' + sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal + ''; jailbreak = true; meta = { homepage = "http://hledger.org"; From 52455156b28f46bcf3491c2ea854e32c18f15043 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 218/248] haskell-hs-bibutils: update to version 4.17 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index b9f3eb3cb8e5..3a1ed14785ba 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.16"; - sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; + version = "4.17"; + sha256 = "0vv1qsxbwwb1nfwpvxvqacfjs3sswldrx3wimaxixmw9ynkkkwdg"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; From e0ed6ac17dbbdab44996702c7e26eafb5862deaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 219/248] haskell-hxt-regex-xmlschema: update to version 9.1.0 --- .../libraries/haskell/hxt-regex-xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index fb2e4a2c1e56..879ff0affdc7 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; - version = "9.0.4"; - sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf"; + version = "9.1.0"; + sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr"; buildDepends = [ hxtCharproperties parsec ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; From b81d89ee63ff2ed901aa78d7e1a7d936c3f53b9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 220/248] haskell-lambdabot-utils: update to version 4.2.2 --- .../development/libraries/haskell/lambdabot-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 3339e7aa96d8..51db50a75b76 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lambdabot-utils"; - version = "4.2.1"; - sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx"; + version = "4.2.2"; + sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7"; buildDepends = [ binary haskellSrc mtl network random regexCompat regexPosix syb tagsoup utf8String zlib From 4157f125c48d4255541cbc94fdeae8d859d2816b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 221/248] haskell-lens: update to version 3.8.7.3 --- pkgs/development/libraries/haskell/lens/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e7e40312af3e..b5f8851796e7 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -3,19 +3,19 @@ , MonadCatchIOTransformers, mtl, parallel, profunctorExtras , profunctors, reflection, semigroupoids, semigroups, split, tagged , text, transformers, transformersCompat, unorderedContainers -, vector +, vector, void }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.5"; - sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; + version = "3.8.7.3"; + sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel profunctorExtras profunctors reflection semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers vector + transformersCompat unorderedContainers vector void ]; meta = { homepage = "http://github.com/ekmett/lens/"; From cb73bffd9f5f985f1388bfa76daed1f8bc3bab53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 222/248] haskell-pandoc: update to version 1.10.1 --- pkgs/development/libraries/haskell/pandoc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index d53ddf7ad308..df24b4ac0222 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -17,6 +17,9 @@ cabal.mkDerivation (self: { text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; + patchPhase = '' + sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal + ''; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; From 050a8963e7e584781495762ae575b665997c826a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 223/248] haskell-persistent-postgresql: update to version 1.1.3 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 8fdc9f641aac..638f2e2c3bfc 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.2.1"; - sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and"; + version = "1.1.3"; + sha256 = "0dxazkdck2l5wxiyd7lcgd4xj95c7ql067s5hi3w1k89jf1wcx12"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers From 74084ad068ee408e527ece0aac2ec17384edccc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 224/248] haskell-persistent-sqlite: update to version 1.1.3 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 2da2c06a2439..17b9a6664364 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.2"; - sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3"; + version = "1.1.3"; + sha256 = "0rhwq9s6w48y867dmy5c0kvgrh9ixy3sqwq1i2zfacak82r6kki1"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; From 4f3e378f8743f1be6d8f078353543949ab0a4be0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:15 +0100 Subject: [PATCH 225/248] haskell-persistent-template: update to version 1.1.2.2 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 596b0789445f..284c7116ce6c 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.2.1"; - sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s"; + version = "1.1.2.2"; + sha256 = "168cxlnpcgkm7m7kzl3zlcvpgdl9wz7vx3anw8z8pc50qjns8dy0"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 2175e73c0b5d96f343fafce9c261b54289794c02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 226/248] haskell-persistent: update to version 1.1.5 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 83bc9f53951d..3babf8727354 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.4"; - sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj"; + version = "1.1.5"; + sha256 = "0jk4vkisc4as6xi0glc0sdldqf4xdj3s5xvv2vwzgjliyalggxga"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 09ca09082ae6d19b35062d91c9b104c58643962f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 227/248] haskell-readline: update to version 1.0.3.0 --- .../libraries/haskell/readline/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 0e65740b47e8..6090fc8578a2 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -1,9 +1,9 @@ -{ cabal, readline, ncurses } : +{ cabal, readline, ncurses }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "readline"; - version = "1.0.1.0"; - sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d"; + version = "1.0.3.0"; + sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0"; propagatedBuildInputs = [ readline ncurses ]; # experimentally link with ncursesw because ghci can't interpret ld scripts, # and ncurses sometimes seems to be a script pointing to ncursesw @@ -14,8 +14,6 @@ cabal.mkDerivation (self : { description = "An interface to the GNU readline library"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 8d19035bb470b9a7d422f6e2106993989f7478cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 228/248] haskell-unix-time: update to version 0.1.5 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index a17ed203941d..24edaf806268 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.4"; - sha256 = "1a8z9r75jk4z4diyigk0qzljkjqirxm30vf3jp75plnc9irysnw5"; + version = "0.1.5"; + sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; From cc32774ccd92bd86597c95f51fcb60d85bb5ec12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 229/248] haskell-wai-app-static: update to version 1.3.1.1 --- .../libraries/haskell/wai-app-static/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 2ff182470009..8970c1d1042f 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,15 +6,15 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1"; - sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk"; + version = "1.3.1.1"; + sha256 = "0zbkjh2l9qjm4s9z7cm327kdrf58rhasn764pv347ll2n7gphgqq"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; meta = { - homepage = "http://www.yesodweb.com/book/wai"; + homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; From 300ac630f49222c743aec642a34e6f3881d7aef1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 230/248] haskell-wai-extra: update to version 1.3.2.3 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9cebbde00090..3ba52da0050a 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2.1"; - sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; + version = "1.3.2.3"; + sha256 = "1xqx00s1y87ji8n092f0rq150b3ahl1p4xwas5cl01ayp106ywzs"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From c1729b434e7bf9bea5e7be247d6ddd6799fbec36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 231/248] haskell-wai-test: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/wai-test/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index cff2cb318502..d0dc0a5b571a 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0.1"; - sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; + version = "1.3.0.2"; + sha256 = "0awr1wwhky0mbllfdan42shfckmnnf66dji5zx7rhwjdfqvbbhzn"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai ]; meta = { - homepage = "http://www.yesodweb.com/book/wai"; + homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; From bd30436125c2baa2e2be34fa725427e919ecd264 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 232/248] haskell-wai: update to version 1.3.0.3 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index ee6eb2885654..f1922a95b7e3 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.2"; - sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; + version = "1.3.0.3"; + sha256 = "091qykycxfh9f1jysdjxkw4msdgxp796as3yzv9sgqsxvz58rv1n"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 482e22c171c5e3cd0cc61530340aeaf59fa9e629 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 233/248] haskell-warp: update to version 1.3.7.3 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index dd6bf66b676b..135d57f0024c 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.2"; - sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; + version = "1.3.7.3"; + sha256 = "0k68dqnz0j9x5698sr2yqcxh1bd3ppv2qh2dn4919lrlpzn3xd93"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From ac68f89304bdf37886e9d156b1bfb922c9e6085b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 234/248] haskell-xml-hamlet: update to version 0.4.0.4 --- pkgs/development/libraries/haskell/xml-hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 41a5c710d6af..1be00fa0c0f3 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.3"; - sha256 = "1923c2jg162jab01mcbpy52xs1pzxkrgny6sq8v0p758n8hjazwc"; + version = "0.4.0.4"; + sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; buildDepends = [ parsec shakespeare text xmlConduit ]; meta = { homepage = "http://www.yesodweb.com/"; From 19303533484ad5d9a696ed2b974aae124d6a3a32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 235/248] haskell-yaml: update to version 0.8.2.1 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index eb90b847fc8c..9641cef56aa2 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2"; - sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8"; + version = "0.8.2.1"; + sha256 = "1p0hi9psm42bsmm14gfdkj4wrbcgzkishcih6rwc2bcvn2i0hyyw"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From 5931c8126ccc844b335210f6f8e700d35fd62e50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:16 +0100 Subject: [PATCH 236/248] haskell-yesod-core: update to version 1.1.8.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 1d9bacbe55a1..6ddbaa13eff4 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.8"; - sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; + version = "1.1.8.1"; + sha256 = "1bkqh8k7wwyj5s8pyxmlc1lrz47rz1mj49mqmpbislkjk0p6hbks"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From ec06560c23ae16429f58a803b47f244a5fe5950f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 237/248] haskell-yesod-default: update to version 1.1.3.1 --- pkgs/development/libraries/haskell/yesod-default/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index d2bbf413c835..65a86b46cca3 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.3"; - sha256 = "1g0hb6jl0bp2q50pw2cy3hkbww1l230al08s7vfpqir68n9infiy"; + version = "1.1.3.1"; + sha256 = "16kxq93q5q6bz47s1rfgswrygyp1g090b8r11n56r8mnr24ix0mi"; buildDepends = [ dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs text transformers unorderedContainers wai waiExtra warp yaml From c9cb0226f6fca6d8c8f86831e77806ef3d760ea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 238/248] haskell-yesod-form: update to version 1.2.1.2 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index f886f1d3abfd..0e9999532a0c 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1.1"; - sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm"; + version = "1.2.1.2"; + sha256 = "121c6ln8y6l2f9n6pjs2nrghz7w94pb34vp12cj8fabc71vk029j"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From f78b8e7d62b98aed84a23cc8cf99a4e2d0af973b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 239/248] haskell-yesod-json: update to version 1.1.2.1 --- pkgs/development/libraries/haskell/yesod-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 1c46d7977aa7..4b1777676a82 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.1.2"; - sha256 = "0vbjg038vgdwd5a4w7r5261xgvylzzk4gikk4285ns471x8n0vrf"; + version = "1.1.2.1"; + sha256 = "0vrhn3v26q7cqwds99hqyibq09vyxnviqzgyn7w5ldnl3ycg7dqd"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes From a87fad64eea9f1953652ce7e813c4fde55eab461 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 240/248] haskell-yesod-static: update to version 1.1.2.1 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index a47cc59ecc5b..5af1efc31f25 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2"; - sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; + version = "1.1.2.1"; + sha256 = "0hpab9sgm6pa0lw2nl1p6l4gl3ciscsc21q0d2cp3aa75gavyrjz"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai From bedd8954bafe2606e7edf7ea525dc2cb42d7a487 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 241/248] haskell-yesod-test: update to version 0.3.3.2 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 2d7496b3c1c5..b11c88534b28 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3.1"; - sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; + version = "0.3.3.2"; + sha256 = "0skr710fqqnna17gywaj30kpj352px2d17fwwqb832j7mj92bmv5"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 946d22375bef2ccdaa8d2ece21d25db3298cd846 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 242/248] haskell-yesod: update to version 1.1.8.1 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 96f3ebbd9a54..dc412ca9a9ee 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.8"; - sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; + version = "1.1.8.1"; + sha256 = "01s9b0pqqj7q760vm62ni95k5fqwccw8l6531kqav2vnfvi08ric"; isLibrary = true; isExecutable = true; buildDepends = [ From b91414b12e2dbdaf7d58c3ecad9fb398fcc31700 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:17 +0100 Subject: [PATCH 243/248] haskell-SourceGraph: update to version 0.7.0.5 --- pkgs/development/tools/haskell/SourceGraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index f5d43a7ab50f..17d191064816 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SourceGraph"; - version = "0.7.0.4"; - sha256 = "1rxbanvw1dpdnpmrf5gpl12gn9796yq89dnmdxy56mb9qzsm7nm6"; + version = "0.7.0.5"; + sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk"; isLibrary = false; isExecutable = true; buildDepends = [ From 33b130ee694deeb8e9275fc752fd774c39f9a22a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:11:34 +0100 Subject: [PATCH 244/248] ikiwiki: update to version 3.20130212 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index bbc8aaac49bd..de1df426052a 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20121212"; + version = "3.20130212"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz"; + sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From aa2798f870887aef53d5df487e98402bc334a017 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:19:55 +0100 Subject: [PATCH 245/248] haskell-Glob: add version 0.7.2 --- .../development/libraries/haskell/Glob/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Glob/default.nix diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix new file mode 100644 index 000000000000..08ae46179569 --- /dev/null +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -0,0 +1,14 @@ +{ cabal, dlist, filepath, transformers }: + +cabal.mkDerivation (self: { + pname = "Glob"; + version = "0.7.2"; + sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i"; + buildDepends = [ dlist filepath transformers ]; + meta = { + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8d9d75ddb7ba..aa946dac3442 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -874,6 +874,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; + Glob = callPackage ../development/libraries/haskell/Glob {}; + GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { From 40fbde7a45cc77dfa553e44510180b4524d87dd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:20:08 +0100 Subject: [PATCH 246/248] haskell-maccatcher: add version 2.1.5 --- .../libraries/haskell/maccatcher/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/maccatcher/default.nix diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix new file mode 100644 index 000000000000..6109f33f82fe --- /dev/null +++ b/pkgs/development/libraries/haskell/maccatcher/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, parsec }: + +cabal.mkDerivation (self: { + pname = "maccatcher"; + version = "2.1.5"; + sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary parsec ]; + meta = { + description = "Obtain the host MAC address on *NIX and Windows"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aa946dac3442..8518493f0885 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1183,6 +1183,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logict = callPackage ../development/libraries/haskell/logict {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; From 7e8ccea89931ddaaae3072c9cfd1695c719dfdc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:20:20 +0100 Subject: [PATCH 247/248] haskell-uuid: add version 1.2.9 --- .../development/libraries/haskell/uuid/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/uuid/default.nix diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix new file mode 100644 index 000000000000..5b939ccb6cc6 --- /dev/null +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, cryptohash, maccatcher, random, time }: + +cabal.mkDerivation (self: { + pname = "uuid"; + version = "1.2.9"; + sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi"; + buildDepends = [ binary cryptohash maccatcher random time ]; + meta = { + homepage = "http://projects.haskell.org/uuid/"; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8518493f0885..b2b7915eb632 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1759,6 +1759,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uulib = callPackage ../development/libraries/haskell/uulib {}; + uuid = callPackage ../development/libraries/haskell/uuid {}; + uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {}; vacuum = callPackage ../development/libraries/haskell/vacuum {}; From b076ab94d63bf903710dbd126692f5e889c27a0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 18 Feb 2013 11:20:46 +0100 Subject: [PATCH 248/248] git-annex: update to version 3.20130216 --- .../version-management/git-and-tools/default.nix | 2 +- .../git-and-tools/git-annex/default.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3120cc84e63f..75c71f9cfdf7 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -49,7 +49,7 @@ rec { network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck - SafeSemaphore networkPprotocolXmpp async dns DAV; + SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index aef86c06cfb7..7f11462aa02e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -8,18 +8,18 @@ , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time , transformers, transformersBase, utf8String, wai, waiLogger, warp , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore -, networkPprotocolXmpp, async, dns, DAV +, networkPprotocolXmpp, async, dns, DAV, uuid, Glob }: let - version = "3.20130107"; + version = "3.20130216"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq"; + sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr"; name = "git-annex-${version}.tar.gz"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { networkInfo networkMulticast pcreLight QuickCheck SHA stm text time transformers transformersBase utf8String wai waiLogger warp yesod yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp - async dns DAV ]; + async dns DAV uuid Glob ]; checkTarget = "test"; doCheck = true;