From 9322bee98823df6abcf989e6c0749711b30de56e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Nov 2012 13:01:44 +0100 Subject: [PATCH 001/302] Use systemd instead of udev, and don't use consolekit --- pkgs/desktops/kde-4.7/kde-workspace.nix | 4 ++-- pkgs/desktops/kde-4.8/kde-workspace.nix | 4 ++-- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/os-specific/linux/upower/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 ++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 8116f4bb6b5..1ece3f49076 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate -, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi , pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 31937d4f1d5..1a86eacb336 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi kactivities ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 88daab5ff92..788b6d6d32b 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext , gobjectIntrospection -, useSystemd ? false, systemd ? null }: +, useSystemd ? true, systemd }: let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2f870e5d999..6ae4c22f48a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils -, useSystemd ? false, systemd ? null +, useSystemd ? true, systemd }: assert stdenv.isLinux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f0918faff..749f3f24711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5095,12 +5095,11 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; - ### DEVELOPMENT / LIBRARIES / JAVA + ### DEVELOPMENT / LIBRARIES / JAVA atermjava = callPackage ../development/libraries/java/aterm { stdenv = overrideInStdenv stdenv [gnumake380]; - }; commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { }; @@ -5169,6 +5168,7 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; @@ -6241,7 +6241,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev173 = callPackage ../os-specific/linux/udev/173.nix { }; - udev = pkgs.udev173; + udev = pkgs.systemd; udisks = callPackage ../os-specific/linux/udisks { }; @@ -7667,7 +7667,9 @@ let dropbox = callPackage ../applications/networking/dropbox { }; - slim = callPackage ../applications/display-managers/slim { }; + slim = callPackage ../applications/display-managers/slim { + consolekit = null; + }; sndBase = builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; From b6c5b9806f6ae79652336a7cfb51fe0f03d0590a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 20 Nov 2012 14:06:10 -0800 Subject: [PATCH 002/302] add bash-4.2 patches 25 through 39 --- pkgs/shells/bash/bash-4.2-patches.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 8d2a74e95b0..57f4ef91863 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,4 +25,20 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") +(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") +(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") +(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") +(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") +(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") +(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") +(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") +(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") +(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") +(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") +(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") +(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") +(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") +(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") +(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") ] + From 949421a4b996aa30370e398e899119754f2f8448 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 28 Nov 2012 14:10:07 -0800 Subject: [PATCH 003/302] Applied to wrong branch. Revert "add bash-4.2 patches 25 through 39" This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a. --- pkgs/shells/bash/bash-4.2-patches.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 57f4ef91863..8d2a74e95b0 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,20 +25,4 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") -(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") -(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") -(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") -(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") -(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") -(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") -(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") -(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") -(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") -(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") -(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") -(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") -(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") -(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") -(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") ] - From fd6941ad48b6417b7a0aa2d04fb393f53d21d9a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Dec 2012 16:17:47 +0100 Subject: [PATCH 004/302] nut: Update to 2.6.5 and fix building against systemd http://hydra.nixos.org/build/3473781 --- pkgs/applications/misc/nut/2.6.3.nix | 34 -------------------------- pkgs/applications/misc/nut/default.nix | 32 +++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 20 insertions(+), 48 deletions(-) delete mode 100644 pkgs/applications/misc/nut/2.6.3.nix diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix deleted file mode 100644 index 471529675db..00000000000 --- a/pkgs/applications/misc/nut/2.6.3.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: - -stdenv.mkDerivation { - name = "nut-2.6.3"; - src = fetchurl { - url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz; - sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l"; - }; - - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; - buildNativeInputs = [ pkgconfig ]; - - configureFlags = [ - "--with-all" - "--with-ssl" - "--without-snmp" # Until we have it ... - "--without-powerman" # Until we have it ... - "--without-cgi" - "--without-hal" - ]; - - meta = { - description = "Network UPS Tools"; - longDescription = '' - Network UPS Tools is a collection of programs which provide a common - interface for monitoring and administering UPS, PDU and SCD hardware. - It uses a layered approach to connect all of the parts. - ''; - homepage = http://www.networkupstools.org/; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ pierron ]; - priority = 10; - }; -} diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 51ae8633a7c..b89a35d2f81 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }: +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: -stdenv.mkDerivation { - name = "nut-2.6.1"; +stdenv.mkDerivation rec { + name = "nut-2.6.5"; src = fetchurl { - url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz; - sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00"; + url = "http://www.networkupstools.org/source/2.6/${name}.tar.gz"; + sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1"; }; - buildInputs = [ pkgconfig neon libusb openssl udev ]; + buildInputs = [ neon libusb openssl udev avahi freeipmi ]; - configureFlags = [ - "--with-all" - "--without-snmp" # Until we have it ... - "--without-powerman" # Until we have it ... - "--without-cgi" - ]; + buildNativeInputs = [ pkgconfig ]; + + configureFlags = + [ "--with-all" + "--with-ssl" + "--without-snmp" # Until we have it ... + "--without-powerman" # Until we have it ... + "--without-cgi" + "--without-hal" + "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + ]; + + enableParallelBuilding = true; meta = { description = "Network UPS Tools"; @@ -27,5 +34,6 @@ stdenv.mkDerivation { homepage = http://www.networkupstools.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; + priority = 10; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1941780ebc..c8fdc065328 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8886,8 +8886,6 @@ let nut = callPackage ../applications/misc/nut { }; - nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { }; - disnix = callPackage ../tools/package-management/disnix { }; disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { From 6a0288d14b2e48508bac4e4c3c8f45352842d938 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Dec 2012 16:26:03 +0100 Subject: [PATCH 005/302] network-manager: Fix building against systemd http://hydra.nixos.org/build/3473319 --- pkgs/tools/networking/network-manager/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index eec7361f6a2..ea0095c6684 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { "--without-resolvconf" "--sysconfdir=/etc" "--localstatedir=/var" "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" - "--with-crypto=gnutls" "--disable-more-warnings" ]; + "--with-crypto=gnutls" "--disable-more-warnings" + "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; - description = "Network configuration and management in an easy way. Desktop environment independent."; + description = "Network configuration and management tool"; license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; From 8beea558696a225c7b31ce989c011ae0c952b81a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Dec 2012 16:34:38 +0100 Subject: [PATCH 006/302] system-config-printer: Update to 1.3.12 Fixes building against systemd. http://hydra.nixos.org/build/3469842 --- .../misc/system-config-printer/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 8923637bbdb..0f20a8ad954 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto , makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl -, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups +, pythonDBus, libxml2, desktop_file_utils, libusb1, cups, pycups , pythonPackages , withGUI ? true }: stdenv.mkDerivation rec { - name = "${meta.name}-${meta.version}"; + name = "system-config-printer-1.3.12"; src = fetchurl { - url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz"; - sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw"; + url = "http://cyberelk.net/tim/data/system-config-printer/1.3/${name}.tar.xz"; + sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r"; }; buildInputs = - [ intltool pkgconfig glib udev libusb cups xmlto + [ intltool pkgconfig glib udev libusb1 cups xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils pythonPackages.python pythonPackages.wrapPython ]; @@ -22,8 +22,11 @@ stdenv.mkDerivation rec { pythonPath = [ pythonDBus pycups pygobject ] ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ]; - - configureFlags = "--with-udev-rules"; + + configureFlags = + [ "--with-udev-rules" + "--with-systemdsystemunitdir=$(out)/etc/systemd/systemd" + ]; postInstall = '' @@ -34,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = { - name = "system-config-printer"; - version = "1.3.4"; + homepage = http://cyberelk.net/tim/software/system-config-printer/; }; } From 8116fd9341881323e6303ee1c0c205a207e5ae36 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Dec 2012 11:30:18 +0100 Subject: [PATCH 007/302] consolekit: Remove This package is obsolete with systemd. --- .../display-managers/slim/default.nix | 6 +- .../0001-Don-t-daemonize-when-activated.patch | 28 --------- ...0002-Don-t-take-bus-name-until-ready.patch | 62 ------------------- .../libraries/consolekit/commands.patch | 33 ---------- .../libraries/consolekit/default.nix | 29 --------- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/release.nix | 1 - 7 files changed, 4 insertions(+), 161 deletions(-) delete mode 100644 pkgs/development/libraries/consolekit/0001-Don-t-daemonize-when-activated.patch delete mode 100644 pkgs/development/libraries/consolekit/0002-Don-t-take-bus-name-until-ready.patch delete mode 100644 pkgs/development/libraries/consolekit/commands.patch delete mode 100644 pkgs/development/libraries/consolekit/default.nix diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 0675b02a314..601aa7bf53a 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu -, fontconfig, freetype, pam, consolekit, dbus_libs }: +, fontconfig, freetype, pam, dbus_libs }: stdenv.mkDerivation rec { name = "slim-1.3.4"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype pam dbus_libs - ] ++ stdenv.lib.optional (consolekit != null) consolekit; + ]; preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc"; - cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1"; + cmakeFlags = [ "-DUSE_PAM=1" ]; NIX_CFLAGS_LINK = "-lXmu"; diff --git a/pkgs/development/libraries/consolekit/0001-Don-t-daemonize-when-activated.patch b/pkgs/development/libraries/consolekit/0001-Don-t-daemonize-when-activated.patch deleted file mode 100644 index 30f3ab4907b..00000000000 --- a/pkgs/development/libraries/consolekit/0001-Don-t-daemonize-when-activated.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream patch - -From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 21 Dec 2009 11:13:23 -0500 -Subject: [PATCH 1/2] Don't daemonize when activated - -It confuses some versions of D-Bus and isn't needed -(or wanted it). - -http://bugs.freedesktop.org/show_bug.cgi?id=25642 ---- - data/org.freedesktop.ConsoleKit.service.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in -index ec2128c..d716a36 100644 ---- a/data/org.freedesktop.ConsoleKit.service.in -+++ b/data/org.freedesktop.ConsoleKit.service.in -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=org.freedesktop.ConsoleKit --Exec=@sbindir@/console-kit-daemon -+Exec=@sbindir@/console-kit-daemon --no-daemon - User=root --- -1.7.1 - diff --git a/pkgs/development/libraries/consolekit/0002-Don-t-take-bus-name-until-ready.patch b/pkgs/development/libraries/consolekit/0002-Don-t-take-bus-name-until-ready.patch deleted file mode 100644 index 2af59ac8d1e..00000000000 --- a/pkgs/development/libraries/consolekit/0002-Don-t-take-bus-name-until-ready.patch +++ /dev/null @@ -1,62 +0,0 @@ -Upstream patch - -From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 21 Dec 2009 11:14:54 -0500 -Subject: [PATCH 2/2] Don't take bus name until ready - -Previously, we would take a bus name right away, but -not register the manager object until later. This -causes a race when being activated by a method call -on the manager object, where ConsoleKit gets started -but the method call fails. - -https://bugs.freedesktop.org/show_bug.cgi?id=25744 ---- - src/main.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/main.c b/src/main.c -index 809c6d6..b8f698f 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -294,11 +294,19 @@ main (int argc, - - setup_debug_log (debug); - -+ g_debug ("initializing console-kit-daemon %s", VERSION); -+ - connection = get_system_bus (); - if (connection == NULL) { - goto out; - } - -+ manager = ck_manager_new (); -+ -+ if (manager == NULL) { -+ goto out; -+ } -+ - bus_proxy = get_bus_proxy (connection); - if (bus_proxy == NULL) { - g_warning ("Could not construct bus_proxy object; bailing out"); -@@ -310,16 +318,8 @@ main (int argc, - goto out; - } - -- g_debug ("initializing console-kit-daemon %s", VERSION); -- - create_pid_file (); - -- manager = ck_manager_new (); -- -- if (manager == NULL) { -- goto out; -- } -- - loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect (bus_proxy, --- -1.7.1 - diff --git a/pkgs/development/libraries/consolekit/commands.patch b/pkgs/development/libraries/consolekit/commands.patch deleted file mode 100644 index 48b0d5d8cf6..00000000000 --- a/pkgs/development/libraries/consolekit/commands.patch +++ /dev/null @@ -1,33 +0,0 @@ -This patch adds shutdown commands specific to NixOS, as NixOS does not have -a /sbin or /usr/sbin directory. In order not to have a dependency on the -package that provides "shutdown" when in an environment other than NixOS, -we'll make it depend on /var/run/current-system. - -Note: this patch does not compromise system security. Other systems than -NixOS should have already shutdown in the earlier directories being searched, -and otherwise /var/run is writable only be root. - ---- ConsoleKit-0.4.1/tools/linux/ck-system-restart.org 2012-02-13 11:29:57.352902568 +0100 -+++ ConsoleKit-0.4.1/tools/linux/ck-system-restart 2012-02-13 11:43:27.593317712 +0100 -@@ -7,6 +7,9 @@ - elif [ -x "/usr/sbin/shutdown" ] ; then - /usr/sbin/shutdown -r now - exit $? -+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then -+ /var/run/current-system/sw/sbin/shutdown -r now -+ exit $? - else - exit 1 - fi ---- ConsoleKit-0.4.1/tools/linux/ck-system-stop.org 2012-02-13 11:30:06.228950934 +0100 -+++ ConsoleKit-0.4.1/tools/linux/ck-system-stop 2012-02-13 11:44:12.664563304 +0100 -@@ -7,6 +7,9 @@ - elif [ -x "/usr/sbin/shutdown" ] ; then - /usr/sbin/shutdown -h now - exit $? -+elif [ -x "/var/run/current-system/sw/sbin/shutdown" ] ; then -+ /var/run/current-system/sw/sbin/shutdown -h now -+ exit $? - else - exit 1 - fi diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix deleted file mode 100644 index e9cedf18857..00000000000 --- a/pkgs/development/libraries/consolekit/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, - libX11, polkit, expat }: - -stdenv.mkDerivation rec { - name = "consolekit-0.4.1"; - - src = fetchurl { - url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2; - sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph"; - }; - - buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; - patches = [ ./0001-Don-t-daemonize-when-activated.patch - ./0002-Don-t-take-bus-name-until-ready.patch - ./commands.patch # adds shutdown commands for NixOS to the list of shutdown commands - ]; - - # For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_LDFLAGS = "-lgcc_s"; - - configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc"; - - installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/ConsoleKit; - description = "A framework for defining and tracking users, login sessions, and seats"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8fdc065328..9221efcf956 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3449,8 +3449,6 @@ let confuse = callPackage ../development/libraries/confuse { }; - consolekit = callPackage ../development/libraries/consolekit { }; - coredumper = callPackage ../development/libraries/coredumper { }; ctl = callPackage ../development/libraries/ctl { }; @@ -7703,9 +7701,7 @@ let dropbox = callPackage ../applications/networking/dropbox { }; - slim = callPackage ../applications/display-managers/slim { - consolekit = null; - }; + slim = callPackage ../applications/display-managers/slim { }; sndBase = builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e4efb2cbd9c..2148f50a1ed 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -49,7 +49,6 @@ with (import ./release-lib.nix); chatzilla = linux; cksfv = all; classpath = linux; - consolekit = linux; coreutils = all; cpio = all; cron = linux; From 726b1bebbc3f4c50a0e4b6b152f35b3b537fd389 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Dec 2012 11:42:00 +0100 Subject: [PATCH 008/302] Remove udev 173 --- pkgs/os-specific/linux/udev/173.nix | 58 ------------ .../os-specific/linux/udev/custom-rules.patch | 91 ------------------- .../linux/udev/pre-accept4-kernel.patch | 43 --------- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 193 deletions(-) delete mode 100644 pkgs/os-specific/linux/udev/173.nix delete mode 100644 pkgs/os-specific/linux/udev/custom-rules.patch delete mode 100644 pkgs/os-specific/linux/udev/pre-accept4-kernel.patch diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix deleted file mode 100644 index 795826cf6bf..00000000000 --- a/pkgs/os-specific/linux/udev/173.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, gperf, pkgconfig, glib, acl -, libusb, usbutils, pciutils }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "udev-173"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "1bxadi4bi11v8ipzj22wknv8hsb0wgdb99bx3w9w33rgl4aq78bh"; - }; - - buildInputs = [ gperf pkgconfig glib acl libusb usbutils ]; - - configureFlags = - '' - --with-pci-ids-path=${pciutils}/share/pci.ids - --enable-udev_acl --enable-edd - --disable-introspection --libexecdir=$(out)/lib/udev - --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware - ''; - - # Workaround for the Linux kernel headers being too old. - NIX_CFLAGS_COMPILE = "-DBTN_TRIGGER_HAPPY=0x2c0"; - - postInstall = - '' - # The path to rule_generator.functions in write_cd_rules and - # write_net_rules is broken. Also, don't store the mutable - # persistant rules in /etc/udev/rules.d but in - # /var/lib/udev/rules.d. - for i in $out/lib/udev/write_cd_rules $out/lib/udev/write_net_rules; do - substituteInPlace $i \ - --replace /lib/udev $out/lib/udev \ - --replace /etc/udev/rules.d /var/lib/udev/rules.d - done - - # Don't set PATH to /bin:/sbin; won't work in NixOS. - sed -e '/PATH=/d' -i $out/lib/udev/rule_generator.functions - - ln -sv $out/lib/ConsoleKit $out/etc/ConsoleKit - - rm -frv $out/share/gtk-doc - ''; - - patches = [ ./custom-rules.patch ] ++ - [(fetchurl { - url = https://bugs.archlinux.org/task/25356?getfile=7281; - sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm"; - })] ++ - stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch; - - meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; - description = "Udev manages the /dev filesystem"; - }; -} diff --git a/pkgs/os-specific/linux/udev/custom-rules.patch b/pkgs/os-specific/linux/udev/custom-rules.patch deleted file mode 100644 index 647691acfb1..00000000000 --- a/pkgs/os-specific/linux/udev/custom-rules.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit c49ec33ba0f1a7f11b188913bb4895360ced67f8 -Author: Yury G. Kudryashov -Date: Tue Aug 16 16:28:56 2011 +0400 - - Upstream considers presence of rules_dir=... in udev.conf as a very special case. - In particular, they disable /dev/.udev/*. Re-enable it. - -diff --git a/udev/udev-rules.c b/udev/udev-rules.c -index 6bf2726..c1ae1f3 100644 ---- a/udev/udev-rules.c -+++ b/udev/udev-rules.c -@@ -1812,6 +1812,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) - struct udev_list file_list; - struct udev_list_entry *file_loop; - struct token end_token; -+ char runpathrules[UTIL_PATH_SIZE]; - - rules = calloc(1, sizeof(struct udev_rules)); - if (rules == NULL) -@@ -1854,22 +1855,21 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) - rules->trie_nodes_cur = 1; - - if (udev_get_rules_path(udev) == NULL) { -- char filename[UTIL_PATH_SIZE]; - - /* /lib/udev -- default/package rules */ - add_matching_files(udev, &file_list, LIBEXECDIR "/rules.d", ".rules"); - - /* /etc/udev -- system-specific/user/admin rules */ - add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules"); -- -- /* /run/udev -- throw-away/temporary rules */ -- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); -- add_matching_files(udev, &file_list, filename, ".rules"); - } else { - /* custom rules files location for testing */ - add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules"); - } - -+ /* /run/udev -- throw-away/temporary rules */ -+ util_strscpyl(runpathrules, sizeof(runpathrules), udev_get_run_path(udev), "/rules.d", NULL); -+ add_matching_files(udev, &file_list, runpathrules, ".rules"); -+ - /* add all filenames to the string buffer */ - udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) { - const char *filename = udev_list_entry_get_value(file_loop); -diff --git a/udev/udevd.c b/udev/udevd.c -index f1a31e7..45d10b6 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -1198,6 +1198,8 @@ int main(int argc, char *argv[]) - struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; - struct udev_ctrl_connection *ctrl_conn = NULL; - int rc = 1; -+ char filename[UTIL_PATH_SIZE]; -+ struct stat statbuf; - - udev = udev_new(); - if (udev == NULL) -@@ -1480,23 +1482,21 @@ int main(int argc, char *argv[]) - inotify_add_watch(fd_inotify, udev_get_rules_path(udev), - IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); - } else { -- char filename[UTIL_PATH_SIZE]; -- struct stat statbuf; - - inotify_add_watch(fd_inotify, LIBEXECDIR "/rules.d", - IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); - inotify_add_watch(fd_inotify, SYSCONFDIR "/udev/rules.d", - IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); -+ } - -- /* watch dynamic rules directory */ -- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); -- if (stat(filename, &statbuf) != 0) { -- util_create_path(udev, filename); -- mkdir(filename, 0755); -- } -- inotify_add_watch(fd_inotify, filename, -- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); -+ /* watch dynamic rules directory */ -+ util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); -+ if (stat(filename, &statbuf) != 0) { -+ util_create_path(udev, filename); -+ mkdir(filename, 0755); - } -+ inotify_add_watch(fd_inotify, filename, -+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); - udev_watch_restore(udev); - - /* block and listen to all signals on signalfd */ diff --git a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch deleted file mode 100644 index 2cf549d99a7..00000000000 --- a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: -https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch - -diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c ---- a/udev/udev-ctrl.c 2011-10-09 17:10:32.000000000 -0600 -+++ b/udev/udev-ctrl.c 2011-10-25 15:11:09.000000000 -0600 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -182,6 +183,7 @@ - struct ucred ucred; - socklen_t slen; - const int on = 1; -+ int flgs; - - conn = calloc(1, sizeof(struct udev_ctrl_connection)); - if (conn == NULL) -@@ -189,13 +191,19 @@ - conn->refcount = 1; - conn->uctrl = uctrl; - -- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); -+// conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); -+ conn->sock = accept(uctrl->sock, NULL, NULL); - if (conn->sock < 0) { - if (errno != EINTR) - err(uctrl->udev, "unable to receive ctrl connection: %m\n"); - goto err; - } - -+// Since we don't have accept4 -+ flgs = fcntl(conn->sock, F_GETFL, NULL); -+ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK); -+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC); -+ - /* check peer credential of connection */ - slen = sizeof(ucred); - if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9221efcf956..994ac509533 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6269,7 +6269,6 @@ let }); udev145 = callPackage ../os-specific/linux/udev/145.nix { }; - udev173 = callPackage ../os-specific/linux/udev/173.nix { }; udev = pkgs.systemd; udisks = callPackage ../os-specific/linux/udisks { }; From b11e1305b51eff17ef10bf375031be0749f4812a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Dec 2012 13:14:58 +0100 Subject: [PATCH 009/302] udisks: Hack to work with the latest udev We should probably update to udisks2, but I'm not sure if it's compatible at the D-Bus interface level. http://hydra.nixos.org/build/3488623 --- pkgs/os-specific/linux/udisks/default.nix | 7 +------ pkgs/os-specific/linux/udisks/no-pci-db.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/udisks/no-pci-db.patch diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix index 4987e90429c..b46efd46874 100644 --- a/pkgs/os-specific/linux/udisks/default.nix +++ b/pkgs/os-specific/linux/udisks/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5"; }; - patches = [ ./purity.patch ]; + patches = [ ./purity.patch ./no-pci-db.patch ]; postPatch = '' @@ -30,11 +30,6 @@ stdenv.mkDerivation rec { configureFlags = "--localstatedir=/var --enable-lvm2"; - preConfigure = - '' - # Ensure that udisks can find the necessary programs. - ''; - meta = { homepage = http://www.freedesktop.org/wiki/Software/udisks; description = "A daemon and command-line utility for querying and manipulating storage devices"; diff --git a/pkgs/os-specific/linux/udisks/no-pci-db.patch b/pkgs/os-specific/linux/udisks/no-pci-db.patch new file mode 100644 index 00000000000..b323b515c40 --- /dev/null +++ b/pkgs/os-specific/linux/udisks/no-pci-db.patch @@ -0,0 +1,13 @@ +Systemd no longer has the pci-db program. + +diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules +--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200 ++++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100 +@@ -3,7 +3,6 @@ + + # import names for PCI storage controllers + # +-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p" + + # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure + # the device is on a cardbus controller (upper PCI device) - then we check From 886742d91a509474af89a888ca9fe4a26c2374c9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 14 Dec 2012 20:21:18 +0100 Subject: [PATCH 010/302] use recursivePthLoader instead of setuptoolsSite --- pkgs/development/python-modules/generic/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8da833b0dc1..4494392cfef 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, offlineDistutils, setuptoolsSite }: +{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }: { name, namePrefix ? "python-" @@ -51,8 +51,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # setuptoolsSite is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ setuptoolsSite ]; + # recursivePthLoader is responsible for loading pth files + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; buildInputStrings = map toString buildInputs; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7dad6abe419..ba1068a112e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec { buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools setuptoolsSite offlineDistutils; + inherit python wrapPython setuptools recursivePthLoader offlineDistutils; }; From ad55bb39baa1c9c892f0ed6b14b40f79bfab6b65 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 00:46:55 +0100 Subject: [PATCH 011/302] prefix setuptools -> python-setuptools --- pkgs/development/python-modules/setuptools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 879f6aed8de..468ea50c924 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { - name = "setuptools-" + version; + name = "python-setuptools-" + version; version = "0.6c11"; From b19162f88b01a6d5dc100ede9beefd53f036cc33 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 01:17:22 +0100 Subject: [PATCH 012/302] release-python.nix used by hydra python-rework jobset define full job attributes (not just systems) so we can define schedulingPriority without touching release-lib.nix. There is definitely a more elegant way to recursively walk attributes and fill in missing values (job and schedulingPriority). --- pkgs/top-level/release-python.nix | 2173 +++++++++++++++++++++++++++++ 1 file changed, 2173 insertions(+) create mode 100644 pkgs/top-level/release-python.nix diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix new file mode 100644 index 00000000000..521800647ec --- /dev/null +++ b/pkgs/top-level/release-python.nix @@ -0,0 +1,2173 @@ +/* + This file will be evaluated by hydra with a call like this: + hydra_eval_jobs --gc-roots-dir \ + /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ + system i686-linux --argstr system x86_64-linux --arg \ + nixpkgs "{outPath = ./}" .... release.nix + + Hydra can be installed with "nix-env -i hydra". +*/ +with (import ./release-lib.nix); + +{ + + tarball = import ./make-tarball.nix; + +} // (mapTestOn rec { + + a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2005 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2006 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2008 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2009 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2010 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aangifte2011 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abcde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + abiword = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alienarena = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alsaPlugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alsaPluginWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amsn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amule = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amuleDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amuleGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + androidsdk_4_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + andyetitmoves = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntOpenJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apacheAntOracleJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ardour = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ardour3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + arora = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asciidoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aspectj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + asymptote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atari800 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ataripp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atermjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + attica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aubio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + auctex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + audacious = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + audacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + autojump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + automoc4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avahi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avidemux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + avogadro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + awesome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aws_mturk_clt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + axis2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + azureus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ballAndPaddle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + baresip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bazaar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beret = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ber_metaocaml_003 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bibletime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bibtextools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + binutils_gold = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + biolib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitcoin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitlbee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bitsnbots = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bittornado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bittorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blackshades = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blackshadeselite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blueman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bluez = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boinc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boomerang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost144 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost146 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost147 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost149 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boost151 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + botan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + box2d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + box2d_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + briss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bsddb3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + btanks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + btrfsProgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + buildbot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bumblebee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bzflag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + caelum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calibre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + caneda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + carrier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + castle_combat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cbrowser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cc1394 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ccid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cdrdao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + centerim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cflow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cgal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chatzilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cheetahTemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chipmunk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chromiumWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + chromium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cilaterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cinelerra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cinepaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ciopfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clangUnwrapped = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clanlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + classpath = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clearsilver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clisp_2_44_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clojure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clojure_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clooj_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clucene_core_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clutter_gtk_0_10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cmakeWithGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cmus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coccinelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cogl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coin3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + comical = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + compiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + compton = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + conkeror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + conky = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + consolekit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + construo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + construoBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + content = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coq_8_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coriander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + couchdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crack_attack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crrcsim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptsetup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + csound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + csslint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cudatoolkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cuneiform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cups_pdf_filter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + curlftpfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cvs2svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + d4x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + darktable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dblatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_cplusplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dbus_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ddd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + debian_devscripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dejagnu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + desktop_file_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + devicemapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dico = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + directfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + directvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disnixos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + DisnixWebService = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + disper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distcc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distrho = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + djview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmraid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmtcp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dosbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + doxygen_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dragonegg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + drbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + drgeo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dropbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dstat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + duplicity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dvdauthor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dvswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dwarf_fortress = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eaglemode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + easytag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ec2_api_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ecj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipses = { + eclipse_cpp_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_cpp_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_modeling_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_35 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_36 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_37 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eclipse_sdk_42 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + ecryptfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + edk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eduke32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eggdbus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + egoboo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ekiga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + elasticmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + electricsheep = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + elinks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs23 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacs24Packages = { + autoComplete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bbdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cedet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coffee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + colorTheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ecb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacsSessionManagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emacsw3m = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flymakeCursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphvizDot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + js2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logito = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + loremIpsum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + magit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maudeMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + org = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + org2blog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcache = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + proofgeneral = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rectMark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + remember = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scalaMode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sunriseCommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlRpc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + emboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enblendenfuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + encfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enchant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enlightenment = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + epdfview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + epm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + esdl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + espeakedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + etherape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + euca2ools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eukleides = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evince = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evolution_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + evopedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + expect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exrdisplay = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + extremetuxracer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exult = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + facile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fail2ban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fakenes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + farsight2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fbida = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fbpanel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fdisk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + feh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ffmpeg_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox13Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox17Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + firefox36Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flann = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flashplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flightgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fltk13 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fltk20 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fluidsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fontforgeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foo2zjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foursuite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + framac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freeciv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freedink = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freeglut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freemind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freepv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freerdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freerdpUnstable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freestyle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freetalk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + freetts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fspot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ftgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ftgl212 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fuppes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fusesmb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gajim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj44 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcj46 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GConf3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdbCross = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdk_pixbuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdome2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gecko_mediaplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geeqie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gegl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gegl_0_0_22 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gemrb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gensgs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geoclue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + geoipjava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + get_iplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + getmail = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghostOne = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghostscriptX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + giblib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gifsicle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gigedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimp_2_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimpPlugins = { + fourier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gimplensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lqrPlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + resynthesizer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texturize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + waveletSharpen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + girara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitAndTools = { + darcsToGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + git2cl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitAnnex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitBz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitFastExport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitSubtree = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgitGit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stgit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svn2git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svn2git_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + giv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gkrellm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gl117 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glestae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glfw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glibmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib_networking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + globulation2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gltron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glxinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnokii = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome = { + at_spi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GConf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gconfmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_control_center = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_desktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_doc_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_icon_theme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_menus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_settings_daemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_vfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_vfs_monikers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk_doc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkglext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkglextmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbonobo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbonoboui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libglade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libglademm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecanvasmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomecups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomekbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeprintui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnomeui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgtkhtml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libIDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libunique = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwnck = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + metacity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nautilus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ORBit2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pangomm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python_rsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + startup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zenity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + gnome_mplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_terminator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnome_user_docs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnonlin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnucash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnu = { + hurdHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libpthreadHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + machHeaders = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mig_raw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + gnumeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnunet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnunet08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnupg2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gnuplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gob2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gobby5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gobjectIntrospection = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goffice_0_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goldendict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + golly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + goocanvas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + googleearth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + google_talk_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gosmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gource = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gparted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gphoto2fs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpscorrelate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gpsd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gqview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grantlee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphicsmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphicsmagick137 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphviz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + graphviz_2_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gravit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grub2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + grub2_efi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gsettings_desktop_schemas = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gsmartcontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gssdp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_bad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_base = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_good = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_plugins_ugly = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gst_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkdatabox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkdialog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkgnutella = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkimageview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmm3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkmozembedsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksharp1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksharp2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceviewsharp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkspell = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtkwave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtmess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guileCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guileGnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + guitone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnp_igd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gupnptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gutenprint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gutenprintBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwenhywfar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gxneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hadoop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + harfbuzz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPackages = { + accelerateCuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + accelerateExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Chart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cuda = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diagrams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diagramsCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ghcMod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLFW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gloss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLURaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_1_1_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_1_2_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_2_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GLUT_2_3_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtksourceview2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2009_2_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2010_1_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2010_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_2_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2011_4_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + haskellPlatform_2012_2_0_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + HGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hmatrix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hp2anyGraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lambdacubeEngine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + LambdaHack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leksah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leksahServer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lhs2tex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ltk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_2_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_2_3_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_4_0_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGL_2_6_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OpenGLRaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pakcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pango = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reactiveBananaWx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + repaAlgorithms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + repaExamples = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLImage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLMixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDLTtf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + splot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svgcairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + threadscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timeplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uhc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vacuumCairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxcore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11_1_5_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11Xft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmobar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonadContrib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmonadExtras = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + haxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + heimdall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + herqq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hevea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hexen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + highlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hol_light = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + homebank = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hplip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + htmldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + httpfs2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hwloc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hydraAntLogger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hydrogen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i3lock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + i7z = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icbm3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecat3Xul = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icecatXulrunner3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icedtea = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + icewm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + idutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ikiwiki = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imagemagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imagemagickBig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + imlib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + impressive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + indilib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + inkscape = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + instead = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + intelgen4asm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + io = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ion3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iotop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iprover = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + irrlicht3843 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + irssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + isabelle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + isocodes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + itk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + itstool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jackaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jack_capture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jackmeter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jamp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + javaCup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jbidwatcher = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jboss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jboss_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jbrout = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jclasslib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdiskreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jfsrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jigdo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jing_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jjtraveler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jnettop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jrePlugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jruby165 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jscoverage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + json_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + julia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + k3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kaffe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde3 = { + arts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + kde4 = { + akonadi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + akunambol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amarok = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aurorae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bangarang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + basket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + blinken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + calligra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cantor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cervisia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ColorSchemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + desktopthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + digikam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dolphin_plugins_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dolphin_plugins_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + emoticons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + filelight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + filesharing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gwenview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + HighResolutionWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + IconThemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jovie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + k3b = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kaccessible = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kadu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kalgebra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kalzium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kamera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kanagram = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kapptemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbibtex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbluetooth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kbruch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcachegrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcalc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcharselect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcolorchooser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kcron = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeaccessibility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeaccounts_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeartwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_baseapps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdebindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegames = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics_strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdegraphics_thumbnailers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdelibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdemultimedia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdenetwork = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdenlive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepimlibs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdepim_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeplasma_addons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_runtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdesdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdesvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdetoys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdeutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdevplatform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_wacomtablet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdewebdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kde_workspace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdiff3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kdnssd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfile_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfilereplace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kfloppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgeography = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kgpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + khangman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kimagemapeditor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kioslave_perldoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kioslave_svn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kipi_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kiten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klettres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klinkstatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmag = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmousetool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmplayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmplot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kmymoney = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + koffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kolourpaint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kommander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kompare = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konq_plugins = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konsole = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + konversation = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kopete = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kpartloader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kppp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kprofilemethod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krdc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kremotecontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krename = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kruler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + krusader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksaneplugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksnapshot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksshaskpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kstars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kstartperf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ksystemlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kteatime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktimer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kturtle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ktux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuickshow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuiviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kuser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwallet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwin_styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwooty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kwordquiz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.bg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.bs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ca = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ca_valencia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.cs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.da = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.de = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.el = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.en_GB = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.es = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.et = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.eu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.fi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.fr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.gl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.he = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.hr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.hu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.id = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.is = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.it = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ja = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.kk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.km = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.kn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.lt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.lv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.nn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.pt_BR = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ru = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.si = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.sv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.th = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.tr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.ug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.uk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.wa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.zh_CN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + l10n.zh_TW = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libalkimia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkdcraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkdeedu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkipi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libksane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libktorrent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libkvkontakte = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblikeback = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lokalize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + marble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mobipocket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanagement = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + okteta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + okular = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parley = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + partitionManager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_kde_agent = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + poxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + printer_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + psi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pykde4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quassel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quasselClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quasselDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rekonq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rocs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rsibreak = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scripts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + semnotes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skrooge = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smokegen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smokeqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sounds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + step = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + strigi_analyzer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + styles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superkaramba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + svgpart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sweeper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + system_config_printer_kde = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.accounts_kcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.approver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.auth_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.call_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.common_internals = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_list = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.contact_runner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.filetransfer_handler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.kded_integration_module = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.presence_applet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.send_file = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.telepathy_logger_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy.text_ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + umbrello = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + WeatherWallpapers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yakuake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zanshin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + keen4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keepassx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keepnote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keymon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + keynav = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kicad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klavaro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kobodeluxe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kona = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + larswm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lash = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lastwatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + latencytop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lazarus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ldcpp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ledger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ledger3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leiningen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lensfun = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + leo2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lesstif = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lesstif93 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libassuan2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libatasmart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbluedevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libbluray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcanberra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcdr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libchamplain = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libchamplain_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcroco = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdbusmenu_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdevil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdmtx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdrm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libfixposix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdata_0_6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdiplus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome_keyring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgnome_keyring3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgpod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgsf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgtop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgweather = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libimobiledevice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libinfinity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblapack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblastfm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liblqr1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmatchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmatthew_java = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libmusclecard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libnice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libnotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liboil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libopensc_dnie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libplist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libpseudo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libqalculate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libQGLViewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + librecad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libreoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + librsvg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libsexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libstartup_notification = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libtiger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libtorrentRasterbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libva = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvdpau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libviper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvirt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvisio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvncserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libvterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwmf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwnck3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpd_08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libwpg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxklavier = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxml2Python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxmlxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lilv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lilypond = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lincity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lingot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + links2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linphone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linuxConsoleTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + linuxPackages = { + acpi_call = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + atheros = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ati_drivers_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aufs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + aufs_util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bbswitch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + broadcom_sta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptodev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + e1000e = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + exmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + frandom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nvidia_x11_legacy96 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openafsClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openiscsi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ov511 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sysprof = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + systemtap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tp_smapi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v86d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualboxGuestAdditions = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wis_go7007 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + linuxsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + liquidwar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + llvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lmms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + log4cxx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logstalgica = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + loudmouth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + love = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mailutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mars = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + martyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matchbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matita_130312 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maven = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + maxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcelog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcomix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mcrl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mdbtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mdbtools_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mediastreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mediatomb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + meld = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mercurial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mercurialFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + merkaartor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + meshlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mess = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + metaocaml_3_09 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mhwaveedit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + micropolis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + midori = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + midoriWrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + minecraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + miniHttpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mirage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mitscheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mjpegtools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mkvtoolnix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mlt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mmex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + modemmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mod_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mod_wsgi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mono = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monodevelop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monodoc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monotone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + monotoneViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mountall = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozilla = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mozplugger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mp3info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpc123 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpg321 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mpich2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + MPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mrxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + msilbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mtdutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mu0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + multipath_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + multisync = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mumble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mupdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mupen64plus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + muscleframework = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + muscletool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mutt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mygui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + myguiSvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mysqlWorkbench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mythtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + naev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + navipowm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + navit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ncbiCTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netbeans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netboot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netsurf.browser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + networkmanager_pptp_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ninka = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + njam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nodejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nodePackages = { + abbrev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ansi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + async = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + backbone = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + browserchannel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + buffertools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + commander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + connect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cookie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + crc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cssmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + datetime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + debug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + diff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + formidable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hiredis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + inherits = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + knox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + less = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + minimatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mkdirp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mongodb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mrclean = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + npm2nix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + npmlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + optimist = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + options = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + osenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pause = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + policyfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rbytes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + redis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + request = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + requirejs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rimraf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + semver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + send = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + showdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sockjs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + temp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timerstub = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tinycolor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + underscore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vows = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + which = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wordwrap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ws = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlhttprequest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zeparser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nova = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + novaclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nspluginwrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nss = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nss_pam_ldapd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nssTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ntop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ntrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + numeric = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nut_2_6_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obex_data_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obexftp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + obnam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_08_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_10_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_3_11_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_4_00_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlnat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlPackages = { + camlidl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_5_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_5_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_6_strict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlp5_6_transitional = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camlzip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camomile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + camomile_0_8_2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cryptokit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + findlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gmetadom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lablgtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lablgtkmathview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + menhir = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mldonkey = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_batteries = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_cryptgps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_expat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_extlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlgraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_http = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_lwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_mysql = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocamlnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_pcre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_react = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_sexplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_ssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ocaml_typeconv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ounit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ulex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ulex08 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + octave = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + octaveHG = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + offlineimap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ogre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ogrepaged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ois = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + omake = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oneteam = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openbabel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openbox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencascade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencsg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openct = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opencv_2_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openfire = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openlierox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openobex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openoffice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opensc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openscad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opensc_dnie_wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openscenegraph = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + openttd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opentyrian = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opkg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + opusTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oraclejdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oraclejre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + OVMF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oxygen_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pam_console = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pam_usb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pangoxsl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + panomatic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paraview = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + parted_2_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + path64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pavucontrol = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcmciaUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pcsclite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdf2djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdfread = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pdftk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + perlPackages = { + Autodia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GD = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + GraphViz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + InlineJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + PerlMagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SQLTranslator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + TextRecordParser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + X11GUITest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + petrifoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pfstools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pgadmin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + philter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon_backend_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + phonon_backend_vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pianobooster = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + picard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + picolisp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidgin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginlatex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginlatexSF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginmsnpecan = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginotr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pidginsipe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pinentry = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pinta = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pioneers = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pius = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + plan9port = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + plib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ploticus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pltScheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pmutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + policykit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polkit_qt_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pommed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pong3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + popplerQt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + postgresql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pqiv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + praat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prboom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + privateer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + proxychains = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pstack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ptlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pulseaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pure = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + puredata = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + putty = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycairo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycrypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycups = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pydb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyexiv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygame = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygobject = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyGtkGlade = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyIRCt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyMAILt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyopenssl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyqt4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyrex = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyrex096 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyside = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideApiextractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideGeneratorrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideShiboken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysideTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pystringtemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python26 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27Packages = { + afew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + alot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + amqplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + anyjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + apsw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + area53 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + argparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Babel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + beautifulsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + boto_1_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + bsddb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + carrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cheetah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cherrypy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cliapp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + clientform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + coilmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + configobj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + cssutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + curses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + darcsver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dateutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + decorator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distribute = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + distutils_extra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django_1_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + django_evolution = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + djblets = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dtopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + dulwich = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + enum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + eventlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flake8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flask = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + flup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + foolscap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + fuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gdbm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + genshi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + genzshcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gflags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + glance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + greenlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gyp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + hggit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + httplib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + iptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ipython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + jinja2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + larch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ldap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libcloud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lockfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logilab_astng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + logilab_common = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + lxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + m2crypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + magic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + markdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + matplotlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mechanize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + memcached = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mutagen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + MySQL_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + namebench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + netaddr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nevow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + nose = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + numpy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + oauth2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + offlineDistutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paramiko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paste = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + paste_deploy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pep8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pexpect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ply = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + polib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + prettytable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + protobuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + psycopg2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + publicsuffix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyasn1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycryptopp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pycurl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pydot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyfeed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygments = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pygpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyinotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylibacl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pylint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pymacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyopengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyparsing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysqlite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pysvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pytz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyxattr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyyaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + RBTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdflib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + readline = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recaptcha_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recursivePthLoader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reportlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reviewboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ropemacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + routes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scripttest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + selenium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptoolsDarcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setuptoolsTrial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simplejson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skype4py = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sphinx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlalchemy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlalchemy_migrate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stompclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + taskcoach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tempita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkinter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tracing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ttystatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + turses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tweepy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twisted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unittest2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urlgrabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urwid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vnc2flv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webtest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + werkzeug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wokkel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wrapPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zbase32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zfec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + python26Packages = python27Packages; + python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonmagick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pythonSexy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + pyxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qca2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qca2_ossl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qcmm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qemu_1_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qfsm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qgis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qimageblitz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjackctl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjoypad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qoauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qrdecode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qrupdate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qsampler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + 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; }; + qtscriptgenerator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quake3demo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quake3game = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qucs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + quesoglc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + qwt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rabbitmq_server = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + racer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + racket = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rakarrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rapcad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rapidsvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ratpoison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rawtherapee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdf4store = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rdiff_backup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + RealPlayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + recutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + redshift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + relfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + remmina = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + reptyr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rhino = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rssglx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rtmpdump = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubyLibs.buildr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rubyLibs.rjb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + rxvt_unicode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + s3cmd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sabnzbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sakura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + salut_a_toi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + samba = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + saneFrontends = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + satallax = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sauerbraten = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + saxonb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sbcl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + schroedinger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scilab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scons = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scorched3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scribus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + scummvm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_gfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_image = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_net = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_sound = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + SDL_ttf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seeks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seg3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seleniumRCBin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + seq24 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + serd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sfml_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sgtpuzzles = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + shared_mime_info = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sharedobjects = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + silgraphite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simgear = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + simutrans = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + skype = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + slim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + slock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smatch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smbnetfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + snack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + snd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sndBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sofia_sip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sonic_visualiser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soprano = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + soqt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sord = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + speed_dreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + spring = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + springLobby = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sratom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sshfsFuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ssreflect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + st = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stalin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stalonetray = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stardict = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stardust = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stellarium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + strigi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stumpwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + stuntrally = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sublime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + subversionClient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + suil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + suitesparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superTux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + superTuxKart = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + surf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swh_lv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swiProlog = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + swt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + sylpheed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + synergy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + syslogng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + system_config_printer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + systemd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + t1lib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tabbed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tahoelafs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tailor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tangogps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + taskjuggler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tbe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teamspeak_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teetertorture = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + teeworlds = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_farstream = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_gabble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_glib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_haze = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_logger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_mission_control = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_qt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_rakia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + telepathy_salut = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tennix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texDisser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLive = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveBeamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveCMSuper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveContext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveExtra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveFull = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveLatexXColor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLiveModerncv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texLivePGF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + texmacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunderbird = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tigervnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tightvnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + timidity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkcvs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkgate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tkgate2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat_connectors = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tomcat_mysql_jdbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + torchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + torcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trackballs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + transmission = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + transmission_remote_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trayer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tremulous = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tribler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + trigger = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + truecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tulip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + tvtime = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twinkle = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uae = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ubootGuruplug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ubootNanonote = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufoai = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unclutter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unetbootin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + unison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + upower = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uqm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + urbanterror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + usbmuxd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + uzbl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v4l_utils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + v8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vacuum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala15 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vala16 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + valgrind = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vdrift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vidalia = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + viewMtn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vigra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + viking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimHugeX = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimprobable2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vimprobable2Wrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtinst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtualgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + virtviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + VisualBoyAdvance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vkeybd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vncrec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vorbisTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vrpn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vue = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + vwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + w3cCSSValidator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warmux = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warsow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + warzone2100 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + webkitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wicd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + widelands = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wineWarcraft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wireshark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wkhtmltopdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmiimenu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmiiSnap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wmname = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wordnet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wpa_supplicant_gui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wv2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wvdial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wvstreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxGTK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxGTK29 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + wxmaxima = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11_ssh_askpass = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x2vnc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x2x = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xalanJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xaos = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xapianBindings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xapianBindings10 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xara = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xautolock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + Xaw3d = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xawtv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbindkeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbursttools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xchat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xchm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xclip = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcompmgr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xconq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdaliclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdotool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xercesJava = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_mtrack = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_multitouch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_input_wacom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_video_nested = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86_video_nouveau = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce = { + exo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + garcon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gigolo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gtk_xfce_engine = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + gvfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libgdu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfce4ui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfce4util = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxfcegui4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + mousepad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ristretto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + terminal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + thunar_volman = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_appfinder = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_cpufreq_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4icontheme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4mixer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4panel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_power_manager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4session = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4settings = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_systemload_plugin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfce4_taskmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfceutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfconf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfdesktop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfwm4 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + xfig = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xfontsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xineLib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xineUI = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkeyboard_config = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlaunch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlibs = { + libAppleWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libdmx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libWindowsWM = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libX11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXaw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxcb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXcomposite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXcursor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXdamage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXext = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXfixes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXinerama = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libxkbfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXmu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXrender = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXres = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXScrnSaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXtst = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXvMC = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86dga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86misc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + libXxf86vm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + setxkbmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + smproxy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + twm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + x11perf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xauth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xbacklight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbproto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilimage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilkeysyms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilrenderutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcbutilwm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xclock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcmsdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcursorgen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xcursorthemes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdpyinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xdriinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xeyes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputevdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputjoystick = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputkeyboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputsynaptics = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputvmmouse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86inputvoid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoark = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoati = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videocirrus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videodummy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videofbdev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videogeode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoglide = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoglint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoi128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel_2_14_901 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videointel_2_17_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videomach64 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videomga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoneomagic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videonewport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videonv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videoopenchrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videor128 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosavage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosiliconmotion = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosis = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosuncg6 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videosunffb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotdfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotga = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videotrident = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videov4l = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovesa = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovmware = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videovoodoo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xf86videowsfb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xgamma = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xhost = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xinit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xinput = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbevd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkbutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xkill = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsatoms = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsclients = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmessage = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmodmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgserver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgserver_1_13_0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xprop = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrandr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrdb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xrefresh = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xset = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsetroot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwininfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xwud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + xlockmore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xlsfonts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmacro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmlroff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmoto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmove = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xmpppy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xosd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xournal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpdf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xplanet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xpra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsane = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xscreensaver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsokoban = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xsynth_dssi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xterm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xtrace = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xtreemfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xulrunner = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvfb_run = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xvidcap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + xxdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + yoshimi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + youtubeDL = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathuraCollection = { + zathura_core = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_djvu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_pdf_poppler = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zathura_ps = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + }; + zbar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zdoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zgrviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zod = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zoom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + ZopeInterface = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; +}) From 27a73428cc8828739a7bf60b40b872ff5535a43a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:15:08 +0100 Subject: [PATCH 013/302] remove site.py files setuptools site.py can't resolve recursively which is needed for nix, as each package has its own directory. A different solution than putting the loader into every package output needs to be found. see also #209 --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4494392cfef..7b63b5a8fab 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -82,9 +82,7 @@ python.stdenv.mkDerivation (attrs // { # Remove any site.py files generated by easy_install as these # cause collisions. If pth files are to be processed a # corresponding site.py needs to be included in the PYTHONPATH. - # - # leave them until we have a better solution: see #209 - #rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* ${postInstall} ''; From aeef72fa85785ee017d9db03bf597b38a9efa251 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:18:29 +0100 Subject: [PATCH 014/302] python-modules: remove long non-functional propagated-user-env-packages we use recursive processing of pth files instead --- pkgs/development/python-modules/generic/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 7b63b5a8fab..901b7144253 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -91,14 +91,6 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - # If a user installs a Python package, she probably also wants its - # dependencies in the user environment (since Python modules don't - # have something like an RPATH, so the only way to find the - # dependencies is to have them in the PYTHONPATH variable). - if test -e $out/nix-support/propagated-build-inputs; then - ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages - fi - createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then From aab93e8479f16ae0af1c83c280e32e5acfcc82f2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:35:04 +0100 Subject: [PATCH 015/302] do not create e.g pth file for build inputs if they are really needed they will be in pth file created by easy_install. If that does not work, they need to be put into propagatedBuildInputs or the setup.py fixed. see #210 --- pkgs/development/python-modules/generic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 901b7144253..4a3d92b28bf 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -91,7 +91,8 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - createBuildInputsPth build-inputs "$buildInputStrings" + # these should already be in $name.pth + #createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" From edd160452e0c17bb5b0f07693dc1a1a4dd2dd511 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 02:41:10 +0100 Subject: [PATCH 016/302] don't propagate recursivePthLoader, it is needed to process it already --- pkgs/development/python-modules/generic/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4a3d92b28bf..e46c710067d 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -51,9 +51,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # recursivePthLoader is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - buildInputStrings = map toString buildInputs; pythonPath = [ setuptools] ++ pythonPath; From 838761cad2102bf3cb72291900bf58faf4d21a36 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 22 Dec 2012 03:26:19 +0100 Subject: [PATCH 017/302] python manpages as python2.6, python2.7 and python see #68 --- pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/development/interpreters/python/2.7/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6fa27c23525..64fd96a0352 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -62,6 +62,8 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + mv $out/share/man/man1/{python.1.gz,python2.6.1.gz} + ln -s $out/share/man/man1/{python2.6.1.gz,python.1.gz} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 7e28cdc1db7..9fb2ab377df 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -76,6 +76,7 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} ''; passthru = { From bafdf87367798b481fc19eb9e2397ef78c60c267 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 1 Jan 2013 17:13:33 +0100 Subject: [PATCH 018/302] wpa_supplicant: Update to 1.1 --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index f947bc9a1e7..3f26e159b43 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i"; + sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; preBuild = '' From 38a14fac65ee091d6e9118f07f385c7b9b6cb7e9 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 3 Jan 2013 18:14:38 +0100 Subject: [PATCH 019/302] NetworkManager: cooperate better with systemd --- pkgs/tools/networking/network-manager/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 316598809f1..0e3eaecf4cb 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-kernel-firmware-dir=/run/current-system/firmware" ]; + "--with-kernel-firmware-dir=/run/current-system/firmware" + "--with-session-tracking=systemd" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; @@ -55,6 +56,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/lib/NetworkManager + + # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy + substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' ''; meta = with stdenv.lib; { From 7364f8b55f1930de57fc35b984888f52cabae5f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Jan 2013 00:33:05 +0100 Subject: [PATCH 020/302] gnupg: Update to 1.4.13 CVE-2012-6085 --- pkgs/tools/security/gnupg1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index b3bf309b48e..c779b979d9d 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { - name = "gnupg-1.4.12"; + name = "gnupg-1.4.13"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha1 = "9b78e20328d35525af7b8a9c1cf081396910e937"; + sha1 = "17a75c54d292bd0923f0a1817a1b02ded37d1de1"; }; buildInputs = [ readline bzip2 ]; From 8de96cb04d181861540bbee294d15f92dde77beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 Jan 2013 22:07:01 +0100 Subject: [PATCH 021/302] boinc: updating to 7.0.44 now it builds. I started to use fetchgit instead of fetchsvn, because the upstream doc pages talk about git more than svn. --- pkgs/applications/science/misc/boinc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 5cc79469b76..8134d57589b 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,14 +1,14 @@ -{ fetchsvn, stdenv, autoconf, automake, pkgconfig, m4, curl, +{ fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl, mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: stdenv.mkDerivation rec { - name = "boinc-6.12.39"; + name = "boinc-7.0.44"; - src = fetchsvn { - url = "http://boinc.berkeley.edu/svn/tags/boinc_core_release_6_12_39"; - rev = 24341; - sha256 = "158fkm4mr7wljsy8gav20km8jamf00mxjk1wsiqw6kx62bih37yb"; + src = fetchgit { + url = "git://boinc.berkeley.edu/boinc.git"; + rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2"; + sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia"; }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi From 430957b0204591d8d3bd8ad1607d2f987164e2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 8 Jan 2013 23:26:24 +0100 Subject: [PATCH 022/302] boinc: fix it; the binaries didn't start. --- .../science/misc/boinc/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 8134d57589b..9d8bc705fa4 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, -sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11 }: +mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, +sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { name = "boinc-7.0.44"; @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 ]; + freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 + libxcb xcbutil + ]; postConfigure = '' sed -i -e s,/etc,$out/etc, client/scripts/Makefile @@ -27,17 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-server --disable-fast-install"; - - postInstall = " - # Remove a leading rpath to /tmp/... I don't know how it got there - # I could not manage to get rid of that through autotools. - for a in $out/bin/*; do - RPATH=$(patchelf --print-rpath $a) - NEWRPATH=$(echo $RPATH | sed 's/^[^:]*://') - patchelf --set-rpath $out/lib:$NEWRPATH $a - done - "; + configureFlags = "--disable-server"; meta = { description = "Free software for distributed and grid computing"; From 5ce7642487d622177dd18903970db851b3fa32bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 9 Jan 2013 00:53:51 +0100 Subject: [PATCH 023/302] Lyx: a bug-fix update. --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 4c24f149f00..798b0e5162f 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.5.1"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "00pv2d9p8j1p6x87kalbn1bgxg9l4zqh65zcajrnh10a76isv6nk"; + sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n"; }; configureFlags = [ From 6654cb8a10a8e565c04440143ddf2472aced3cf3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 05:21:01 +0100 Subject: [PATCH 024/302] comment --- pkgs/development/python-modules/generic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index e46c710067d..e576e3bde99 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -47,6 +47,7 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; + # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; From 33006071769a9a04f3bfb6286977cc92799b4707 Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Sat, 29 Dec 2012 17:46:53 -1000 Subject: [PATCH 025/302] Upgrade VirtualBox Guest Additions to 4.2.6 --- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9483868bc5e..7a79a73c6b9 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,14 +2,14 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor , dbus }: -let version = "4.2.4"; in +let version = "4.2.6"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "3d7d909a0fe9ac5ffcca6afdd4142b88bad116d2ffed6e95588dbfbcf00ca5e9"; + sha256 = "1lry4hjjk8p69km1bi3mpmyarlnxz9izs2c0s8pq5rjzv1bd7bxr"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; From 0d3ad0d78631cb3c77472696906c87fb33d27bd5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 06:53:44 +0100 Subject: [PATCH 026/302] bsd-games: fix some paths, pager and typo --- pkgs/games/bsdgames/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 38a32da9537..59423d7a5a6 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, openssl, flex, bison, miscfiles}: +{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}: stdenv.mkDerivation { name = "bsd-games-2.17"; @@ -26,12 +26,19 @@ stdenv.mkDerivation { bsd_games_cfg_fortune_dir=$out/share/games/fortune bsd_games_cfg_quiz_dir=$out/share/games/quiz bsd_games_cfg_gamesdir=$out/bin + bsd_games_cfg_sbindir=$out/bin + bsd_games_cfg_usrbindir=$out/bin + bsd_games_cfg_libexecdir=$out/lib/games/dm + bsd_games_cfg_docdir=$out/share/doc/bsd-games + bsd_games_cfg_sharedir=$out/share/games + bsd_games_cfg_varlibdir=. bsd_games_cfg_non_interactive=y bsd_games_cfg_no_build_dirs="dab hack phantasia sail" bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words + bsd_games_cfg_pager=${less} EOF - sed -e s/getline/sdgames_local_getline/g -i $(grep getline -rl .) + sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .) ''; postConfigure = '' From 16e2a9133f0c6cff8b22a1b847d7c238eced0dbf Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:06:46 +0100 Subject: [PATCH 027/302] python-2.6.8: long overdue --- pkgs/development/interpreters/python/2.6/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 64fd96a0352..6e7f01c0c92 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,11 +9,13 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; + # http://www.python.org/download/releases/2.6.8/ + # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; patches = From 723d5a5581a1ec4dc32eec3b197abb49def666e2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:26:15 +0100 Subject: [PATCH 028/302] fix python-2.6 build: purity for systems with stdenv.gcc.libc On other systems python26 will continue to look for /usr/include/netinet/in.h among others. I don't know whether/what to do about that. --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6e7f01c0c92..30acdb3624e 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -53,6 +53,10 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done ''; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; From ee0204d2c882815e15e18d3e374c0341c9e7aced Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:27:39 +0100 Subject: [PATCH 029/302] for some reason the python2.6 manpage is not gzipped --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 30acdb3624e..f264e4179e7 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -68,8 +68,8 @@ let rm -rf "$out/lib/python${majorVersion}/test" ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} - mv $out/share/man/man1/{python.1.gz,python2.6.1.gz} - ln -s $out/share/man/man1/{python2.6.1.gz,python.1.gz} + mv $out/share/man/man1/{python.1,python2.6.1} + ln -s $out/share/man/man1/{python2.6.1,python.1} ''; passthru = { From 56517508d8e74e8d37f2c655d25c86333e9330ab Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:06:46 +0100 Subject: [PATCH 030/302] python-2.6.8: long overdue --- pkgs/development/interpreters/python/2.6/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6fa27c23525..e8d79cec4f6 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,11 +9,13 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; + # http://www.python.org/download/releases/2.6.8/ + # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; patches = From a37cabdbb7ad9adaf9f6da226e6ed2ec74813961 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 08:26:15 +0100 Subject: [PATCH 031/302] fix python-2.6 build: purity for systems with stdenv.gcc.libc On other systems python26 will continue to look for /usr/include/netinet/in.h among others. I don't know whether/what to do about that. --- pkgs/development/interpreters/python/2.6/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index e8d79cec4f6..3fe753a5a6f 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -53,6 +53,10 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done ''; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; From dabb876c9b67613a8f0414595d5e583a08818419 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 10:39:09 +0100 Subject: [PATCH 032/302] release-python: create list of python packages from pythonPackages attrset --- pkgs/top-level/release-python.nix | 175 ++---------------------------- 1 file changed, 10 insertions(+), 165 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 521800647ec..ea3c2821dcd 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1467,174 +1467,19 @@ with (import ./release-lib.nix); pysideShiboken = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pysideTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pystringtemplate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + python27 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python27Packages = { - afew = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - amqplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - anyjson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - apsw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - area53 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - argparse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - Babel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - beautifulsoup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - boto_1_9 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - bsddb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - carrot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cheetah = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cherrypy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cliapp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - clientform = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - coilmq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - configobj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - cssutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - curses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - darcsver = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dateutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - decorator = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distribute = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - distutils_extra = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django_1_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - django_evolution = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - djblets = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - docutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dtopt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - dulwich = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - enum = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - eventlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flake8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flask = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - flup = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - foolscap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - fuse = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gdbm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - genshi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - genzshcomp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gflags = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - glance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - greenlet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - gyp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - hggit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - httplib2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - iptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ipython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - jinja2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - larch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ldap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - libcloud = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lockfile = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logilab_astng = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - logilab_common = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - lxml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - m2crypto = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - magic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - markdown = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - matplotlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mechanize = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - memcached = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mock = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mutagen = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - MySQL_python = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - namebench = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - netaddr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nevow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - nose = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - notify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - notmuch = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - numpy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - oauth2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - offlineDistutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paramiko = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paste = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - paste_deploy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pep8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pexpect = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ply = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - polib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - prettytable = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - protobuf = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - psycopg2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - publicsuffix = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyasn1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyaudio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycryptopp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pycurl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pydot = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyfeed = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygments = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pygpgme = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyinotify = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylast = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylibacl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pylint = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pymacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyopengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyparsing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyreport = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysqlite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pysvn = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pytz = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyutil = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyxattr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - pyyaml = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - RBTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rdflib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - readline = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - recaptcha_client = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - recursivePthLoader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reportlab = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - reviewboard = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ropemacs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - routes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scipy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - scripttest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - selenium = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptoolsDarcs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - setuptoolsTrial = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - simplejson = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - six = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - skype4py = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sphinx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlalchemy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlalchemy_migrate = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - sqlite3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - stompclient = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - taskcoach = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tempita = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tkinter = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - trac = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tracing = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ttystatus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - turses = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - tweepy = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - twisted = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - unittest2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - urlgrabber = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - urwid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - virtualenv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vnc2flv = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webob = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webtest = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - werkzeug = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wokkel = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wrapPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - wxPython = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xe = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xlib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zbase32 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - zfec = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - }; - python26Packages = python27Packages; + python26Packages = pkgs.lib.attrsets.listToAttrs + (map + (name: { inherit name; + value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) + (builtins.attrNames + (pkgs.lib.attrsets.filterAttrs + (n: v: (v.type or null) == "derivation") + pkgs.python26Packages))); + python27Packages = python26Packages; python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From cfdf35d6f92d66cbcf468ea09e7100b69b848c99 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 9 Jan 2013 15:44:48 +0100 Subject: [PATCH 033/302] Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again. --- pkgs/development/python-modules/generic/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8da833b0dc1..e007795105f 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -37,6 +37,7 @@ runHook postCheck '' +, preInstall ? "" , postInstall ? "" , ... } @ attrs: @@ -63,7 +64,7 @@ python.stdenv.mkDerivation (attrs // { ${preConfigure} ''; - installPhase = '' + installPhase = preInstall + '' mkdir -p "$out/lib/${python.libPrefix}/site-packages" echo "installing \`${name}' with \`easy_install'..." diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc336a2c802..41b545a6862 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2599,7 +2599,6 @@ let pythonPackages = python.modules // rec { sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd"; }; - preInstallPhases = "preInstall"; preInstall = '' cp ${x_ignore_nofocus}/* . sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c From 59aa248876637b4bf74eebebfc432d879827cbea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:44:11 +0100 Subject: [PATCH 034/302] haskell-nat: add version 0.3 --- pkgs/development/libraries/haskell/nat/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/nat/default.nix diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix new file mode 100644 index 00000000000..3ad4240e289 --- /dev/null +++ b/pkgs/development/libraries/haskell/nat/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "nat"; + version = "0.3"; + sha256 = "1v43c1dr72qn8mymnwcq6an8sqxjaxhac037k4gbv8z8bg18zmf5"; + meta = { + description = "Lazy binary natural numbers"; + 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 9713f8f94dc..74099e9493d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1242,6 +1242,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {}; + nat = callPackage ../development/libraries/haskell/nat {}; + nats = callPackage ../development/libraries/haskell/nats {}; netlist = callPackage ../development/libraries/haskell/netlist {}; From 90952495db0794dabae6d3595b7ae729cb43c921 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:44:25 +0100 Subject: [PATCH 035/302] haskell-naturals: add version 0.2.0.2 --- .../libraries/haskell/naturals/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/naturals/default.nix diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix new file mode 100644 index 00000000000..787ac70ffa9 --- /dev/null +++ b/pkgs/development/libraries/haskell/naturals/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "naturals"; + version = "0.2.0.2"; + sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16"; + meta = { + homepage = "frigidcode.com"; + description = "Constructors and related functions for natural numbers"; + 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 74099e9493d..730dbd6b27c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1246,6 +1246,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); nats = callPackage ../development/libraries/haskell/nats {}; + naturals = callPackage ../development/libraries/haskell/naturals {}; + netlist = callPackage ../development/libraries/haskell/netlist {}; netlistToVhdl = callPackage ../development/libraries/haskell/netlist-to-vhdl {}; From d80bf38daf7539265013499455c10546a4ff5d00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 036/302] haskell-xmonad-extras: update to version 0.11 --- pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index eebb07c0aa1..025bab67e96 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.10.1.2"; - sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay"; + version = "0.11"; + sha256 = "09r64z09mfdz86k7v5c6zds9ng0fjcp44kd8f5qg1sz40yblrny5"; buildDepends = [ hint libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib From 3b4b0d56beef45ad7d471eba13a7bf3bbacc7d6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 037/302] haskell-active: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 732000e7482..d3307d0a30d 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.2"; - sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; + version = "0.1.0.3"; + sha256 = "0jarc270z6raak1vz30jy2gl0pkj9a2x3ib5hq7vsl2ljbvbgyqi"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; jailbreak = true; meta = { From ef4706675ca316e156300b5d9c44b0b9bcd305d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 038/302] haskell-diagrams-core: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 2acf784e881..c087e27d025 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "0.6"; - sha256 = "15frd5jdzkgpdcvyyhd0mbi5d4a69ajcnxawa1gafl4c3byz1778"; + version = "0.6.0.1"; + sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa"; buildDepends = [ dualTree MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From be8637c1f7cdc53f4bad782968ee6b2700ad8539 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 039/302] haskell-diagrams-lib: update to version 0.6.0.1 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 727a7156a9b..1bd77db8580 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "0.6"; - sha256 = "05nfp5ggjk4fviwvwiblmzzw5dbzbi1w8dx5dimvah7wxb0km3lf"; + version = "0.6.0.1"; + sha256 = "00ysdppl2jv0kspj0pjy8qj8shc9gg6g10lkq62vlvr39wnxx6yj"; buildDepends = [ active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace From 8d1e639df22cc096080dcb1c3fa260c356f22f0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 040/302] haskell-dual-tree: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 741fcbce1c9..ebca3b5a3be 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.0"; - sha256 = "0av525gjxzd2hhrg5da647chwbv4j30gccaff2b3n5qijzy8l167"; + version = "0.1.0.1"; + sha256 = "09bdid65frccpbh1bs01f7vprq0vfgqsb5bfa4j8yi3q773mycb2"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From c080c855721975e57ac639834364fbdcf701a01b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 041/302] haskell-lens: update to version 3.7.3 --- .../development/libraries/haskell/lens/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 92375e9f14a..ab634ea70e9 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,16 +1,16 @@ { cabal, comonad, comonadsFd, comonadTransformers, filepath -, hashable, mtl, parallel, semigroups, split, text, transformers -, unorderedContainers, vector +, hashable, mtl, nats, parallel, semigroups, split, text +, transformers, transformersCompat, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.7.2"; - sha256 = "14kc9yhq7niv49gpdcl55priwnvisawa9jsp8hnplk48p11i2xs3"; + version = "3.7.3"; + sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz"; buildDepends = [ - comonad comonadsFd comonadTransformers filepath hashable mtl - parallel semigroups split text transformers unorderedContainers - vector + comonad comonadsFd comonadTransformers filepath hashable mtl nats + parallel semigroups split text transformers transformersCompat + unorderedContainers vector ]; patchPhase = '' sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal From 7004eced8302e68291244448e25dcc0ecd5c6bb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 042/302] haskell-monoid-extras: update to version 0.2.2.2 --- pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 4e8a4154ae1..a67017298a8 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.2.2.1"; - sha256 = "0n2zwkwwq8kg9m6qr79mrhlxsfsrjzbyg96gfhcgk21zgc09zary"; + version = "0.2.2.2"; + sha256 = "1fz93hm0sswisvwvbygxvbwmmnzqcxmz9h82i4361wzychf2si22"; buildDepends = [ semigroups ]; jailbreak = true; meta = { From 65fe988502c9e60490bc0128f62e6a5bbff55450 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:02 +0100 Subject: [PATCH 043/302] haskell-multiarg: update to version 0.8.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 8b2871c3ce4..74254a4c591 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.6.0.0"; - sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y"; + version = "0.8.0.0"; + sha256 = "17zfrm9zjf7c8g7q9vqj1srk0g766ifhwqp7gm4ql890541q5lv5"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; - license = self.stdenv.lib.licenses.mit; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; From aeef9a1ed49257872a4bd34667e282004739ac60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:03 +0100 Subject: [PATCH 044/302] haskell-warp: update to version 1.3.7 --- 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 0620fc7f88b..edd1dfd1992 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.6"; - sha256 = "0aw5m7apj7l6fjb0w59bmgiy4j0rmdwjil4ppgp5qz2q2njqbbnj"; + version = "1.3.7"; + sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 490085a81172360c1bf74147682770ef47577193 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:52:14 +0100 Subject: [PATCH 045/302] git-annex: update to version 3.20130107 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 28a917d51e7..aef86c06cfb 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 @@ -12,14 +12,14 @@ }: let - version = "3.20130102"; + version = "3.20130107"; 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 = "0aga3i7rzq21vyj2wq87n4yl5aljzxc69vbzw43nxx9sr2f3xyh5"; + sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq"; name = "git-annex-${version}.tar.gz"; }; From 029439c0f6d3ac6d10b6b0ecd551a808e89106fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 16:57:46 +0100 Subject: [PATCH 046/302] haskell-type-level-natural-number: add version 1.1.1 --- .../haskell/type-level-natural-number/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/type-level-natural-number/default.nix diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix new file mode 100644 index 00000000000..8dff0ffd58f --- /dev/null +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-level-natural-number"; + version = "1.1.1"; + sha256 = "1zc26nckpcixxp1m818jhzi3dj1ysnjfc2xliq4rpmf5583k6mjw"; + meta = { + description = "Simple, Haskell 2010-compatible type level natural numbers"; + 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 730dbd6b27c..ff591439dfb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1690,6 +1690,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); typeEquality = callPackage ../development/libraries/haskell/type-equality {}; + typeLlevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + unbound = callPackage ../development/libraries/haskell/unbound {}; uniplate = callPackage ../development/libraries/haskell/uniplate {}; From 9e1df1ada3d5d8544ee12f0331fc679001c07fc7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 17:08:17 +0100 Subject: [PATCH 047/302] haskell-numtype-tf: add version 0.1 --- .../libraries/haskell/numtype-tf/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/numtype-tf/default.nix diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix new file mode 100644 index 00000000000..76f57daca38 --- /dev/null +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "numtype-tf"; + version = "0.1"; + sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v"; + meta = { + homepage = "http://dimensional.googlecode.com/"; + description = "Type-level (low cardinality) integers, implemented using type families"; + 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 ff591439dfb..04052458738 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1287,6 +1287,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; From 1036942197eafec1048f8fb68b23b1d4f8eb5f89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Jan 2013 17:08:51 +0100 Subject: [PATCH 048/302] haskell-dimensional-tf: add version 0.1.1 --- .../libraries/haskell/dimensional-tf/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/dimensional-tf/default.nix diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix new file mode 100644 index 00000000000..70995ecb3ce --- /dev/null +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -0,0 +1,14 @@ +{ cabal, numtypeTf, time }: + +cabal.mkDerivation (self: { + pname = "dimensional-tf"; + version = "0.1.1"; + sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci"; + buildDepends = [ numtypeTf time ]; + meta = { + homepage = "http://dimensional.googlecode.com/"; + description = "Statically checked physical dimensions, implemented using type families"; + 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 04052458738..6f2db83c194 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -711,6 +711,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dimensional = callPackage ../development/libraries/haskell/dimensional {}; + dimensionalTf = callPackage ../development/libraries/haskell/dimensional-tf {}; + directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; @@ -1285,10 +1287,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); numtype = callPackage ../development/libraries/haskell/numtype {}; - OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; - numtypeTf = callPackage ../development/libraries/haskell/numtype-tf {}; + OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; + ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; oeis = callPackage ../development/libraries/haskell/oeis {}; From a628b4b0e47968d7c78db63fc7c7b410d0ef8b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Jan 2013 17:29:39 +0100 Subject: [PATCH 049/302] firefox: adding 18.0 I had to disable it using some nixpkgs, because they were considered 'too old'. They are simply commented in the code. --- .../networking/browsers/firefox/18.0.nix | 176 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 183 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/18.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/18.0.nix new file mode 100644 index 00000000000..4e0b4194257 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/18.0.nix @@ -0,0 +1,176 @@ +{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite + +, # If you want the resulting program to call itself "Firefox" instead + # of "Shiretoko" or whatever, enable this option. However, those + # binaries may not be distributed without permission from the + # Mozilla Foundation, see + # http://www.mozilla.org/foundation/trademarks/. + enableOfficialBranding ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +rec { + + firefoxVersion = "18.0"; + + xulVersion = "18.0"; # this attribute is used by other packages + + + src = fetchurl { + urls = [ + # It is better to use this url for official releases, to take load off Mozilla's ftp server. + "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + # 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 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + #"--enable-profiling" + "--disable-debug" + "--enable-strip" + # "--with-system-jpeg" # Too old in nixpkgs + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + # "--with-system-nss" # Too old in nixpkgs + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; + chmod a+x "$out/bin/$(basename "$i")"; + fi; + done + for i in $out/lib/$libDir/*.so; do + patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true + done + for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do + wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" + done + rm -f $out/bin/run-mozilla.sh + ''; # */ + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { inherit gtk; version = xulVersion; }; + }; + + + firefox = stdenv.mkDerivation rec { + name = "firefox-${firefoxVersion}"; + + inherit src; + + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + xlibs.pixman yasm mesa sqlite file unzip pysqlite + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + "--enable-chrome-format=jar" + "--disable-elf-hack" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + makeFlags = [ + "SYSTEM_LIBXUL=1" + ]; + + # Hack to work around make's idea of -lbz2 dependency + preConfigure = + '' + find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ + stdenv.lib.concatStringsSep ":" + (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) + }' ';' + ''; + + postInstall = + '' + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44692188101..e5bf3e136a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7079,6 +7079,13 @@ let firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; }); + firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { From 260cdd582e993d8985a28374233f82416eb06b07 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 9 Jan 2013 18:11:20 +0100 Subject: [PATCH 050/302] xfce4-notifyd: add new package --- .../xfce-4.8/applications/xfce4-notifyd.nix | 18 ++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix new file mode 100644 index 00000000000..598e6eb414d --- /dev/null +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-notifyd.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }: + +stdenv.mkDerivation rec { + name = "xfce4-notifyd-0.2.2"; + + src = fetchurl { + url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2"; + sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; + }; + + buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ]; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd; + description = "The Xfce Notify Daemon"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index c20e42d2019..bfe7fddd738 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -73,6 +73,8 @@ rec { ristretto = callPackage ./applications/ristretto.nix { }; + xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { }; + xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { }; xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; From fdf11fdb7e5879b8444160c449067d37e7c060ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 9 Jan 2013 19:45:56 +0100 Subject: [PATCH 051/302] firefox18: adding it to release.nix --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 75d5ab72d62..55def41ca8a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -352,6 +352,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox17Pkgs.firefox = linux; + firefox18Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 1b110436bf221eebaa98a5993599878973b2d26a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 20:45:01 +0100 Subject: [PATCH 052/302] release-python: remove two non-existing attrs --- pkgs/top-level/release-python.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ea3c2821dcd..587ea72ddb0 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -645,7 +645,6 @@ with (import ./release-lib.nix); wxc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wxcore = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; X11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - X11_1_5_0_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; X11Xft = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmobar = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xmonad = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1182,7 +1181,6 @@ with (import ./release-lib.nix); mrxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; msilbc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mtdutils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - mu0 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; multipath_tools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; multisync = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; mumble = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 2fd4313f6c13851f73e414a00ac8fb9457ae1674 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 9 Jan 2013 11:49:41 -0800 Subject: [PATCH 053/302] x86info-1.30 --- pkgs/os-specific/linux/x86info/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/x86info/default.nix diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix new file mode 100644 index 00000000000..0cdb7fea1af --- /dev/null +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, pciutils, python}: + +stdenv.mkDerivation rec { + version = "1.30"; + name = "x86info-${version}"; + + src = fetchurl { + url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz"; + sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; + }; + + buildInputs = [ pciutils python ]; + + installPhase = '' + ensureDir $out/bin + cp x86info lsmsr $out/bin + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [jcumming]; + description = "x86info, a CPU identification utility."; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a5..2958c9bb4f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1749,6 +1749,8 @@ let wv2 = callPackage ../tools/misc/wv2 { }; + x86info = callPackage ../os-specific/linux/x86info { }; + x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { From 9f66bf678e2ca9230a1dd2743d95a7ebda052096 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:23:41 +0100 Subject: [PATCH 054/302] release-python: derive python27Package from python27Packages --- pkgs/top-level/release-python.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 587ea72ddb0..7374ede263a 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -9,6 +9,17 @@ */ with (import ./release-lib.nix); +let + jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs + (map + (name: { inherit name; + value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) + (builtins.attrNames + (pkgs.lib.attrsets.filterAttrs + (n: v: (v.type or null) == "derivation") + attrset))); + +in { tarball = import ./make-tarball.nix; @@ -1469,15 +1480,8 @@ with (import ./release-lib.nix); python27 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python26Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; python27Full = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - python26Packages = pkgs.lib.attrsets.listToAttrs - (map - (name: { inherit name; - value = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };}) - (builtins.attrNames - (pkgs.lib.attrsets.filterAttrs - (n: v: (v.type or null) == "derivation") - pkgs.python26Packages))); - python27Packages = python26Packages; + python26Packages = jobsForDerivations pkgs.python26Packages; + python27Packages = jobsForDerivations pkgs.python27Packages; python3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonDBus = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; pythonIRClib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 1cd2bd460b5a8847db5cfea87681a04c6c23530e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:29:41 +0100 Subject: [PATCH 055/302] whitespace --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 0efd1addfad..888f58d7748 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // { buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools] ++ pythonPath; + pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" From 0f52f5a945798957037850377fe5da94fe8485c7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 9 Jan 2013 22:29:46 +0100 Subject: [PATCH 056/302] Revert "don't propagate recursivePthLoader, it is needed to process it already" This reverts commit edd160452e0c17bb5b0f07693dc1a1a4dd2dd511. If we propagate it, derivations that use a python package will also get the recursivePthLoader needed to process the pth files of the package. --- pkgs/development/python-modules/generic/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 888f58d7748..527d4f3108f 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,6 +53,9 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + # recursivePthLoader is responsible for loading pth files + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + buildInputStrings = map toString buildInputs; pythonPath = [ setuptools ] ++ pythonPath; From acb6290eedf30a800a7aed64a2ad626d132c244f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 02:21:02 +0100 Subject: [PATCH 057/302] virtualbox: Update to new upstream version 4.2.6. Fortunately this time the upstream package was packaged correctly and we no longer need the patch to remove the reference to the fa_IR locale. In addition we need to add lvm2 to dependencies because VirtualBox now requires libdevmapper with its default configuration. We could disable it but in order to gain DM support I think it's necessary and at least could avoid some confusion from users if it's not working "out of the box" :-) This is a bugfix release, upstream changes are: * VMM: don't inject stale VT-x events to prevent crashes after VM reset * VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs * GUI: fixed trimming of anti-aliased text in details-view element headers * GUI: fixed create-settings-file-alias functionality on Mac hosts * GUI: fixed take-guest-screenshot functionality on Windows hosts * GUI: several minor fixes, including palette fixes * GUI: fixed Windows 2012 OS type * GUI: allow to terminate the VM even if VBoxSVC crashed * API: fixed cancelling of snapshots, previously this could lead to inconsistent VM configs * API: fixed identifying disk images by UUID * 3D Support: several fixes * VRDP: fixed occasional crash with external authentication * VGA: fix for double scan text modes * USB: fixed invalid pending request count at the time of service of DEVICE POWER requests (Windows hosts only) * USB keyboard: Korean keyboard workaround * Storage: fixed hang with QCOW images and asynchronous I/O enabled * Storage: fixed hang with newer VHD images * Storage: actually write the non-rotational flag to the VM settings (4.2.0 regression) * Virtio-net: fixed the problem with network statistics counters in Session Information dialog (GUI) * Metrics: introduced network rate and disk usage metrics * Metrics: fixed a crash under certain conditions on Solaris hosts * BIOS: fix for El Torito * Shared Folders: if the host folder of a shared folder mapping does not exist, keep it active but mark it as invalid to prevent inconsistent saved states * VBoxManage: fixed converting disks from raw images * VBoxManage: show snapshot description in the VM or snapshot information * VBoxManage: make implicit opening of media consistent in all places dealing with media * VBoxManage: the iSCSI initiator name was not stored in the settings file when doing storageattach * VBoxManage: metrics collect now properly handles 'CPU/MHz' and 'Net/*/LinkSpeed' metrics * VBoxManage: changing the image UUID or parent UUID as part of storageattach works now in all safe cases * VBoxManage: introduced storageattach --medium additions as a shortcut to mount the additions image * OVF: fixed importing OVF files cerated by recent VMware products * Linux hosts / Bridged Networking: fixed the problem with leaking connections in conntrack * Linux Additions: added support for ConsoleKit sessions in the vminfo service of VBoxService * Linux Additions: don't crash during remount under certain conditions * Linux/Solaris Additions: fixed guest memory metrics collection * Solaris hosts: added a dependency to ensure that the user directories are reachable when starting VBox services * Windows host installer: integrated user-contributed translations, thanks to all contributors! * Windows Additions: fixed auto-logon installation for Windows 8 * Windows Additions: don't fail if the shared folders host service is not available * Windows Additions: fixed Guest Additions startup on Windows 2000 guests * Windows Additions: auto-resize fixes for Windows 8 guests Upstream changelist with bug ids can be found here: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 16 +++++----- .../virtualbox/remove_fa_ir.patch | 30 ------------------- 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 87eb0020c1d..f699119c5f0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel +, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 , which, alsaLib, curl, gawk , xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null @@ -11,8 +11,8 @@ with stdenv.lib; let - version = "4.2.4"; - extpackRevision = "81684"; + version = "4.2.6"; + extpackRevision = "82870"; forEachModule = action: '' for mod in \ @@ -35,7 +35,7 @@ let name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" + ".vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "62078e057a4ab56aec5ac086746522b3d94787333d0444169471fa5152c609ed"; + sha256 = "f0113688a76efa0426c27c5541c78506b18637025c35aa682ecc6eeed5d56582"; url = "https://www.virtualbox.org/wiki/Downloads"; }; @@ -44,19 +44,17 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "a7c607523c1c10b7b978ab39a92bb646517316548aa4a1a74b6e434ac2bf0adc"; + sha256 = "54526091bc2aa66b88ca878dd9ecc4466f96d607db2f6678a9d673ecf6646ae3"; }; buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib kernel python alsaLib curl pam xorriso makeself perl + libcap glib kernel lvm2 python alsaLib curl pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; - patches = [ ./remove_fa_ir.patch ]; - - postPatch = '' + prePatch = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch deleted file mode 100644 index 0d7a8342192..00000000000 --- a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch is for VirtualBox-4.2.2, to temporarily remove references to the -fa_IR language file from the source tree, as it somehow got lost during tarball -creation. For more information on this subject please have a look at: - -https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html - -diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -index ffeb410..37ac56a 100644 ---- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro -+++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro -@@ -63,7 +63,6 @@ TRANSLATIONS = \ - nls/VirtualBox_es.ts \ - nls/VirtualBox_eu.ts \ - nls/VirtualBox_fi.ts \ -- nls/VirtualBox_fa_IR.ts \ - nls/VirtualBox_fr.ts \ - nls/VirtualBox_gl_ES.ts \ - nls/VirtualBox_hu.ts \ -diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -index 66f0ec3..2fc19b9 100644 ---- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -+++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk -@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \ - de \ - en \ - es \ -- fa_IR \ - hu \ - it \ - ja \ From e2a429584406a9e233493c032a6068ca1e3fa450 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:10:40 +0100 Subject: [PATCH 058/302] chromium: Add pulse_audio_fix.patch to nixpkgs. The patch previously was fetched from an Arch Linux contributor but is no longer available there anymore. So, this is only an intermediate fix until channels get updated (very soon I hope, even though chromium 25 could get quite messy). Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 6 ++---- .../browsers/chromium/pulse_audio_fix.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30234c92f6b..44c283cc75f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,10 +79,8 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl { - url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; - sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; - }); + maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch new file mode 100644 index 00000000000..01ff89a9a63 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch @@ -0,0 +1,11 @@ +--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700 ++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700 +@@ -86,7 +86,7 @@ + + // All channel maps have the same size array of channel positions. + for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) { +- int channel_position = kChannelOrderings[channel_layout][channel]; ++ int channel_position = ChannelOrder(channel_layout, static_cast(channel)); + if (channel_position > -1) { + channel_map.map[channel_position] = ChromiumToPAChannelPosition( + static_cast(channel)); From 86f293a1e50f0a46adff8a3d3265229b02bf81ff Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:18:05 +0100 Subject: [PATCH 059/302] xf86-video-nouveau: Add pixman to buildInputs. Well, either this build is only broken on my system or noone actually uses nouveau? Even when looking into the source tree it seems to require pixman, so I suppose it didn't work for anyone prior to this commit. Signed-off-by: aszlig --- pkgs/os-specific/linux/xf86-video-nouveau/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix index e92b7f8003d..876daa7a1ec 100644 --- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto +, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman , utilmacros , libdrm , pkgconfig }: @@ -21,12 +21,14 @@ stdenv.mkDerivation { autoconf automake libtool - xorgserver xproto fontsproto xf86driproto renderproto videoproto + xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman utilmacros libdrm pkgconfig ]; + NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1"; + preConfigure = "autoreconf -vfi"; meta = { From abe2993c4bef1ecde7cb2d0ed29049eee181c812 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:22:45 +0100 Subject: [PATCH 060/302] chromium: Add myself to maintainers. Might come in handy to actually know when things going to break. In case you're wondering: Yes, "aszlig" is the name everyone uses in real life (even my family uses it) and is my pending stage name (not _yet_ officially). Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/lib/maintainers.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 44c283cc75f..62a4c6cc211 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -195,7 +195,7 @@ in stdenv.mkDerivation rec { meta = { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ goibhniu chaoflow ]; + maintainers = with maintainers; [ goibhniu chaoflow aszlig ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index b065a50ce00..bff4ffa3b19 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -10,6 +10,7 @@ andres = "Andres Loeh "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; + aszlig = "aszlig "; bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; From 42d49b47bad81a37366779dd8bf53dc508ec07e5 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 10 Jan 2013 12:50:17 +0100 Subject: [PATCH 061/302] comment unneeded buildInputStrings --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 527d4f3108f..d650116ada9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -56,7 +56,7 @@ python.stdenv.mkDerivation (attrs // { # recursivePthLoader is responsible for loading pth files propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - buildInputStrings = map toString buildInputs; + #buildInputStrings = map toString buildInputs; pythonPath = [ setuptools ] ++ pythonPath; From 9a41e3630a71773787002368f69ecef7fa28fb64 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 10 Jan 2013 13:10:47 +0100 Subject: [PATCH 062/302] remove some packages also broken in master --- pkgs/top-level/release-python.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 7374ede263a..e21b4fa5964 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -62,7 +62,6 @@ in apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ardour = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ardour3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; arora = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; asc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -141,9 +140,7 @@ in castle_combat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cbrowser = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cc1394 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ccid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cdrdao = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - centerim = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cflow = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cgal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; cgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -184,7 +181,6 @@ in consolekit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; construo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; construoBase = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - content = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coq = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coq_8_3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; coriander = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1742,7 +1738,6 @@ in virtmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; virtualgl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; virtviewer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - VisualBoyAdvance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vite = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vkeybd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vlc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 7242b4994e98a0d88b17eb40e7393bb8340bf0e3 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 10 Jan 2013 13:39:24 +0100 Subject: [PATCH 063/302] Added optparse: A node.js option parsing library --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 907f747ef7e..791eb43358c 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -742,6 +742,19 @@ let self = { ]; }; + "optparse" = self."optparse-1.0.3"; + + "optparse-1.0.3" = self.buildNodePackage rec { + name = "optparse-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/optparse/-/${name}.tgz"; + sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883"; + }; + deps = [ + + ]; + }; + "osenv" = self."osenv-0"; "osenv-0" = self.buildNodePackage rec { From 7e1d0c12a3e9e8cc2d4a78ba9a6039c20f3eca32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Jan 2013 15:10:27 +0100 Subject: [PATCH 064/302] stuntrally: updating from 1.4 to 1.8 I updated ogre and mygui, too. Now myguiSvn is older than mygui. We should check if this commit breaks other games that use ogre (ror?) --- pkgs/development/libraries/mygui/default.nix | 10 +++--- pkgs/development/libraries/ogre/default.nix | 6 ++-- pkgs/games/stuntrally/default.nix | 32 +++++++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index f692c14a6df..0a2df000384 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}: +{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}: stdenv.mkDerivation rec { - name = "mygui-3.0.1"; + name = "mygui-3.2.0"; src = fetchurl { - url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip; - sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig"; + url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip; + sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p"; }; enableParallelBuilding = true; - buildInputs = [ unzip ogre cmake ois freetype libuuid boost ]; + buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ]; meta = { homepage = http://mygui.info/; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 3a8e1c4ae55..6bb1916ed0f 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -8,11 +8,11 @@ , nvidia_cg_toolkit }: stdenv.mkDerivation { - name = "ogre-1.7.2"; + name = "ogre-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2"; - sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5"; + url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2"; + sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s"; }; cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 69609b1bbfb..31fd25a5150 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,15 +1,33 @@ -{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig -, makeWrapper }: +{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig +, makeWrapper, enet, libXcursor }: stdenv.mkDerivation rec { - name = "stunt-rally-1.4"; + name = "stunt-rally-1.8"; - src = fetchurl { - url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2; - sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq"; + src = fetchgit { + url = git://github.com/stuntrally/stuntrally.git; + rev = "refs/tags/1.8"; + sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm"; }; - buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ]; + tracks = fetchgit { + url = git://github.com/stuntrally/tracks.git; + rev = "refs/tags/1.8"; + sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l"; + }; + + patchPhase = '' + sed -i 's/materials/materials material_templates/' data/CMakeLists.txt + ''; + + preConfigure = '' + mkdir data/tracks + cp -R $tracks/* data/tracks + ''; + + buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet + libXcursor + ]; # I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but # the cmake code I saw is not ready for that. Therefore, we use the env var. From ce705aa9982a402ad88d9c07f3e455d0a57848d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Jan 2013 20:55:46 +0100 Subject: [PATCH 065/302] supertuxkart: updating to 0.8 --- pkgs/games/super-tux-kart/default.nix | 23 +++++++++++++---------- pkgs/top-level/all-packages.nix | 7 +------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 0c92ffbcdbb..46f22d332cc 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,24 +1,27 @@ -{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig -, fribidi }: +{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa +, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig +, fribidi, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "supertuxkart-0.7.3"; + name = "supertuxkart-0.8"; src = fetchurl { url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7"; + sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr"; }; buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843 - libXxf86vm curl pkgconfig fribidi + plib SDL openal freealut mesa libvorbis libogg gettext + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake ]; - configureFlags = [ "--with-irrlicht=${irrlicht3843}" ]; + enableParallelBuilding = true; - postInstall = '' - mv $out/games $out/bin + preConfigure = '' + echo Building internal Irrlicht + cd lib/irrlicht/source/Irrlicht/ + NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + cd - ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5bf3e136a5..7a820350dc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8374,12 +8374,7 @@ let superTux = callPackage ../games/super-tux { }; - superTuxKart = callPackage ../games/super-tux-kart { - /* With GNU Make 3.82, the build process is stuck in the `data' - directory, after displaying "Making all in tracks", and `pstree' - indicates that `make' doesn't launch any new process. */ - stdenv = overrideInStdenv stdenv [ gnumake381 ]; - }; + superTuxKart = callPackage ../games/super-tux-kart { }; tbe = callPackage ../games/the-butterfly-effect {}; From 6f1aad769f4dab42e9542c079fa43184388b074f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 10 Jan 2013 22:34:05 +0100 Subject: [PATCH 066/302] Libertine fonts: update and cleanup. --- pkgs/data/fonts/libertine/default.nix | 21 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index a0ed5f75797..514690cb0cd 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,25 +1,24 @@ -args : with args; -rec { +args: with args; rec { + name = "linux-libertine-5.3.0"; + src = fetchurl { - url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz; - sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg"; + url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - buildInputs = [fontforge]; - configureFlags = []; + buildInputs = [ fontforge ]; /* doConfigure should be specified separately */ phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"]; - + extraFontForgeCommands = '' ScaleToEm(1000); ''; - doUnpack = fullDepEntry '' - tar xf ${src} - '' ["minInit"]; + doUnpack = lib.fullDepEntry '' + tar xf ${src} + '' ["minInit"]; - name = "linux-libertine-5.0.0"; meta = { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a820350dc9..b59a8a63dea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6519,7 +6519,7 @@ let liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { - inherit fontforge; + inherit fetchurl fontforge lib; }; lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; From 212b4df91cccb6bdfaf80b3fc84ea47907e9898b Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 09:53:28 +0100 Subject: [PATCH 067/302] recursivePthLoader included via wrapper, not propagated by modules --- pkgs/development/interpreters/python/wrapper.nix | 4 ++-- pkgs/development/python-modules/generic/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f4892f92b41..0f2f46cd568 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,12 @@ # Create a python that knows about additional python packages via # PYTHONPATH -{stdenv, python, makeWrapper, extraLibs ? []}: +{ stdenv, python, makeWrapper, recursivePthLoader, extraLibs ? [] }: stdenv.mkDerivation { name = "python-${python.version}-wrapper"; - propagatedBuildInputs = [python makeWrapper] ++ extraLibs; + propagatedBuildInputs = extraLibs ++ [ python makeWrapper recursivePthLoader ]; unpackPhase = "true"; installPhase = '' diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index d650116ada9..2e5601ae17c 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,11 +53,6 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # recursivePthLoader is responsible for loading pth files - propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; - - #buildInputStrings = map toString buildInputs; - pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b59a8a63dea..c7c97b21da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2847,6 +2847,7 @@ let python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27; + inherit (python27Packages) recursivePthLoader; }; pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; From 37abd1e353269dad5be191458c92700027019695 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 10:35:55 +0100 Subject: [PATCH 068/302] fix python26Full expression --- pkgs/top-level/all-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7c97b21da0..06707363b36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2828,22 +2828,19 @@ let pure = callPackage ../development/interpreters/pure {}; - python = python27; python3 = python32; - - python26 = callPackage ../development/interpreters/python/2.6 { }; - - python27 = callPackage ../development/interpreters/python/2.7 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; - pythonFull = python27Full; + python = python27; + python26 = callPackage ../development/interpreters/python/2.6 { }; + python27 = callPackage ../development/interpreters/python/2.7 { }; + pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python26.modules; python = python26; + inherit (python26Packages) recursivePthLoader; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27; From a59164e9312f35e4fa45b6168c8b03d315db4b7c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 10:54:25 +0100 Subject: [PATCH 069/302] modules propgate recursivePthLoader An alternative would be to include it with the plain `python`. --- pkgs/development/python-modules/generic/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 2e5601ae17c..c7157110758 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -53,6 +53,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ]; + pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' From abd6be85e1254905406fbe97ed070271a101ce85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Jan 2013 15:02:15 +0100 Subject: [PATCH 070/302] lxc: update to version 0.8.0 --- pkgs/os-specific/linux/lxc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index be943f5df9e..8f60ff2554b 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: +{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "lxc-0.8.0-rc2"; + name = "lxc-0.8.0"; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; - sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; + sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a"; }; - buildInputs = [ libcap perl docbook2x ]; + buildInputs = [ libcap apparmor perl docbook2x ]; patches = [ ./dont-run-ldconfig.patch From b4f84e3b1eed301a1bf9ce4f53b33a08bd67f05e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:14:53 +0100 Subject: [PATCH 071/302] pythonPackages: introduce sections, no functional change --- pkgs/top-level/python-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6827337dde4..5e93f22ed64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3,22 +3,28 @@ let pythonPackages = python.modules // rec { inherit python; - inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; + # helpers buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; inherit python wrapPython setuptools recursivePthLoader offlineDistutils; }; + wrapPython = pkgs.makeSetupHook + { deps = pkgs.makeWrapper; + substitutions.libPrefix = python.libPrefix; + } + ../development/python-modules/generic/wrap.sh; + + # specials recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; }; - setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; @@ -34,6 +40,8 @@ let pythonPackages = python.modules // rec { inherit python; }; + # packages defined elsewhere + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; @@ -49,12 +57,8 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; + # packages defined here afew = buildPythonPackage rec { rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199"; From 01f142296ab78e2dd57bc6dc83faa3ec91b2aeea Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:15:52 +0100 Subject: [PATCH 072/302] pythonPackages: use unversioned to blend into pkgs, no functional change --- 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 06707363b36..cb7996fc02e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,13 +5295,13 @@ let numeric = callPackage ../development/python-modules/numeric { }; - pil = python27Packages.pil; + pil = pythonPackages.pil; psyco = callPackage ../development/python-modules/psyco { }; pycairo = callPackage ../development/python-modules/pycairo { }; - pycrypto = python27Packages.pycrypto; + pycrypto = pythonPackages.pycrypto; pycups = callPackage ../development/python-modules/pycups { }; From 87423443b8e329b9bc90f1475ef456616e2d477f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:23:44 +0100 Subject: [PATCH 073/302] pycairo: move to pythonPackages --- pkgs/development/python-modules/pycairo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 8aebf1d7829..1e8ceed6878 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pkgconfig, cairo, x11}: +{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }: stdenv.mkDerivation { name = "pycairo-1.8.8"; @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig"; }; - buildInputs = [python pkgconfig cairo x11]; + buildInputs = [ python pkgconfig cairo x11 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7996fc02e..7b5cc11a7c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5299,7 +5299,7 @@ let psyco = callPackage ../development/python-modules/psyco { }; - pycairo = callPackage ../development/python-modules/pycairo { }; + pycairo = pythonPackages.pycairo; pycrypto = pythonPackages.pycrypto; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e93f22ed64..72a44f48f33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -52,6 +52,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pycairo = import ../development/python-modules/pycairo { + inherit (pkgs) stdenv fetchurl pkgconfig cairo x11; + inherit python; + }; + pycrypto = import ../development/python-modules/pycrypto { inherit (pkgs) fetchurl stdenv gmp; inherit python buildPythonPackage; From e856c72159abb655872bd8d32daf82874cb1d3ee Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:30:56 +0100 Subject: [PATCH 074/302] pygobject: in pythonPackages, removed hack handled now by pth --- .../development/python-modules/pygobject/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 5 +++++ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 4ef851f5b3e..5a320cc97ee 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -12,18 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib ]; - postInstall = '' - # All python code is installed into a "gtk-2.0" sub-directory. That - # sub-directory may be useful on systems which share several library - # versions in the same prefix, i.e. /usr/local, but on Nix that directory - # is useless. Furthermore, its existence makes it very hard to guess a - # proper $PYTHONPATH that allows "import gtk" to succeed. - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - ''; - meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b5cc11a7c3..2303d730720 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5309,7 +5309,7 @@ let pygame = callPackage ../development/python-modules/pygame { }; - pygobject = callPackage ../development/python-modules/pygobject { }; + pygobject = pythonPackages.pygobject; pygtk = callPackage ../development/python-modules/pygtk { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72a44f48f33..65711acf6f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -62,6 +62,11 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; + pygobject = import ../development/python-modules/pygobject { + inherit (pkgs) stdenv fetchurl pkgconfig glib; + inherit python; + }; + # packages defined here From 59879f6496db062a62574735925a61c6c5473e10 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 16:11:07 +0100 Subject: [PATCH 075/302] fixup: pygobject rename pth --- pkgs/development/python-modules/pygobject/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 5a320cc97ee..5575243bd9f 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig glib ]; + # in a "normal" setup, pygobject and pygtk are installed into the + # same site-packages: we need a pth file for both. pygtk.py would be + # used to select a specific version, in our setup it should have no + # effect, but we leave it in case somebody expects and calls it. + postInstall = '' + mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth} + ''; + meta = { homepage = http://live.gnome.org/PyGObject; description = "Python bindings for Glib"; From a7a6173a3f77df4faa6cc9b7e082f37537f459c7 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 17:45:26 +0100 Subject: [PATCH 076/302] pygtk in pythonPackages, checks disabled, demo works, relates #223 Previously the checkPhase was not executed. It is now and a couple of issues with it are seded away. --- .../python-modules/pygtk/default.nix | 43 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +-- pkgs/top-level/python-packages.nix | 14 ++++++ 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 81147fff17d..07d57591f1a 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo -, libglade ? null }: +{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo +, buildPythonPackage, libglade ? null }: -stdenv.mkDerivation rec { +buildPythonPackage rec { name = "pygtk-2.22.0"; src = fetchurl { @@ -10,26 +10,35 @@ stdenv.mkDerivation rec { }; buildInputs = - [ makeWrapper python pkgconfig glib gtk ] + [ pkgconfig glib gtk ] ++ stdenv.lib.optional (libglade != null) libglade; propagatedBuildInputs = [ pygobject pycairo ]; + installCommand = "make install"; + checkPhase = stdenv.lib.optionalString (libglade == null) + '' + sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ + tests/common.py + sed -i -e "s/, glade$//" \ + -e "s/.*testGlade.*//" \ + -e "s/.*(glade.*//" \ + tests/test_api.py + '' + '' + sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \ + -e "s/sys.path.insert(0, buildDir)//" \ + tests/common.py + make check + ''; + # XXX: TypeError: Unsupported type: + # The check phase was not executed in the previous + # non-buildPythonPackage setup - not sure why not. + doCheck = false; + postInstall = '' rm $out/bin/pygtk-codegen-2.0 ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - - # All python code is installed into a "gtk-2.0" sub-directory. That - # sub-directory may be useful on systems which share several library - # versions in the same prefix, i.e. /usr/local, but on Nix that directory - # is useless. Furthermore, its existence makes it very hard to guess a - # proper $PYTHONPATH that allows "import gtk" to succeed. - cd $(toPythonPath $out)/gtk-2.0 - for n in *; do - ln -s "gtk-2.0/$n" "../$n" - done - - wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \ - $(toPythonPath "${pygobject} ${pycairo} $out") + ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \ + $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2303d730720..032538f9505 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5311,11 +5311,9 @@ let pygobject = pythonPackages.pygobject; - pygtk = callPackage ../development/python-modules/pygtk { }; + pygtk = pythonPackages.pygtk; - pyGtkGlade = callPackage ../development/python-modules/pygtk { - inherit (gnome) libglade; - }; + pyGtkGlade = pythonPackages.pyGtkGlade; pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { inherit python openssl; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65711acf6f8..c247f858b5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -67,6 +67,20 @@ let pythonPackages = python.modules // rec { inherit python; }; + pygtk = import ../development/python-modules/pygtk { + inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit python buildPythonPackage pygobject pycairo; + }; + + # XXX: how can we get an override here? + #pyGtkGlade = pygtk.override { + # inherit (pkgs.gnome) libglade; + #}; + pyGtkGlade = import ../development/python-modules/pygtk { + inherit (pkgs) fetchurl stdenv pkgconfig glib gtk; + inherit (pkgs.gnome) libglade; + inherit python buildPythonPackage pygobject pycairo; + }; # packages defined here From f2c66f54e69b6f3fac6f95ddaa9979df4f59bb1b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 11 Jan 2013 18:02:36 +0100 Subject: [PATCH 077/302] Fix compliation of gts on Darwin --- pkgs/development/libraries/gts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index b3038d5eadd..7eb519a045c 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, pkgconfig }: +{ fetchurl, stdenv, glib, pkgconfig, gettext }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - buildInputs = [ glib pkgconfig ]; + buildInputs = [ glib pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; meta = { homepage = http://gts.sourceforge.net/; From 24d48d917056bb095c755d8160987e145805ee5c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 18:03:32 +0100 Subject: [PATCH 078/302] don't put propagated recursivePthLoader into pth file, #257 --- pkgs/development/python-modules/generic/wrap.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 71269945d6f..d42be146955 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -51,6 +51,9 @@ createBuildInputsPth() { local inputs="$2" if [ foo"$inputs" != foo ]; then for x in $inputs; do + if $(echo -n $x |grep -q python-recursive-pth-loader); then + continue + fi if test -d "$x"/lib/@libPrefix@/site-packages; then echo $x/lib/@libPrefix@/site-packages \ >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth From a0d45d6f9b581ab1670ec99126c2a48e06938dbb Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 11 Jan 2013 18:20:44 +0100 Subject: [PATCH 079/302] graphviz: Fix compilation on darwin --- pkgs/tools/graphics/graphviz/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index db4d766b760..96ae324b01f 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd, xlibs, gts +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext }: stdenv.mkDerivation rec { @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; patches = [ ./fix-broken-memcp-signature.patch ]; From 0cfd455a67accd8c1617532f8e2377889f8789bc Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 11 Jan 2013 09:25:32 -0800 Subject: [PATCH 080/302] Update x86info description. Add Homepage. --- pkgs/os-specific/linux/x86info/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 0cdb7fea1af..d8840d08460 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -17,8 +17,17 @@ stdenv.mkDerivation rec { ''; meta = { + description = "An identification utility for the x86 series of processors."; + longDescription = + '' + x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages + the cpuid kernel module where possible. it supports parsing model specific + registers (MSRs) via the msr kernel module. it will approximate processor + frequency, and identify the cache sizes and layout. + ''; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + homepage = http://codemonkey.org.uk/projects/x86info/; maintainers = with stdenv.lib.maintainers; [jcumming]; - description = "x86info, a CPU identification utility."; }; } From 3fe43187fbec49ec09357f18535bb67673ba53a1 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 11 Jan 2013 09:28:52 -0800 Subject: [PATCH 081/302] urxvt-9.16 --- pkgs/applications/misc/rxvt_unicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b643b8a658e..d52fd178165 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -3,7 +3,7 @@ let name = "rxvt-unicode"; - version = "9.15"; + version = "9.16"; n = "${name}-${version}"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "ec1aa2932da844979ed8140bd92223defb12042aa5e877e05ac31139ca81f2b1"; + sha256 = "0x28wyslqnhn2q11y4hncqdl07wgh5ypywl92fq0jxycr36ibfvn"; }; buildInputs = From 2dd59fc4cf74d62d47de613512213c63cf6400b6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 11 Jan 2013 18:32:45 +0100 Subject: [PATCH 082/302] imagemagick: disable ghostscript on darwin, to make it work --- pkgs/applications/graphics/ImageMagick/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d66db51a4de..b96d1bc84f7 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -3,7 +3,7 @@ , bzip2 , freetype , graphviz -, ghostscript +, ghostscript ? null , libjpeg , libpng , libtiff @@ -27,16 +27,17 @@ stdenv.mkDerivation rec { sha256 = "0m0sa4jxsvm8pf9nfvkzlbzq13d1lj15lfz6jif12l6ywyh2c1cs"; }; - configureFlags = '' + configureFlags = "" + stdenv.lib.optionalString (ghostscript != null && stdenv.system != "x86_64-darwin") '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib + '' + '' --with-frozenpaths ${if librsvg != null then "--with-rsvg" else ""} ''; propagatedBuildInputs = - [ bzip2 freetype ghostscript libjpeg libpng libtiff libxml2 zlib librsvg - libtool jasper libX11 ]; + [ bzip2 freetype libjpeg libpng libtiff libxml2 zlib librsvg + libtool jasper libX11 ] ++ stdenv.lib.optional (ghostscript != null && stdenv.system != "x86_64-darwin") ghostscript; buildInputs = [ tetex graphviz ]; From d1662d715514e6ef9d3dc29f132f1b3d8e608a18 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 14:42:09 -0500 Subject: [PATCH 083/302] Add the replace-dependency build support function. The use case is to do a deep replacement of a dependency without rebuilding the entire tree. For example, suppose a security hole is found in glibc and a patch released. Ideally, you'd just rebuild everything, but that takes time, space, and CPU that you might not have, so in the mean time you could build a safe version of, say, firefox with: firefox-safe = replace-dependency { drv = firefox; old-dependency = glibc; new-dependency = patched-glibc; }; Building firefox-safe will rebuild glibc, but only do a simple copy/string replacement on all other dependencies of firefox. On my system (MBP 13" mid-2012), after a new glibc had been build building firefox took around 11 seconds. See the comments in the file for more details. --- pkgs/build-support/replace-dependency.nix | 80 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/build-support/replace-dependency.nix diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix new file mode 100644 index 00000000000..364d5548151 --- /dev/null +++ b/pkgs/build-support/replace-dependency.nix @@ -0,0 +1,80 @@ +{ runCommand, nix, lib }: + +# Replace a single dependency in the requisites tree of drv, propagating +# the change all the way up the tree, without a full rebuild. This can be +# useful, for example, to patch a security hole in libc and still use your +# system safely without rebuilding the world. This should be a short term +# solution, as soon as a rebuild can be done the properly rebuild derivation +# should be used. The old dependency and new dependency MUST have the same-length +# name, and ideally should have close-to-identical directory layout. +# +# Example: safe-firefox = replace-dependency { +# drv = firefox; +# old-dependency = glibc; +# new-dependency = overrideDerivation glibc (attrs: { +# patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; +# }); +# }; +# This will rebuild glibc with your security patch, then copy over firefox +# (and all of its dependencies) without rebuilding further. +{ drv, old-dependency, new-dependency }: + +with lib; + +let + references = import (runCommand "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' + (echo { + while read path + do + echo " \"$path\" = [" + read count + read count + while [ "0" != "$count" ] + do + read ref_path + if [ "$ref_path" != "$path" ] + then + echo " (builtins.storePath $ref_path)" + fi + count=$(($count - 1)) + done + echo " ];" + done < graph + echo }) > $out + '').outPath; + + discard = builtins.unsafeDiscardStringContext; + + old-storepath = builtins.storePath (discard old-dependency.outPath); + + references-of = drv: getAttr (discard (toString drv)) references; + + depends-on-old = drv: elem old-storepath (references-of drv) || + any depends-on-old (references-of drv); + + drv-name = drv: + discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); + + replace-strings = drv: rewritten-drvs: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ + concatStringsSep " -e " (mapAttrsToList (name: value: + "'s|${baseNameOf name}|${baseNameOf value}|g'" + ) rewritten-drvs) + } | $nixStore --restore $out + ''; + + fn = { drv, rewritten-drvs }: rewritten-drvs // ( + if depends-on-old drv + then listToAttrs [ { + name = discard (toString drv); + + value = replace-strings drv (rewritten-drvs // (fold (drv: acc: + (fn { inherit drv rewritten-drvs; }) // acc + ) {} (references-of drv))); + } ] + else {} + ); +in assert (stringLength old-dependency.name == stringLength new-dependency.name); getAttr (discard drv.outPath) (fn { + inherit drv; + rewritten-drvs = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b59a8a63dea..e6a5b461f09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,6 +344,10 @@ let inherit stdenv; }; + "replace-dependency" = import ../build-support/replace-dependency.nix { + inherit runCommand nix lib; + }; + nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; vmTools = import ../build-support/vm/default.nix { From 779c74f79575952e14b11bfdbe1b15ec9ce5d001 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:09:07 -0500 Subject: [PATCH 084/302] Remove some artifacts of a failed attempt from replace-dependency --- pkgs/build-support/replace-dependency.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 364d5548151..56f324841a8 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -63,18 +63,17 @@ let } | $nixStore --restore $out ''; - fn = { drv, rewritten-drvs }: rewritten-drvs // ( + rewritten-deps = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; + + fn = drv: if depends-on-old drv then listToAttrs [ { name = discard (toString drv); - value = replace-strings drv (rewritten-drvs // (fold (drv: acc: - (fn { inherit drv rewritten-drvs; }) // acc + value = replace-strings drv (rewritten-deps // (fold (drv: acc: + (fn drv) // acc ) {} (references-of drv))); } ] - else {} - ); -in assert (stringLength old-dependency.name == stringLength new-dependency.name); getAttr (discard drv.outPath) (fn { - inherit drv; - rewritten-drvs = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; -}) + else {}; +in assert (stringLength old-dependency.name == stringLength new-dependency.name); +getAttr (discard drv.outPath) (fn drv) From 5dd1b8f20476d17d5499bf43aa1dcfbd42053919 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:13:58 -0500 Subject: [PATCH 085/302] replace-dependency: Don't strictly require that drv, old-dependency, and new-dependency be derivations --- pkgs/build-support/replace-dependency.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 56f324841a8..b069a64b49c 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -45,7 +45,7 @@ let discard = builtins.unsafeDiscardStringContext; - old-storepath = builtins.storePath (discard old-dependency.outPath); + old-storepath = builtins.storePath (discard (toString old-dependency)); references-of = drv: getAttr (discard (toString drv)) references; @@ -63,7 +63,7 @@ let } | $nixStore --restore $out ''; - rewritten-deps = listToAttrs [ {name = discard old-dependency.outPath; value = new-dependency;} ]; + rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; fn = drv: if depends-on-old drv @@ -75,5 +75,5 @@ let ) {} (references-of drv))); } ] else {}; -in assert (stringLength old-dependency.name == stringLength new-dependency.name); -getAttr (discard drv.outPath) (fn drv) +in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); +getAttr (discard (toString drv)) (fn drv) From 96a834d42a1eaf663d5ba6a77fd3045554a77157 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 11 Jan 2013 16:16:20 -0500 Subject: [PATCH 086/302] replace-dependency: Better function names --- pkgs/build-support/replace-dependency.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index b069a64b49c..016845dd754 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -55,25 +55,25 @@ let drv-name = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - replace-strings = drv: rewritten-drvs: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + rewrite-hashes = drv: hashes: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ concatStringsSep " -e " (mapAttrsToList (name: value: "'s|${baseNameOf name}|${baseNameOf value}|g'" - ) rewritten-drvs) + ) hashes) } | $nixStore --restore $out ''; rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; - fn = drv: + rewritten-derivations = drv: if depends-on-old drv then listToAttrs [ { name = discard (toString drv); - value = replace-strings drv (rewritten-deps // (fold (drv: acc: - (fn drv) // acc + value = rewrite-hashes drv (rewritten-deps // (fold (drv: acc: + (rewritten-derivations drv) // acc ) {} (references-of drv))); } ] else {}; in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); -getAttr (discard (toString drv)) (fn drv) +getAttr (discard (toString drv)) (rewritten-derivations drv) From 0500d1689950fd8abab9ec739b4f2fe4b7d9963b Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 12 Jan 2013 12:43:47 +0100 Subject: [PATCH 087/302] Fix mit-scheme These changes are necessary for me to use mit-scheme on i686 NixOS. mit-scheme in the current state should be broken on x86_64 either and these changes should fix, too. I however did not test this. --- .../compilers/mit-scheme/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index ef11c5b3baf..7572dda7711 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,8 +1,12 @@ -{ fetchurl, stdenv, gnum4, texinfo, texLive, automake }: +{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: let version = "9.1.1"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); + + arch = if stdenv.isi686 then "-i386" + else if stdenv.isx86_64 then "-x86-64" + else ""; in stdenv.mkDerivation { name = "mit-scheme-${version}"; @@ -25,6 +29,11 @@ stdenv.mkDerivation { sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j"; }; + configurePhase = + '' (cd src && ./configure) + (cd doc && ./configure) + ''; + buildPhase = '' cd src ${if bootstrapFromC @@ -42,11 +51,16 @@ stdenv.mkDerivation { ''; installPhase = - '' make install -C src - make install -C doc + '' make prefix=$out install -C src + make prefix=$out install -C doc ''; - buildNativeInputs = [ gnum4 texinfo texLive automake ]; + fixupPhase = + '' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \ + $out/lib/mit-scheme${arch} + ''; + + buildNativeInputs = [ makeWrapper gnum4 texinfo texLive automake ]; # XXX: The `check' target doesn't exist. doCheck = false; From bf86b890c85b0f5a263ffc2d8b263effdcc2bb7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:34 +0100 Subject: [PATCH 088/302] haskell-cipher-aes: update to version 0.1.7 --- pkgs/development/libraries/haskell/cipher-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e61fcfd95b5..bae23737585 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.5"; - sha256 = "0n0qbq2hwyksdbr6fn7yj5vwicmdrn58mfz0dprl8fj456r4j3kn"; + version = "0.1.7"; + sha256 = "1iai9c4rvxframylvc0xwx2nk6s0rsj4dc42wi334xyinilvfyng"; meta = { homepage = "http://github.com/vincenthz/hs-cipher-aes"; description = "Fast AES cipher implementation with advanced mode of operations"; From 3180c593f00e3c3cef3dcf5f0b661be002e6444b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:34 +0100 Subject: [PATCH 089/302] haskell-cprng-aes: update to version 0.3.4 --- pkgs/development/libraries/haskell/cprng-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index de5f400615a..4f2aa58b7d2 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.3.2"; - sha256 = "1xwwhg83llf9fzfafxsky65biwk0sla9273rp4gqr7vg9p02k221"; + version = "0.3.4"; + sha256 = "0k1zh4nw30qgdrkgn6x6zfbpp129f9cparzyqsdqfbf44j0mf2rw"; buildDepends = [ cipherAes cryptoApi cryptoRandomApi entropy random ]; From 4d6f490c3142c72456302fb43b2659da47c96d42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 090/302] haskell-gitit: update to version 0.10.1.2 --- pkgs/development/libraries/haskell/gitit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index e518dd879a0..aa06d0178be 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.1"; - sha256 = "1akrc362cf3fzfjyyf1g8bzna093kwsiyxdfpz0d9wd3z6jyc8cg"; + version = "0.10.1.2"; + sha256 = "1dy1wdnld6cxx5xqfszywi4f7xv143ar2dq4nb0dnd1dgd5hgmak"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From 5c4b91506e20ef0a219fdb73dcd60c8457d895e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 091/302] haskell-http-conduit: update to version 1.8.6.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index aada13af06a..5009d4132de 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.2"; - sha256 = "0b9iw8gq0kyfmnpv1jba2dx8rik9136zx5q9xdyvy0lczdgb8i09"; + version = "1.8.6.3"; + sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From a1ac3801dd98703d57dafc5711a19aa496a3bf2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 092/302] haskell-libmpd: update to version 0.8.0.2 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index f6185597af1..fc77388727f 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.1"; - sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm"; + version = "0.8.0.2"; + sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj"; buildDepends = [ filepath mtl network text time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; From cefe3bf3318dff3de17e8bb06156157fde1862a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 093/302] haskell-reactive-banana: update to version 0.7.1.1 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 467addefeeb..ef4016d003d 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.0"; - sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r"; + version = "0.7.1.1"; + sha256 = "0d4dqpzglzkygy2hhn1j1c7vk2782mk66f8aqaadkyhijn7kc6i5"; buildDepends = [ hashable transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; From 8d003b28e4be49ae1fedfd49db41cb8e93963485 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:30:35 +0100 Subject: [PATCH 094/302] haskell-wai-extra: update to version 1.3.2 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index bc55da65469..1f08f3f1fd4 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.1.1"; - sha256 = "0590i9zs47fxqlz4l7zrk15x4s1rvzvp0fs1caygr5hw32v8h0by"; + version = "1.3.2"; + sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From 1f07564f8b74e0511a9ee6f26e74dc7e152c9950 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 12 Jan 2013 15:41:44 +0100 Subject: [PATCH 095/302] smartmontools: update drive database to the latest version --- pkgs/tools/system/smartmontools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 89f8d3f5e77..7a37e1200b4 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,8 +2,8 @@ let driverdb = fetchurl { - url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3685"; - sha256 = "11zczy03asfpj4wwip5bf3fpingdc7biz1cs3cykg4vnlxiwjxkx"; + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3742"; + sha256 = "04xsgxzc1mqn9szazyr6v3xcpw0pszi8vz7xcsb661rww5482rw0"; name = "smartmontools-drivedb.h"; }; in From 5626c5cdfb6de664881eb8b79dd54a8f4ca19b8f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 12 Jan 2013 09:48:21 -0500 Subject: [PATCH 096/302] replace-dependency: don't break nixpkgs for people living in the stone age --- 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 325882e66ae..aead6125905 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,9 +344,9 @@ let inherit stdenv; }; - "replace-dependency" = import ../build-support/replace-dependency.nix { + "replace-dependency" = if builtins ? langVersion then import ../build-support/replace-dependency.nix { inherit runCommand nix lib; - }; + } else args: throw "You must be using at least nix-1.2 to use replace-dependency"; nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; From 5d1296b03f3dbdb2f34ef6e4085e04caafe6ea5e Mon Sep 17 00:00:00 2001 From: Petar Bogdanovic Date: Fri, 11 Jan 2013 20:24:20 +0100 Subject: [PATCH 097/302] qiv: add version 2.2.4 --- pkgs/applications/graphics/qiv/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/graphics/qiv/default.nix diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix new file mode 100644 index 00000000000..05eb83cee29 --- /dev/null +++ b/pkgs/applications/graphics/qiv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file } : + +stdenv.mkDerivation (rec { + name = "qiv-2.2.4"; + + src = fetchurl { + url = "http://spiegl.de/qiv/download/${name}.tgz"; + sha256 = "ed6078dc550c1dc2fe35c1e0f46463c13589a24b83d4f7101b71a7485e51abb7"; + }; + + buildInputs = [ pkgconfig gtk imlib2 file ]; + + preBuild=''substituteInPlace Makefile --replace /usr/local "$out"''; + + meta = { + description = "qiv (quick image viewer)"; + homepage = http://spiegl.de/qiv/; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aead6125905..6d8d385fd02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7693,6 +7693,8 @@ let pqiv = callPackage ../applications/graphics/pqiv { }; + qiv = callPackage ../applications/graphics/qiv { }; + # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; From 778540797d8f401631f5927f97f090991b72dd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 13 Jan 2013 12:15:27 +0100 Subject: [PATCH 098/302] iwlwifi: fix URL: firmware has moved from http://intellinuxwireless.org to http://wireless.kernel.org I've only updated the firmware URLs for the firmware I could install without changing the sha256 --- .../linux/firmware/iwlwifi-1000-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-5150-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000g2a-ucode/default.nix | 5 +++-- .../linux/firmware/iwlwifi-6000g2b-ucode/default.nix | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix index 2660c0b2493..8acb75c3ed6 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-1000-ucode-128.50.3.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d"; }; @@ -26,6 +27,6 @@ stdenv.mkDerivation rec { driver found in recent kernels. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix index 0d409bd8427..dca427cbff5 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-5150-ucode-8.24.2.2"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-5150-2.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix index e5f3effa4b7..2e88f1bba74 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000-ucode-9.221.4.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-6000-4.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix index 4aea802244f..ef259b70975 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000g2a-ucode-18.168.6.1"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9"; }; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://intellinuxwireless.org/"; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; description = "Firmware for the Intel 6000 Series Gen2 wireless card"; longDescription = '' diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix index b3a2a810bf7..0fee3acd0a3 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-6000g2b-ucode-17.168.5.2"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052"; }; @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { firmware. It contains the `iwlwifi-6000g2b-4.ucode' file. ''; - homepage = http://intellinuxwireless.org/; + homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi; }; } From eb7063db0ce128e342442b891d47101756e7178e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 13 Jan 2013 15:28:38 +0200 Subject: [PATCH 099/302] Vidalia: version bump to 0.2.21 --- pkgs/tools/security/vidalia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 243604c2c79..6f34d61908e 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vidalia-${version}"; - version = "0.2.17"; + version = "0.2.21"; src = fetchurl { url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; - sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r"; + sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064"; }; buildInputs = [ cmake qt4 ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; -} \ No newline at end of file +} From 4bd5a8e26dc3ceee2111e8520975063d9bee3eb8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:09:37 +0100 Subject: [PATCH 100/302] flymake-cursor: upgrade to 0.1.5 --- .../editors/emacs-modes/flymake-cursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix index b629186033f..0a26e8fd43d 100644 --- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix +++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs }: stdenv.mkDerivation rec { - name = "flymake-cursor-0.1.4"; + name = "flymake-cursor-0.1.5"; src = fetchurl { url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; - sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02"; + sha256 = "1qqppd1786w8pl1avjb01n23lwihb7m0hr23abjklsxz03gmp4qz"; }; phases = [ "buildPhase" "installPhase"]; From 1f0a6fbf5210c813b429071c6a26e8eac7c70c94 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 15:32:07 +0100 Subject: [PATCH 101/302] htmlize: upgrade to 1.43 --- pkgs/applications/editors/emacs-modes/htmlize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index d4de24d394c..da3bde88d75 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "htmlize-1.40"; + name = "htmlize-1.43"; builder = ./builder.sh; src = fetchurl { url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi; - sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a"; + sha256 = "0bdaxh3pjf4z55i7vz4yz3yz45720h8aalhmx13bgkrpijzn93bi"; }; meta = { From 67ff54e4e9ca66b64a1b0684c991f3a3d6f0591b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:23:33 +0100 Subject: [PATCH 102/302] iso-codes: upgrade to 3.40 --- pkgs/development/libraries/iso-codes/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index a0119866df0..4e6614345c1 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, gettext, python}: +{stdenv, fetchurl, gettext, python, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.23"; + name = "iso-codes-3.40"; src = fetchurl { - url = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${name}.tar.bz2"; - sha256 = "0lf9phrdr10biihqswq1qmwk5cz954nwavgbnpm7a5r6vzfzkfbq"; + url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; + sha256 = "0iph96n8vh4khidxg2zzhmcqnphfzg50agn0lv9cjhmnx0i712pr"; }; patchPhase = '' for i in `find . -name \*.py` @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { done ''; buildInputs = [ gettext ]; + nativeBuildInputs = [ xz ]; meta = { homepage = http://pkg-isocodes.alioth.debian.org/; From 6860ab9946098a5c606d09b6c5b8b9a77db4d033 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 16:47:43 +0100 Subject: [PATCH 103/302] jfsutils: upgrade to 1.1.15 --- pkgs/tools/filesystems/jfsutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 79a9fad0e79..dc07734b960 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libuuid }: stdenv.mkDerivation rec { - name = "jfsutils-1.1.12"; + name = "jfsutils-1.1.15"; src = fetchurl { url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz"; - sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd"; + sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50"; }; buildInputs = [ libuuid ]; From 1610c526f9ca8655b243a8148ebc8c183b78c0c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 7 Jan 2013 01:03:19 +0100 Subject: [PATCH 104/302] xfce4 terminal: fix url --- pkgs/desktops/xfce-4.8/applications/terminal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce-4.8/applications/terminal.nix b/pkgs/desktops/xfce-4.8/applications/terminal.nix index 44aa72d9d8c..f03a940679a 100644 --- a/pkgs/desktops/xfce-4.8/applications/terminal.nix +++ b/pkgs/desktops/xfce-4.8/applications/terminal.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { name = "xfce-terminal-0.4.8"; - + src = fetchurl { - url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.8.tar.bz2; + url = http://archive.xfce.org/src/apps/xfce4-terminal/0.4/Terminal-0.4.8.tar.bz2; sha1 = "2f12c3a0fffad18976d47e531d404ee308cb2f05"; }; From 6f90b481dbfa0fdf6c13af9169307d8d3dd3e49b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 6 Jan 2013 16:13:29 +0100 Subject: [PATCH 105/302] nss: add yet another mirror to get the patch from the original url throws 500 the mirror's patch differs (probably upgraded for newer nss) so I found one more source, with a (versioned) url --- pkgs/development/libraries/nss/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e0bd1d2a53e..8e4edcad885 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -13,8 +13,9 @@ let secLoadPatch = fetchurl { name = "security_load.patch"; urls = [ - "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" - "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" + # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch" ]; sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; }; From cf546347e539d41e4b89db145a688f0193865276 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:14 +0100 Subject: [PATCH 106/302] linux-3.0: upgrade to 3.0.58 --- 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 4ac4a4b263b..97b3a6bfd0d 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.57"; + version = "3.0.58"; 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 = "12rf48ymwsgr133d6cydsajjxb3zihrcrfhpdv185x07dbri9nbl"; + sha256 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10"; }; config = configWithPlatform stdenv.platform; From 91d4d567036e06345e131fa7bb314815c7a9ba33 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:28 +0100 Subject: [PATCH 107/302] linux-3.4: upgrade to 3.4.25 --- 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 a03e3950891..eef4847e5b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.24"; + version = "3.4.25"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1vxyb68ckzgm88jj7xzmwr2hmj5vdry5irvfr89klgqr95mmhkd1"; + sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6"; }; config = configWithPlatform stdenv.platform; From 2d56a2cc150157c9e0dc5fe6c24b0316874f6342 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:06:46 +0100 Subject: [PATCH 108/302] linux-3.7: upgrade to 3.7.2 --- 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 1a02910b5c8..4a092fe6b3a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.7.1"; + version = "3.7.2"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0mbjvrr0658gg052hbf32vfcmlzfsr777wgmaxrpkpzbfs1qpjp1"; + sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04"; }; config = configWithPlatform stdenv.platform; From 2738f6d5cc692addee26d374b8ef61e293855a7a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 13 Jan 2013 14:54:26 +0100 Subject: [PATCH 109/302] node/bson: fix sha256 --- pkgs/top-level/node-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 791eb43358c..083fb573087 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -128,7 +128,7 @@ let self = { name = "bson-0.1.5"; src = fetchurl { url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "3fad2209466740ea81d0bc285b92d940efe5104a6314946ea40180c431a19692"; + sha256 = "58af4a1697b015190b40c2a7e5743f9d4494887ef98dfe2f58f24c70f2d31150"; }; deps = [ From 4dc4d1012352a97b440ce68681c9cb9643010a60 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 13 Jan 2013 16:17:43 +0200 Subject: [PATCH 110/302] nvidia-legacy304: fix build --- .../linux/nvidia-x11/builder-legacy304.sh | 101 ++++++++++++++++++ .../linux/nvidia-x11/legacy304.nix | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100755 pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh new file mode 100755 index 00000000000..bb8beab29c5 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh @@ -0,0 +1,101 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + sh $src -x +} + + +buildPhase() { + if test -z "$libsOnly"; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/) + unset src # used by the nv makefile + # Hack necessary to compile on 2.6.28. + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated" + make SYSSRC=$sysSrc module + cd .. + fi +} + + +installPhase() { + + # Install libGL and friends. + mkdir -p $out/lib/vendors + + for f in \ + libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ + libnvidia-glcore libnvidia-ml libnvidia-opencl \ + libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia + do + cp -prd $f.* $out/lib/ + ln -snf $f.so.$versionNumber $out/lib/$f.so + ln -snf $f.so.$versionNumber $out/lib/$f.so.1 + done + + cp -p nvidia.icd $out/lib/vendors/ + cp -prd tls $out/lib/ + cp -prd libOpenCL.so.1.0.0 $out/lib/ + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so + ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1 + + 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.*.* + + if test -z "$libsOnly"; then + + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 + ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so + + patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-xconfig; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + mkdir -p $out/include/nvidia + cp -p *.h $out/include/nvidia + + mkdir -p $out/share/man/man1 + cp -p *.1.gz $out/share/man/man1 + + mkdir -p $out/share/applications + cp -p *.desktop $out/share/applications + + mkdir -p $out/share/pixmaps + cp -p nvidia-settings.png $out/share/pixmaps + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + fi +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index ad419610df7..c88eb77c12f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -13,7 +13,7 @@ let versionNumber = "304.64"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - builder = ./builder.sh; + builder = ./builder-legacy304.sh; src = if stdenv.system == "i686-linux" then From 553e1b16f006d4b17dc0990a5efc693d06ea2805 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 13 Jan 2013 11:15:01 -0500 Subject: [PATCH 111/302] replace-dependency: Eelco has ruled, lowerCamelCase > dash-case :( --- pkgs/build-support/replace-dependency.nix | 36 +++++++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 016845dd754..098637b4f9b 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -8,16 +8,16 @@ # should be used. The old dependency and new dependency MUST have the same-length # name, and ideally should have close-to-identical directory layout. # -# Example: safe-firefox = replace-dependency { +# Example: safeFirefox = replaceDependency { # drv = firefox; -# old-dependency = glibc; -# new-dependency = overrideDerivation glibc (attrs: { +# oldDependency = glibc; +# newDependency = overrideDerivation glibc (attrs: { # patches = attrs.patches ++ [ ./fix-glibc-hole.patch ]; # }); # }; # This will rebuild glibc with your security patch, then copy over firefox # (and all of its dependencies) without rebuilding further. -{ drv, old-dependency, new-dependency }: +{ drv, oldDependency, newDependency }: with lib; @@ -45,17 +45,17 @@ let discard = builtins.unsafeDiscardStringContext; - old-storepath = builtins.storePath (discard (toString old-dependency)); + oldStorepath = builtins.storePath (discard (toString oldDependency)); - references-of = drv: getAttr (discard (toString drv)) references; + referencesOf = drv: getAttr (discard (toString drv)) references; - depends-on-old = drv: elem old-storepath (references-of drv) || - any depends-on-old (references-of drv); + dependsOnOld = drv: elem oldStorepath (referencesOf drv) || + any dependsOnOld (referencesOf drv); - drv-name = drv: + drvName = drv: discard (substring 33 (stringLength (builtins.baseNameOf drv)) (builtins.baseNameOf drv)); - rewrite-hashes = drv: hashes: runCommand (drv-name drv) { nixStore = "${nix}/bin/nix-store"; } '' + rewriteHashes = drv: hashes: runCommand (drvName drv) { nixStore = "${nix}/bin/nix-store"; } '' $nixStore --dump ${drv} | sed 's|${baseNameOf drv}|'$(basename $out)'|g' | sed -e ${ concatStringsSep " -e " (mapAttrsToList (name: value: "'s|${baseNameOf name}|${baseNameOf value}|g'" @@ -63,17 +63,17 @@ let } | $nixStore --restore $out ''; - rewritten-deps = listToAttrs [ {name = discard (toString old-dependency); value = new-dependency;} ]; + rewrittenDeps = listToAttrs [ {name = discard (toString oldDependency); value = newDependency;} ]; - rewritten-derivations = drv: - if depends-on-old drv + rewrittenDerivations = drv: + if dependsOnOld drv then listToAttrs [ { name = discard (toString drv); - value = rewrite-hashes drv (rewritten-deps // (fold (drv: acc: - (rewritten-derivations drv) // acc - ) {} (references-of drv))); + value = rewriteHashes drv (rewrittenDeps // (fold (drv: acc: + (rewrittenDerivations drv) // acc + ) {} (referencesOf drv))); } ] else {}; -in assert (stringLength (drv-name (toString old-dependency)) == stringLength (drv-name (toString new-dependency))); -getAttr (discard (toString drv)) (rewritten-derivations drv) +in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); +getAttr (discard (toString drv)) (rewrittenDerivations drv) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d8d385fd02..44c92f09142 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -344,9 +344,9 @@ let inherit stdenv; }; - "replace-dependency" = if builtins ? langVersion then import ../build-support/replace-dependency.nix { + replaceDependency = import ../build-support/replace-dependency.nix { inherit runCommand nix lib; - } else args: throw "You must be using at least nix-1.2 to use replace-dependency"; + }; nukeReferences = callPackage ../build-support/nuke-references/default.nix { }; From 0f2874dd081d8e0ae59d47ab855af6c283acdec0 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 3 Jan 2013 11:03:16 +0100 Subject: [PATCH 112/302] nvidia96: update to support new X ABI --- .../os-specific/linux/nvidia-x11/acpixf.patch | 27 --------- .../linux/nvidia-x11/generated.patch | 12 ---- .../os-specific/linux/nvidia-x11/legacy96.nix | 16 +---- .../linux/nvidia-x11/patchlevel.patch | 59 ------------------- .../linux/nvidia-x11/switch_to.patch | 24 -------- 5 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/acpixf.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/generated.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/patchlevel.patch delete mode 100644 pkgs/os-specific/linux/nvidia-x11/switch_to.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch b/pkgs/os-specific/linux/nvidia-x11/acpixf.patch deleted file mode 100644 index c94641c6919..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -pur 96.43.20/conftest.sh 96.43.20-3.4/conftest.sh ---- 96.43.20/conftest.sh 2011-07-18 10:51:11.000000000 +0400 -+++ 96.43.20-3.4/conftest.sh 2012-06-16 00:04:22.870746239 +0400 -@@ -908,6 +908,7 @@ compile_test() { - # - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(); - }" > conftest$$.c -@@ -923,6 +924,7 @@ compile_test() { - - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); - }" > conftest$$.c -@@ -939,6 +941,7 @@ compile_test() { - - echo "$CONFTEST_PREAMBLE - #include -+ #include - void conftest_acpi_walk_namespace(void) { - acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); - }" > conftest$$.c diff --git a/pkgs/os-specific/linux/nvidia-x11/generated.patch b/pkgs/os-specific/linux/nvidia-x11/generated.patch deleted file mode 100644 index 6cf7a93c644..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/generated.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pur 173.14.31/conftest.sh 173.14.31-3.3/conftest.sh ---- 173.14.31/conftest.sh 2011-07-18 09:49:58.000000000 +0400 -+++ 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 -@@ -123,7 +123,7 @@ build_cflags() { - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated" - fi - if [ -n "$BUILD_PARAMS" ]; then - CFLAGS="$CFLAGS -D$BUILD_PARAMS" diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix index fd27a989c07..8e1fb784ae3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,7 +2,7 @@ let - versionNumber = "96.43.20"; + versionNumber = "96.43.23"; in @@ -15,27 +15,17 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw"; + sha256 = "0hi10h26l51mknr57zsdg0zaxcqdz1lp3hsz0hi1c1vkpbsavrji"; } 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}-pkg0.run"; - sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w"; + sha256 = "09vynha40rsxpklj1m0qjfg853ckdpi9g87h06irikh405x57kzp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; inherit versionNumber kernel; - # Only for kernels 3.4 and over - # Patches taken from arch linux AUR - # https://aur.archlinux.org/packages.php?ID=57698 - kpatches = stdenv.lib.optionals (stdenv.lib.strings.versionOlder "3.4" kernel.version) - [ ./acpixf.patch - ./generated.patch - ./patchlevel.patch - ./switch_to.patch - ]; - dontStrip = true; glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; diff --git a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch b/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch deleted file mode 100644 index 256922ca966..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -pur 96.43.20-t1/conftest.sh 96.43.20-t2/conftest.sh ---- 96.43.20-t1/conftest.sh 2012-06-16 17:14:47.206589267 +0400 -+++ 96.43.20-t2/conftest.sh 2012-06-16 15:35:45.049203248 +0400 -@@ -1303,10 +1303,14 @@ case "$5" in - MAKEFILE=$HEADERS/../Makefile - - if [ -f $MAKEFILE ]; then -+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3) - PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3) - -- if [ -z "$PATCHLEVEL" ]; then -+ if [ -z "$PATCHLEVEL" -o -z "$VERSION" ]; then - exit 1 -+ elif [ "$VERSION" = '3' ]; then -+ echo 6 -+ exit 0 - else - echo $PATCHLEVEL - exit 0 -@@ -1426,10 +1430,11 @@ case "$5" in - # 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 \ -+ if [ "$VERSION" = '2' -a -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ - -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 -@@ -1525,11 +1530,12 @@ case "$5" in - # This source tree is not configured, but includes - # the top-level Makefile. - # -+ 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 -n "$SUBLEVEL" ]; then -- echo 2.$PATCHLEVEL.$SUBLEVEL -+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then -+ echo $VERSION.$PATCHLEVEL.$SUBLEVEL - RET=0 - fi - fi -diff -pur 96.43.20-t1/Makefile.kbuild 96.43.20-t2/Makefile.kbuild ---- 96.43.20-t1/Makefile.kbuild 2011-07-18 10:51:11.000000000 +0400 -+++ 96.43.20-t2/Makefile.kbuild 2012-06-16 17:08:11.694605133 +0400 -@@ -132,7 +132,7 @@ MODULE_ROOT := /lib/modules/$(KERNEL_UNA - # - - TOPDIR ?= $(KERNEL_SOURCES) --PATCHLEVEL ?= $(shell $(CONFTEST) kernel_patch_level) -+PATCHLEVEL := $(shell $(CONFTEST) kernel_patch_level) - - # - # Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko diff --git a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch b/pkgs/os-specific/linux/nvidia-x11/switch_to.patch deleted file mode 100644 index 51ffa7f83f1..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -pur 173.14.31-3.3/conftest.sh 173.14.31-3.4/conftest.sh ---- 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400 -+++ 173.14.31-3.4/conftest.sh 2012-04-10 19:50:36.052346728 +0400 -@@ -465,7 +465,7 @@ compile_test() { - # and if it as an 'event' member. - # - echo "$CONFTEST_PREAMBLE -- #include -+ #include - #include - void conftest_pm_message_t(pm_message_t state) { - pm_message_t *p = &state; -diff -pur 173.14.31-3.3/nv-linux.h 173.14.31-3.4/nv-linux.h ---- 173.14.31-3.3/nv-linux.h 2011-07-18 09:49:58.000000000 +0400 -+++ 173.14.31-3.4/nv-linux.h 2012-04-10 19:53:04.853776013 +0400 -@@ -92,7 +92,7 @@ - #include - - #include /* do_div() */ --#include /* cli, sli, save_flags */ -+#include /* cli, sli, save_flags */ - #include /* ioremap, virt_to_phys */ - #include /* access_ok */ - #include /* PAGE_OFFSET */ From 982dd693b3bebf8e0a8b778671cdb7a4bf521fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 14 Jan 2013 00:40:23 +0100 Subject: [PATCH 113/302] Adding ffmpeg 1.1 Moving packages using 1.0 to using 1.1. Vlc built fine here. --- pkgs/development/libraries/ffmpeg/1.1.nix | 85 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++- 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/ffmpeg/1.1.nix diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix new file mode 100644 index 00000000000..6651f1783f8 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, vdpauSupport ? true, libvdpau ? null +, faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null +, x11grabSupport ? false, libXext ? null, libXfixes ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert vdpauSupport -> libvdpau != null; +assert faacSupport -> faac != null; +assert x11grabSupport -> libXext != null && libXfixes != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-1.1"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; + + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394 + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; + + enableParallelBuilding = true; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44c92f09142..1618dd7e709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -545,7 +545,7 @@ let cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex; - ffmpeg = ffmpeg_1_0; + ffmpeg = ffmpeg_1_1; }; checkinstall = callPackage ../tools/package-management/checkinstall { }; @@ -3612,6 +3612,10 @@ let vpxSupport = !stdenv.isMips; }; + ffmpeg_1_1 = callPackage ../development/libraries/ffmpeg/1.1.nix { + vpxSupport = !stdenv.isMips; + }; + fftw = callPackage ../development/libraries/fftw { singlePrecision = false; }; @@ -8002,7 +8006,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_1_0; + ffmpeg = ffmpeg_1_1; }; vnstat = callPackage ../applications/networking/vnstat { }; From c17fa1ebf23ad1485ce5882d8ffe338b1e2b1f05 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 14 Jan 2013 10:10:06 +0200 Subject: [PATCH 114/302] Quassel: version bump to 0.7.4 --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 8dcde90e538..16aaf3d9f3b 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -11,11 +11,11 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.7.1"; + name = "quassel-0.7.4"; src = fetchurl { url = "http://quassel-irc.org/pub/${name}.tar.bz2"; - sha256 = "1kby1yikiv5bpzkdri5dq39pxnsj9gjrcv1gigvy2jzy3g99qjli"; + sha256 = "08f4m35bkmp9p1n560a3fg711s9izb25ddx2az03xzf1jl8qdrg7"; }; buildInputs = [ cmake qt4 ] From 4f8314fb92ee57cda5103ba961d8dc9c963ffad4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 11:21:12 +0100 Subject: [PATCH 115/302] chromium: Update dev channel to 25.0.1364.29. For this update we needed to fix a bunch of things: * Limit pulse_audio_fix.patch to version 24 only (fixed upstream in 25). * Avoid the use of -fstack-protector for version 25. The -fstack-protector option seems to be passed to libvpx now by default, so simply use -fno-stack-protector in every occurence of -fstack-protector in common.gypi. At least for now this will do it, but ultimately and for the future we may want to have support for that in general. And if we need that support in chromium directly depends on some of the next updates to this package, as it seems that we now can switch to quite a lot of nixpkgs dependencies instead of bundled dependencies. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 62a4c6cc211..e32b31dc856 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -78,8 +78,9 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; + only24 = post23 && !post24; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + maybeFixPulseAudioBuild = optional (only24 && pulseSupport) ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { @@ -120,6 +121,8 @@ in stdenv.mkDerivation rec { postPatch = optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString post24 '' + sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 7b252da6824..c7352efc002 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "25.0.1323.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2"; - sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s"; + version = "25.0.1364.29"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2"; + sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; }; beta = { version = "24.0.1312.35"; From 72b248b932ca87595f400966af34ece8001d5aba Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 11:28:45 +0100 Subject: [PATCH 116/302] chromium: Update stable and beta to v24.0.1312.52. The current beta version of chromium just became stable, which means that we are now exactly in par with the beta channel. Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index c7352efc002..b274527dfba 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; }; beta = { - version = "24.0.1312.35"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.35.tar.bz2"; - sha256 = "0mb6xz5lrnzjk1zqr83jyprsxv20svy3a7lyxv9iwdb2bh1i13ci"; + version = "24.0.1312.52"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; + sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; }; stable = { - version = "23.0.1271.97"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2"; - sha256 = "1qf21n6msj1jmxhnlw8fapsz7q6dd851rxdqv4334v06ny4i5fip"; + version = "24.0.1312.52"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; + sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; }; } From 29aa4af7961ff3dd49c84f30242ff7f67cea5543 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 9 Jan 2013 22:43:48 +0100 Subject: [PATCH 117/302] tkabber: Add ${tk}/bin to wrapper's PATH. Pesky little impurity is now fixed, as it has bitten me several times in the last days. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 03a98cb2059..fd989739c94 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tkabber \ + --prefix PATH : "${tk}/bin" \ --set TCLLIBPATH '"${tclLibPaths}"' \ --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins' ''; From e2521650b4ad8200260ca7c51ad2a38d40ca2baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Jan 2013 11:34:19 +0100 Subject: [PATCH 118/302] Update acpi, fix homepage, download from sourceforge. --- pkgs/os-specific/linux/acpi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 84ee4486807..42119208f12 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "acpi-1.5"; - + name = "acpi-${version}"; + version = "1.6"; + src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/a/acpi/acpi_1.5.orig.tar.gz"; - sha256 = "1pb020j627ldjm1askqfzp6cjxrs79ail8svihanv7pgbg5r3zsp"; + url = "mirror://sf/acpiclient/${version}/${name}.tar.gz"; + sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; }; meta = { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = http://grahame.angrygoats.net/acpi.shtml; + homepage = http://sourceforge.net/projects/acpiclient/; license = "GPLv2+"; }; } From 7fd42a83806404c5a8c6f6eadaad9f6f910d187f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 12:00:32 +0100 Subject: [PATCH 119/302] Get rid of the "sf" alias for "sourceforge" --- pkgs/applications/editors/jedit/default.nix | 2 +- pkgs/applications/misc/semnotes/default.nix | 2 +- pkgs/build-support/fetchurl/mirrors.nix | 2 -- pkgs/data/fonts/libertine/default.nix | 2 +- pkgs/development/libraries/clucene-core/default.nix | 2 +- pkgs/development/libraries/cppunit/default.nix | 2 +- pkgs/development/libraries/hunspell/default.nix | 2 +- pkgs/development/libraries/indilib/default.nix | 2 +- pkgs/development/libraries/libnova/default.nix | 2 +- pkgs/development/libraries/libqalculate/default.nix | 2 +- pkgs/development/libraries/libxklavier/default.nix | 2 +- pkgs/development/libraries/qimageblitz/default.nix | 2 +- pkgs/development/libraries/qjson/default.nix | 2 +- pkgs/development/libraries/science/math/atlas/default.nix | 2 +- pkgs/games/uqm/default.nix | 8 ++++---- pkgs/os-specific/linux/acpi/default.nix | 2 +- pkgs/servers/mail/freepops/default.nix | 2 +- pkgs/tools/misc/ised/default.nix | 2 +- 18 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 194f13a090c..efaf719c7c4 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jedit-4.4.2"; src = fetchurl { - url = mirror://sf/jedit/jedit4.4.2source.tar.bz2; + url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2; sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb"; }; diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix index fbc4df3a0b7..52a575130c0 100644 --- a/pkgs/applications/misc/semnotes/default.nix +++ b/pkgs/applications/misc/semnotes/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "semnotes-0.4.0-1"; src = fetchurl { - url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2"; + url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2"; sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m"; }; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 22b808b71aa..98dd7d8fb8e 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -20,8 +20,6 @@ rec { http://kent.dl.sourceforge.net/sourceforge/ ]; - sf = sourceforge; - # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 514690cb0cd..b8c0db222d5 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -2,7 +2,7 @@ args: with args; rec { name = "linux-libertine-5.3.0"; src = fetchurl { - url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index d180c4761e8..abd6712736f 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "clucene-core-0.9.21b"; src = fetchurl { - url = "mirror://sf/clucene/${name}.tar.bz2"; + url = "mirror://sourceforge/clucene/${name}.tar.bz2"; sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317"; }; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index dbbcf4388c5..2504f87a230 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cppunit-1.12.0"; src = fetchurl { - url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; + url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz; sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; }; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index c5243bc6393..04be58eb50a 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hunspell-1.3.2"; src = fetchurl { - url = "mirror://sf/hunspell/${name}.tar.gz"; + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl"; }; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 9fc5ac665e8..31cbe772916 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "indilib-0.8"; src = fetchurl { - url = mirror://sf/indi/libindi_0.8.tar.gz; + url = mirror://sourceforge/indi/libindi_0.8.tar.gz; sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65"; }; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index e24a93c1043..28decb9cfca 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnova-0.12.1"; src = fetchurl { - url = "mirror://sf/libnova/${name}.tar.gz"; + url = "mirror://sourceforge/libnova/${name}.tar.gz"; sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 9c75bd51db1..bf1a1e232bb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libqalculate-0.9.7"; src = fetchurl { - url = "mirror://sf/qalculate/${name}.tar.gz"; + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs"; }; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 419f9a497c0..b50399d4f10 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libxklavier-5.0"; src = fetchurl { - url = "mirror://sf/gswitchit/${name}.tar.bz2"; + url = "mirror://sourceforge/gswitchit/${name}.tar.bz2"; sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz"; }; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 4aac06a5101..5800b562e6b 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index a4b146ff424..af960c1b993 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qjson-0.7.1"; src = fetchurl { - url = "mirror://sf/qjson/${name}.tar.bz2"; + url = "mirror://sourceforge/qjson/${name}.tar.bz2"; sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv"; }; diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 2cca8d7d9c4..75f9de5e96a 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "atlas-3.9.67"; src = fetchurl { - url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2; + url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2; sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; }; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 6e67ce660f1..a9fe9d596c7 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -8,22 +8,22 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-source.tgz"; + url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz"; sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221"; }; content = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-content.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm"; sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf"; }; voice = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-voice.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm"; sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979"; }; music = fetchurl { - url = "mirror://sf/sc2/uqm-${version}-3domusic.uqm"; + url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm"; sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82"; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index 42119208f12..6bb44d7db44 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6"; src = fetchurl { - url = "mirror://sf/acpiclient/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz"; sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd"; }; diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index d5866029762..c80d0f04bda 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freepops-0.2.9"; src = fetchurl { - url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz; + url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; buildInputs = [pkgconfig openssl lua5 curl readline bison expat]; diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index f5f9112639c..0a04886f64c 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -12,7 +12,7 @@ let baseName="ised"; version="2.2.2"; name="${baseName}-${version}"; - url="mirror://sf/project/ised/${name}.tar.bz2"; + url="mirror://sourceforge/project/ised/${name}.tar.bz2"; hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn"; }; in From 479b58d706017a56c39acda94e4b868511c9b39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Jan 2013 12:20:34 +0100 Subject: [PATCH 120/302] Update vlc (minor bugfix). --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3341a01101c..7d04a02f27f 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1dixankckfxf8xixfc32rc9mfsv6mx2lk5h13ym8bp4dsk86w1jf"; + sha256 = "0vkbv477a7z0v55sigz6c3abxljz7jyysp7z8s29zk8vhq0fpyfz"; }; buildInputs = From 58e9406f4b834468dbf320754edf12994affc27c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 13:08:09 +0100 Subject: [PATCH 121/302] subversion: Update to 1.7.8 --- pkgs/applications/version-management/subversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 8e454ad9f8f..885e4310a59 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.7"; + version = "1.7.8"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "c9fc0c5992eda36ba9affd93a15929e25958a951"; + sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2"; }; buildInputs = [ zlib apr aprutil sqlite ] From f59881fc30d3e72d72f6f2e9e3688226bea0d2e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 13:10:16 +0100 Subject: [PATCH 122/302] mplayer: Change directory name / attribute name from MPlayer to mplayer --- .../browsers/mozilla-plugins/gecko-mediaplayer/default.nix | 4 ++-- pkgs/applications/video/{MPlayer => mplayer}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/video/{MPlayer => mplayer}/default.nix (100%) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 0ff7c92d3d8..44f191e54f1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 -, GConf, gnome_mplayer, MPlayer, gmtk +, GConf, gnome_mplayer, mplayer, gmtk }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # browser's $PATH. postInstall = '' - echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path + echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; passthru.mozillaPlugin = "/lib/mozilla/plugins"; diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/mplayer/default.nix similarity index 100% rename from pkgs/applications/video/MPlayer/default.nix rename to pkgs/applications/video/mplayer/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1618dd7e709..f5b7409a015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7543,7 +7543,7 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; - MPlayer = callPackage ../applications/video/MPlayer { + mplayer = callPackage ../applications/video/mplayer { pulseSupport = config.pulseaudio or false; }; From 8497455143be03322259219f5257de7dd230aa6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 14:38:00 +0100 Subject: [PATCH 123/302] apr-util: Update to 1.5.1 --- pkgs/development/libraries/apr-util/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ad02f9b84cc..5f6291127e9 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.4.1"; + name = "apr-util-1.5.1"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "52b31b33fb1aa16e65ddaefc76e41151"; + md5 = "9c1db8606e520f201c451ec9a0b095f6"; }; configureFlags = '' @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; + enableParallelBuilding = true; + passthru = { inherit sslSupport bdbSupport ldapSupport; }; From f286cc65b111df56c5df23af09dbd2d8eb598ccc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 18:26:46 +0100 Subject: [PATCH 124/302] Fix bad URLs lacking a scheme --- pkgs/applications/graphics/gocr/default.nix | 2 +- pkgs/applications/science/logic/iprover/default.nix | 2 +- pkgs/applications/science/logic/opensmt/default.nix | 2 +- pkgs/os-specific/linux/pmtools/default.nix | 4 ++-- pkgs/tools/graphics/mscgen/default.nix | 6 +++--- pkgs/tools/system/hardlink/default.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 0e8f860c510..0f42ac7743e 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.49"; src = fetchurl { - url = "www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"; + url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; }; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 91d8c122a8d..2acc0ac8d89 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -13,7 +13,7 @@ let baseName="iprover"; version="0.8.1"; name="${baseName}_v${version}"; - url="${baseName}.googlecode.com/files/${name}.tar.gz"; + url="http://${baseName}.googlecode.com/files/${name}.tar.gz"; hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; }; in diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 165c8a2f148..430537fd57f 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -15,7 +15,7 @@ let version="20101017"; name="${baseName}-${version}"; filename="${baseName}_src_${version}"; - url="${baseName}.googlecode.com/files/${filename}.tgz"; + url="http://${baseName}.googlecode.com/files/${filename}.tgz"; hash="0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1"; }; in diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 1cb2220a3bd..13a6e87319e 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pmtools-20071116"; src = fetchurl { - url = "www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; + url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.lesswatts.org/projects/acpi/utilities.php"; + homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; license = "GPLv2"; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 63e6afaa803..ed69327b752 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "mscgen-${version}"; src = fetchurl { - url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; + url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz"; sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; @@ -19,8 +19,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://www.mcternan.me.uk/mscgen/"; - description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; + homepage = http://www.mcternan.me.uk/mscgen/; + description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = "GPLv2"; longDescription = '' diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 192f7d871a1..982aac3c990 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "hardlink-2012.9.${rev}"; src = fetchurl { - url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; + url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; name = "hardlink-${rev}.zip"; }; From bb6db816fe915a589155b45978b4a5a067945b46 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 23:08:27 +0100 Subject: [PATCH 125/302] mplayer: Disable use of unfree binary codecs by default --- pkgs/applications/video/mplayer/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 944af1c2657..357c6eec6e7 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -18,6 +18,7 @@ , pulseSupport ? false, pulseaudio ? null # For screenshots , libpngSupport ? true, libpng ? null +, useUnfreeCodecs ? false }: assert x11Support -> (libX11 != null && libXext != null && mesa != null); @@ -66,9 +67,7 @@ let cp -prv * $out ''; - meta = { - license = "unfree"; - }; + meta.license = "unfree"; } else null; in @@ -140,8 +139,7 @@ stdenv.mkDerivation rec { ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} - - ${optionalString (codecs != null) "--codecsdir=${codecs}"} + ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} --enable-freetype --disable-xanim @@ -154,6 +152,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + enableParallelBuilding = true; + # Provide a reasonable standard font. Maybe we should symlink here. postInstall = '' From 0731cd042cba0a3176e52f5c0453e79a70338009 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 Jan 2013 23:28:18 +0100 Subject: [PATCH 126/302] eval-release.nix: Handle exceptions properly --- maintainers/scripts/eval-release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 7af2b5b5bd9..ccbe064ee32 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -5,7 +5,7 @@ with import ../../pkgs/lib; let - trace = if (builtins.getEnv "VERBOSE") == "1" then builtins.trace else (x: y: y); + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix) [ "tarball" "xbursttools" ]; @@ -13,7 +13,7 @@ let strictAttrs = as: seqList (attrValues as) as; - maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" null; + maybe = as: let y = builtins.tryEval (strictAttrs as); in if y.success then y.value else builtins.trace "FAIL" {}; call = attrs: flip mapAttrs attrs (n: v: trace n ( From be989567c88600b7f9af16496485a17ea6c965d0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 07:13:30 +0200 Subject: [PATCH 127/302] Torsocks is not compatible with certain apps like Kopete. Will integrate both in NixOS. Revert "removing tsocks as it has been replaced by torsocks." This reverts commit f947527f184446572ad3e36c4423b23e797aeb5a. --- pkgs/development/libraries/tsocks/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/tsocks/default.nix diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix new file mode 100644 index 00000000000..a0d607517ac --- /dev/null +++ b/pkgs/development/libraries/tsocks/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "tsocks-${version}"; + version = "1.8beta5"; + + src = fetchurl { + url = "mirror://sourceforge/tsocks/${name}.tar.gz"; + sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; + }; + + preConfigure = '' + export configureFlags="$configureFlags --libdir=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Transparent SOCKS v4 proxying library"; + homepage = http://tsocks.sourceforge.net/; + license = "GPLv2"; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b7409a015..f7e84af2332 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5033,6 +5033,8 @@ let unicap = callPackage ../development/libraries/unicap {}; + tsocks = callPackage ../development/libraries/tsocks { }; + unixODBC = callPackage ../development/libraries/unixODBC { }; unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers { From 5dcdcf4af38bda591f8b11926cbe50b11fd4c855 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 07:42:35 +0200 Subject: [PATCH 128/302] Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now. --- pkgs/misc/emulators/wine/wine-warcraft.nix | 49 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 51 deletions(-) delete mode 100644 pkgs/misc/emulators/wine/wine-warcraft.nix diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix deleted file mode 100644 index 3573c0ba4fe..00000000000 --- a/pkgs/misc/emulators/wine/wine-warcraft.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib -, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls -}: - -assert stdenv.isLinux; -assert stdenv.gcc.gcc != null; - -stdenv.mkDerivation rec { - name = "wine-warcraft-${version}"; - version = "1.1.19"; - - src = fetchgit { - url = git://repo.or.cz/wine/warcraft3.git; - rev = "38faaffd99331b71284d8da5f76f38625107ed6d"; - }; - - buildInputs = [ - xlibs.xlibs flex bison xlibs.libXi mesa - xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr - xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite - xlibs.xf86vidmodeproto - alsaLib ncurses libpng libjpeg lcms fontforge - libxml2 libxslt openssl gnutls - ]; - - # Wine locates a lot of libraries dynamically through dlopen(). Add - # them to the RPATH so that the user doesn't have to set them in - # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm - xlibs.libXinerama xlibs.libXrender xlibs.libXrandr - xlibs.libXcursor xlibs.libXcomposite xlibs.libXxf86vm - xlibs.xf86vidmodeproto - openssl gnutls - ]; - - # Don't shrink the ELF RPATHs in order to keep the extra RPATH - # elements specified above. - dontPatchELF = true; - - meta = with stdenv.lib; { - homepage = "http://www.winehq.org/"; - license = "LGPL"; - description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3"; - maintainers = [ maintainers.phreedom ]; - platforms = [ "i686-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7e84af2332..64119eda2aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9157,8 +9157,6 @@ let # Wine cannot be built in 64-bit; use a 32-bit build instead. wine = callPackage_i686 ../misc/emulators/wine { }; - wineWarcraft = callPackage_i686 ../misc/emulators/wine/wine-warcraft.nix { }; - x2x = callPackage ../tools/X11/x2x { }; xosd = callPackage ../misc/xosd { }; From 76d8b3a530c3116b21afd25c24fec16983bf94cf Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 15 Jan 2013 08:13:56 +0200 Subject: [PATCH 129/302] torsocks: version bump to 1.2 --- pkgs/tools/security/tor/torsocks.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 83cfee07e66..ac60ccb16a1 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "torsocks"; name = "${pname}-${version}"; - version = "1.0-epsilon"; + version = "1.2"; src = fetchurl { url = "http://${pname}.googlecode.com/files/${name}.tar.gz"; - sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5"; + sha256 = "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy"; }; preConfigure = '' From ee19b41203a75aabaafa8093f3b6ef487a9febc8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 11:18:42 +0100 Subject: [PATCH 130/302] Update the tarball mirroring scripts --- maintainers/scripts/copy-tarball.sh | 10 +++++----- maintainers/scripts/copy-tarballs.sh | 14 +++++++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/copy-tarball.sh b/maintainers/scripts/copy-tarball.sh index b4c2e93dab1..de325120efc 100755 --- a/maintainers/scripts/copy-tarball.sh +++ b/maintainers/scripts/copy-tarball.sh @@ -10,25 +10,25 @@ base="$(basename "$url")" if [ -z "$base" ]; then echo "bad URL"; exit 1; fi dstPath="$distDir/$base" -if [ -e "$dstPath" ]; then echo "$dstPath already exists"; exit 0; fi +if [ -e "$dstPath" ]; then if [ -n "$VERBOSE" ]; then echo "$dstPath already exists"; fi; exit 0; fi if [ -z "$file" ]; then echo "downloading $url to $dstPath" - if [ -n "$dryRun" ]; then exit 0; fi + if [ -n "$DRY_RUN" ]; then exit 0; fi declare -a res if ! res=($(PRINT_PATH=1 nix-prefetch-url "$url")); then - continue + exit fi - + storePath=${res[1]} else storePath="$file" fi - + cp $storePath "$dstPath.tmp.$$" mv -f "$dstPath.tmp.$$" "$dstPath" diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh index 80aeef9d66d..b25326d1af3 100755 --- a/maintainers/scripts/copy-tarballs.sh +++ b/maintainers/scripts/copy-tarballs.sh @@ -8,7 +8,19 @@ urls=$(nix-instantiate --eval-only --xml --strict ' Date: Tue, 15 Jan 2013 15:03:38 +0100 Subject: [PATCH 131/302] source-tarball.nix: try src.revCount when src.rev is not available. --- pkgs/build-support/release/source-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 85d0b29f5b7..887bfb3125c 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -9,7 +9,7 @@ , versionSuffix ? if officialRelease then "" - else if src ? rev then "pre${toString src.rev}" else "" + else "pre${toString (src.rev or src.revCount or "")}" , src, stdenv, autoconf, automake, libtool , ... } @ args: From bfa0495344d4236edc51ca3e3d065e6d7c98d5ca Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 17:52:53 +0100 Subject: [PATCH 132/302] remove old inactive pth file creation for buildInputs --- pkgs/development/python-modules/generic/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index c7157110758..8a70741c36b 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -90,8 +90,6 @@ python.stdenv.mkDerivation (attrs // { '' wrapPythonPrograms - # these should already be in $name.pth - #createBuildInputsPth build-inputs "$buildInputStrings" for inputsfile in propagated-build-inputs propagated-build-native-inputs; do if test -e $out/nix-support/$inputsfile; then createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" From f615e304bb3b6d7f1126bdfe4acc90f0eb2b0591 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:14:57 +0100 Subject: [PATCH 133/302] Handle more bad characters --- maintainers/scripts/copy-tarballs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/copy-tarballs.sh b/maintainers/scripts/copy-tarballs.sh index b25326d1af3..a261f817585 100755 --- a/maintainers/scripts/copy-tarballs.sh +++ b/maintainers/scripts/copy-tarballs.sh @@ -18,7 +18,7 @@ for url in $urls; do if ! echo "$base" | grep -q -E "[a-zA-Z]"; then echo "skipping $url (no letter in name)"; continue; fi if ! echo "$base" | grep -q -E "[0-9]"; then echo "skipping $url (no digit in name)"; continue; fi if ! echo "$base" | grep -q -E "[-_\.]"; then echo "skipping $url (no dot/underscore in name)"; continue; fi - if echo "$base" | grep -q -E "[&?=]"; then echo "skipping $url (bad character in name)"; continue; fi + if echo "$base" | grep -q -E "[&?=%]"; then echo "skipping $url (bad character in name)"; continue; fi if [ "${base:0:1}" = "." ]; then echo "skipping $url (starts with a dot)"; continue; fi $(dirname $0)/copy-tarball.sh "$url" From f5df5847bd7c4cfe4b16af4efdb0257210fb8d44 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 18:29:42 +0100 Subject: [PATCH 134/302] add comment --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdd27b4628c..3bb41a94bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5291,6 +5291,10 @@ let pythonPackages = python27Packages; + # `nix-env -i python-nose` installs for 2.7, the default python. + # Therefore we do not recurse into attributes here, in contrast to + # python27Packages. `nix-env -iA python26Packages.nose` works + # regardless. python26Packages = import ./python-packages.nix { inherit pkgs; python = python26; From 4c9cfd87aad71540bb68b553bd16ef605cd2c824 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:39:25 +0100 Subject: [PATCH 135/302] bazaar: Update to 2.5.1 --- pkgs/applications/version-management/bazaar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 856320f0168..1eb114ecd8c 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "2.3"; + version = "2.5"; release = ".1"; name = "bazaar-${version}${release}"; src = fetchurl { url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; - sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53"; + sha256 = "10krjbzia2avn09p0cdlbx2wya0r5v11w5ymvyl72af5dkx4cwwn"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; From 45b0bcbc69994d237f734356117f6ee24e87b2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:42:29 +0100 Subject: [PATCH 136/302] v86d: Fix URL --- pkgs/os-specific/linux/v86d/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index aedfe9ac686..f0f7fcbb9ce 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-0.1.10-${kernel.version}"; + name = "v86d-${version}-${kernel.version}"; + version = "0.1.10"; src = fetchurl { - url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; + url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2"; sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3"; }; From a6768a8df215bea572832d7c8778dd4d1672a735 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 16:46:30 +0100 Subject: [PATCH 137/302] logrotate: Update to 3.8.3 --- pkgs/tools/system/logrotate/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index a9994f14b57..784c8e75e76 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, gzip, popt}: +{ stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.7.8"; + name = "logrotate-3.8.3"; src = fetchurl { - url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz; - sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1"; + url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; + sha256 = "0xqrz8xzs2c1vx8l5h9lp2ciwwifj7y52xsppb1vrvbi254vyxh7"; }; # Logrotate wants to access the 'mail' program; to be done. @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; meta = { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.all; }; } From 634aa5020d3f62f1bb2dda929cabb6865c27578b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:43:53 +0100 Subject: [PATCH 138/302] module-init-tools: Fix URL --- pkgs/os-specific/linux/module-init-tools/default.nix | 2 +- pkgs/os-specific/linux/powertop/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 077d08f899d..240150b09dd 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = [ (fetchurl { - url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2; sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1"; }) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 68075d115a4..2fb852acc31 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -2,6 +2,7 @@ stdenv.mkDerivation rec { name = "powertop-2.1"; + src = fetchurl { url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; From 7cf37131879eeee67e8a6c0f9511ed5b1abc3202 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:45:39 +0100 Subject: [PATCH 139/302] cpufrequtils: Fix URL --- pkgs/os-specific/linux/cpufrequtils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 35bf57c269e..e9e0a36f156 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "cpufrequtils-008"; src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz"; + url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz; md5 = "52d3e09e47ffef634833f7fab168eccf"; }; From 4bca4fa2b81a7ce6427ab01c6c4f89d6962c4adf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:47:21 +0100 Subject: [PATCH 140/302] reiserfsprogs: Fix URL --- pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2283a0c1746..2c14bc624ae 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "reiserfsprogs-3.6.21"; src = fetchurl { - url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2"; + url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2"; sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam"; }; From 1d174fb9740732e425d1b5698fbe4d46802fcf6f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 18:48:54 +0100 Subject: [PATCH 141/302] linux-pam: Fix URL --- pkgs/os-specific/linux/pam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index c18ea2b1f2b..7da03cf9cad 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "linux-pam-1.1.1"; src = fetchurl { - url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2; + url = http://www.linux-pam.org/library/Linux-PAM-1.1.1.tar.bz2; sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0"; }; From c7701c0786e1afda3f8dd94661e12801cb0677a2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 19:04:41 +0100 Subject: [PATCH 142/302] python-pyquery-1.2.4 and dep python-cssselect-0.7.1 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c247f858b5a..e2f75b5ce63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -486,6 +486,16 @@ let pythonPackages = python.modules // rec { }; }; + cssselect = buildPythonPackage rec { + name = "cssselect-0.7.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; + md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; + }; + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + }; + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; @@ -2199,6 +2209,16 @@ let pythonPackages = python.modules // rec { }; + pyquery = buildPythonPackage rec { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + buildInputs = [ cssselect lxml ]; + }; + + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From d3e54e01258cbb1d7b50ff9f1b424c7b14a4ab22 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 15 Jan 2013 19:04:41 +0100 Subject: [PATCH 143/302] python-pyquery-1.2.4 and dep python-cssselect-0.7.1 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41b545a6862..5437ef1e65c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -458,6 +458,16 @@ let pythonPackages = python.modules // rec { }; }; + cssselect = buildPythonPackage rec { + name = "cssselect-0.7.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cssselect/cssselect-0.7.1.tar.gz"; + md5 = "c6c5e9a2e7ca226ce03f6f67a771379c"; + }; + # AttributeError: 'module' object has no attribute 'tests' + doCheck = false; + }; + cssutils = buildPythonPackage (rec { name = "cssutils-0.9.9"; @@ -2171,6 +2181,16 @@ let pythonPackages = python.modules // rec { }; + pyquery = buildPythonPackage rec { + name = "pyquery-1.2.4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.4.tar.gz"; + md5 = "268f08258738d21bc1920d7522f2a63b"; + }; + buildInputs = [ cssselect lxml ]; + }; + + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; From 4b10fcf1ec2e500bf881e08745c3e113b8de96c8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Jan 2013 18:09:09 -0500 Subject: [PATCH 144/302] Add Google::ProtocolBuffers perlPackage --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b085dfe49bb..1f6130cabb5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1774,6 +1774,15 @@ rec { propagatedBuildInputs = [ ParamsValidate SubExporter ]; }; + GoogleProtocolBuffers = buildPerlPackage rec { + name = "Google-ProtocolBuffers-0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GARIEV/${name}.tar.gz"; + sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3"; + }; + propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; + }; + Graph = buildPerlPackage rec { name = "Graph-0.94"; src = fetchurl { From 1775b99112263c56a60241fd8ba78b16d5cbd5c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:22:46 +0100 Subject: [PATCH 145/302] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb41a94bd6..24f4e4e9ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -419,9 +419,9 @@ let inherit pkgs; pkgs_i686 = pkgsi686Linux; }; - + xcodeenv = callPackage ../development/mobile/xcodeenv { }; - + titaniumenv = import ../development/mobile/titaniumenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; From 6abb59cbac478a37d551568a474036c738049278 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 11:52:00 +0100 Subject: [PATCH 146/302] haskell-hashable: update 1.2.x branch to 1.2.0.5 --- .../libraries/haskell/hashable/{1.2.0.3.nix => 1.2.0.5.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/hashable/{1.2.0.3.nix => 1.2.0.5.nix} (81%) diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix similarity index 81% rename from pkgs/development/libraries/haskell/hashable/1.2.0.3.nix rename to pkgs/development/libraries/haskell/hashable/1.2.0.5.nix index 43d99b63d5a..0547fd67b1f 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.3"; - sha256 = "0q4zl2mry6qfp9vln6pxmgqik7szv1sh7if55gydnxln1ybvvgmp"; + version = "1.2.0.5"; + sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f2db83c194..595cdeb975f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -913,7 +913,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_3 = callPackage ../development/libraries/haskell/hashable/1.2.0.3.nix {}; + hashable_1_2_0_5 = callPackage ../development/libraries/haskell/hashable/1.2.0.5.nix {}; hashable = self.hashable_1_1_2_5; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; From bbb3726fadf1e86b8133f8d2c78e5f6446b1b4ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:30:55 +0100 Subject: [PATCH 147/302] haskell-cipher-rc4: add version 0.1.2 --- .../libraries/haskell/cipher-rc4/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cipher-rc4/default.nix diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix new file mode 100644 index 00000000000..234491cde36 --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-rc4"; + version = "0.1.2"; + sha256 = "0nyrqms7h3hq236h03sjjjqdcxn3iz3fg4ifqj43f4nb8gv0ifb1"; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-rc4"; + description = "Fast RC4 cipher implementation"; + 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 595cdeb975f..52eb6b3a99d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -582,6 +582,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + cipherRc4 = callPackage ../development/libraries/haskell/cipher-rc4 {}; + classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; From 8971eb297ae8847ce062026046ff8fb20aa2d17c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:31:04 +0100 Subject: [PATCH 148/302] haskell-crypto-numbers: add version 0.1.3 --- .../libraries/haskell/crypto-numbers/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-numbers/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix new file mode 100644 index 00000000000..70cd3f44252 --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -0,0 +1,14 @@ +{ cabal, cryptoRandomApi, vector }: + +cabal.mkDerivation (self: { + pname = "crypto-numbers"; + version = "0.1.3"; + sha256 = "115lgnay3ly5r53flh3v5jygqks0rg1i8qmbvrqf9nkmnmw6a5x1"; + buildDepends = [ cryptoRandomApi vector ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-numbers"; + description = "Cryptographic numbers: functions and algorithms"; + 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 52eb6b3a99d..155bee325c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -636,6 +636,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptohash = callPackage ../development/libraries/haskell/cryptohash {}; + cryptoNumbers = callPackage ../development/libraries/haskell/crypto-numbers {}; + cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; From eb038185dea917faa890ad455b409e7dc6cb5a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:31:12 +0100 Subject: [PATCH 149/302] haskell-crypto-pubkey: add version 0.1.2 --- .../haskell/crypto-pubkey/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/crypto-pubkey/default.nix diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix new file mode 100644 index 00000000000..dc6d83a765d --- /dev/null +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -0,0 +1,18 @@ +{ cabal, cryptohash, cryptoNumbers, cryptoPubkeyTypes +, cryptoRandomApi +}: + +cabal.mkDerivation (self: { + pname = "crypto-pubkey"; + version = "0.1.2"; + sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5"; + buildDepends = [ + cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi + ]; + meta = { + homepage = "http://github.com/vincenthz/hs-crypto-pubkey"; + description = "Public Key cryptography"; + 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 155bee325c7..0b1f8f80d76 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -640,6 +640,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoPubkeyTypes = callPackage ../development/libraries/haskell/crypto-pubkey-types {}; + cryptoPubkey = callPackage ../development/libraries/haskell/crypto-pubkey {}; + cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; cuda = callPackage ../development/libraries/haskell/cuda { From 553dcff84dcdecae3164649bbf7a1d207427a5f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:12 +0100 Subject: [PATCH 150/302] haskell-clientsession: update to version 0.8.1 --- .../libraries/haskell/clientsession/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 82c735b731f..81ae5ebddb0 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,14 +1,14 @@ -{ cabal, base64Bytestring, cereal, cprngAes, cryptoApi -, cryptocipher, entropy, skein, tagged +{ cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi +, entropy, skein, tagged }: cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.8.0.2"; - sha256 = "189v030g23lvky4vccdaw3p0p6drn26zly80a8n9bbn7b8kbfh4r"; + version = "0.8.1"; + sha256 = "1x4qfm4hkvm3xmn7hnvcx1j900g97qhks66xzik1wvsjy3piwpgd"; buildDepends = [ - base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy - skein tagged + base64Bytestring cereal cipherAes cprngAes cryptoApi entropy skein + tagged ]; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; From f5a15bfffc4a959a6d69cb4927902d31cfebafc9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:12 +0100 Subject: [PATCH 151/302] haskell-crypto-conduit: update to version 0.4.3 --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 9d7ad082530..d22bfa840e7 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.2"; - sha256 = "0kg99kvpm5h8v28sylrp9z868ksz5737377akqy09y90xzb8pak3"; + version = "0.4.3"; + sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; From 1026de58a1f97b789d5e518fe7aef3daea7c49f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 152/302] haskell-cryptocipher: update to version 0.4.0 --- .../libraries/haskell/cryptocipher/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 89b098173ec..275622d3cad 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,19 +1,20 @@ -{ cabal, cereal, cpu, cryptoApi, cryptoPubkeyTypes, primitive -, tagged, vector +{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi +, cryptoPubkeyTypes, primitive, tagged, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.3.7"; - sha256 = "14qhi3969q1h9n85flb7wwsr50gdn63q7pmcpm2npy5vkp34lkp5"; + version = "0.4.0"; + sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cpu cryptoApi cryptoPubkeyTypes primitive tagged vector + cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes + primitive tagged vector ]; meta = { homepage = "http://github.com/vincenthz/hs-cryptocipher"; - description = "Symmetrical Block, Stream and PubKey Ciphers"; + description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 8ff6dd943b7d44f0bcfccd9ab94081adddf7b661 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 153/302] haskell-hakyll: update to version 3.5.3.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 50ff535d874..944246ae234 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.2.1"; - sha256 = "1fp7jak2sfznvg3lfyjqy13m1iq9821mdq6n5qmqz5dh5b960iv4"; + version = "3.5.3.0"; + sha256 = "1r8vz42lxnnxx875jnf0ii9x99g7wz2fmknscxvm40prp2df1z6v"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer From 8ad6adb1275a0ab9964e73d6fd340d346567daa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 154/302] haskell-mime-types: update to version 0.1.0.2 --- pkgs/development/libraries/haskell/mime-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 75eb11e6a12..1bde4861b3a 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mime-types"; - version = "0.1.0.1"; - sha256 = "1a34ckmv8qcyk38jydxwph59zcrhnwaah1h6pzn112kysjqjgcsl"; + version = "0.1.0.2"; + sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; From cce6ae45d60e608529bf4b6430db6fed72d55f25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 155/302] haskell-persistent: update to version 1.1.4 --- 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 a45dbea57ae..83bc9f53951 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.3.2"; - sha256 = "1q8p5nxsf9fjhsyy1lha852f7vssp9mz6l24gg47mgv6y5mm9myv"; + version = "1.1.4"; + sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From fbc40feb39697fc3e4035f0548df7a32751970a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 156/302] haskell-system-fileio: update to version 0.3.11 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 7b1f7d7bcfd..f61dedb7b8c 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.10"; - sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4"; + version = "0.3.11"; + sha256 = "0hnjrzhzbqx9l93c8dnl5b54f72ki584cn3jh8m6z56x2lrs24zb"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From 5897b07a0fd5370f2956f2e4bf3810c4244ca85a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 157/302] haskell-tls-extra: update to version 0.6.0 --- .../libraries/haskell/tls-extra/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index f2017af8f80..5bcce9df16b 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,16 +1,17 @@ -{ cabal, certificate, cipherAes, cryptoApi, cryptocipher -, cryptohash, mtl, network, pem, text, time, tls, vector +{ cabal, certificate, cipherAes, cipherRc4, cryptohash +, cryptoPubkey, cryptoRandomApi, mtl, network, pem, text, time, tls +, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.5.1"; - sha256 = "0a977qy6ig4bhgsl6y5iw0xv52yswmcc2x37ypm1601wikjv38x3"; + version = "0.6.0"; + sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; isLibrary = true; isExecutable = true; buildDepends = [ - certificate cipherAes cryptoApi cryptocipher cryptohash mtl network - pem text time tls vector + certificate cipherAes cipherRc4 cryptohash cryptoPubkey + cryptoRandomApi mtl network pem text time tls vector ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; From b8679af5b08955ef4e60d9810cb3448589d13f6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 158/302] haskell-tls: update to version 1.1.1 --- pkgs/development/libraries/haskell/tls/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index fbd20bebdf1..29b6b11d791 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,17 +1,15 @@ -{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl, network +{ cabal, cereal, certificate, cryptohash, cryptoPubkey +, cryptoRandomApi, mtl, network }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.0.3"; - sha256 = "14wgwz032skkgkxg2lyh8kwg1fkapmlg2jh74czbacvnssc2iidb"; - isLibrary = true; - isExecutable = true; + version = "1.1.1"; + sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; buildDepends = [ - cereal certificate cryptoApi cryptocipher cryptohash mtl network + cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl + network ]; - jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; From 9386ecd23b4480631b15e6f967b492422a94f8b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Jan 2013 12:42:13 +0100 Subject: [PATCH 159/302] haskell-warp: update to version 1.3.7.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index edd1dfd1992..6a36e873ca6 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"; - sha256 = "06648wqiwlcsvd41qdqdbgn1zcq890iq39zsxi24vf4s8q7jnzyf"; + version = "1.3.7.1"; + sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From 33db3fb3bb27acec162413fed64ff9e25c465adf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Jan 2013 16:43:35 +0400 Subject: [PATCH 160/302] Update Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 6 +++--- pkgs/tools/graphics/cuneiform/default.upstream | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/graphics/cuneiform/default.upstream diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 13f7d4b7f6f..fb07e0a04b5 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "1.0" a; + version = "1.1.0"; buildInputs = with a; [ cmake imagemagick patchelf ]; in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2"; - sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e"; + url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; inherit buildInputs; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream new file mode 100644 index 00000000000..70f7857580c --- /dev/null +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -0,0 +1,7 @@ +url https://launchpad.net/cuneiform-linux/+download + +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" +} From f67bc6bbfd97414f7c3f5b488fe1cb9326b4b7d2 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Wed, 16 Jan 2013 11:43:53 +0100 Subject: [PATCH 161/302] Added jbig2enc. --- pkgs/tools/graphics/jbig2enc/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/graphics/jbig2enc/default.nix diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix new file mode 100644 index 00000000000..60704d6300c --- /dev/null +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { + name = "jbig2enc-0.28"; + + src = fetchurl { + url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + }; + + propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bb41a94bd6..b50bd8b3000 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1318,6 +1318,8 @@ let pdfjam = callPackage ../tools/typesetting/pdfjam { }; + jbig2enc = callPackage ../tools/graphics/jbig2enc { }; + pdfread = callPackage ../tools/graphics/pdfread { }; briss = callPackage ../tools/graphics/briss { }; From 729a112f726177a2f663d13d6e5ed7e4fdfe256a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 16 Jan 2013 17:09:08 +0100 Subject: [PATCH 162/302] Implemented iosDistribute flag, that allows someone to build iPhone distribution builds --- .../mobile/titaniumenv/build-app.nix | 41 ++++++++++++++++--- .../mobile/titaniumenv/titaniumsdk.nix | 3 ++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0fd4929bda7..5a06e809c3d 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,7 +1,7 @@ {stdenv, androidsdk, titaniumsdk, xcodewrapper}: { appId, name, src, target, androidPlatformVersions ? [ "8" ] , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; @@ -12,6 +12,8 @@ let platformVersions = androidPlatformVersions; useGoogleAPIs = true; }; + + deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { inherit name src; @@ -30,8 +32,7 @@ stdenv.mkDerivation { "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" else if target == "iphone" then - if release then - '' + if iosDistribute then '' export HOME=/Users/$(whoami) export keychainName=$(basename $out) @@ -51,11 +52,39 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain - security delete-keychain $keychainName + ${deleteKeychain} + '' + else + if release then + '' + export HOME=/Users/$(whoami) + export keychainName=$(basename $out) + + # Create a keychain with the component hash name (should always be unique) + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A + + provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}") + + # Ensure that the requested provisioning profile can be found + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ] + then + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" + fi + + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + + # Remove our generated keychain + + ${deleteKeychain} '' else '' @@ -84,4 +113,6 @@ stdenv.mkDerivation { else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} ''; + + failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index 5e1943b1bdc..d3831a9c2be 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -53,5 +53,8 @@ stdenv.mkDerivation { --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \ --prefix PATH : ${jdk}/bin \ --prefix JAVA_HOME : ${jdk} + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py ''; } From f1054e5051dd7c604655309166d9ca960ee406f3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 16 Jan 2013 13:59:15 -0500 Subject: [PATCH 163/302] Add patch to handle /**/-style comments in Google::ProtocolBuffers Patch thanks to Daniel Zinn --- .../Google-ProtocolBuffers-multiline-comments.patch | 12 ++++++++++++ pkgs/top-level/perl-packages.nix | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch new file mode 100644 index 00000000000..6b634d0d242 --- /dev/null +++ b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch @@ -0,0 +1,12 @@ +diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm +--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400 ++++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500 +@@ -16,7 +16,7 @@ + + my $grammar = <<'END_OF_GRAMMAR'; + +-proto : ++proto : + ## list of top level declarations. + ## Skip empty declarations and ";". + (message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1f6130cabb5..b1a9283fca9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1781,6 +1781,9 @@ rec { sha256 = "0pxfphg671wh56h59pf0zrj7m1cr0yga95hf3w54563pzcw2vqv3"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; + patches = [ + ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch + ]; }; Graph = buildPerlPackage rec { From b85a093b07eb7377f792daeb6a13b32d1e0d6e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 17 Jan 2013 00:18:02 +0100 Subject: [PATCH 164/302] pythonPackages.virtualenv: update to 1.8.4 --- .../virtualenv-change-prefix.patch | 27 ++++++++++--------- pkgs/top-level/python-packages.nix | 4 +-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv-change-prefix.patch index 5093fdbead9..d3e588bd1cd 100644 --- a/pkgs/development/python-modules/virtualenv-change-prefix.patch +++ b/pkgs/development/python-modules/virtualenv-change-prefix.patch @@ -1,29 +1,32 @@ Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`. - ---- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200 -+++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200 -@@ -951,13 +951,7 @@ +--- virtualenv-1.8.4/virtualenv.py 2013-01-16 23:43:37.583615220 +0100 ++++ virtualenv-1.8.4/virtualenv.py 2013-01-16 23:44:47.885973431 +0100 +@@ -1135,17 +1135,7 @@ def change_prefix(filename, dst_prefix): - prefixes = [sys.prefix] - -- if sys.platform == "darwin": +- if is_darwin: - prefixes.extend(( - os.path.join("/Library/Python", sys.version[:3], "site-packages"), - os.path.join(sys.prefix, "Extras", "lib", "python"), -- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"))) +- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"), +- # Python 2.6 no-frameworks +- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"), +- # System Python 2.7 on OSX Mountain Lion +- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages"))) + prefixes = ["/nix/store", sys.prefix] if hasattr(sys, 'real_prefix'): prefixes.append(sys.real_prefix) -@@ -968,6 +962,8 @@ - _, relpath = filename.split(src_prefix, 1) - assert relpath[0] == os.sep - relpath = relpath[1:] -+ if src_prefix == "/nix/store": -+ relpath = "/".join(relpath.split("/")[1:]) +@@ -1162,6 +1152,8 @@ + if src_prefix != os.sep: # sys.prefix == "/" + assert relpath[0] == os.sep + relpath = relpath[1:] ++ if src_prefix == "/nix/store": ++ relpath = "/".join(relpath.split("/")[1:]) return join(dst_prefix, relpath) assert False, "Filename %s does not start with any of these prefixes: %s" % \ (filename, prefixes) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2f75b5ce63..07176ad782e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3076,10 +3076,10 @@ let pythonPackages = python.modules // rec { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.6.4"; + name = "virtualenv-1.8.4"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "1072b66d53c24e019a8f1304ac9d9fc5"; + md5 = "1c7e56a7f895b2e71558f96e365ee7a7"; }; patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; From 4b123fee39dd92a34a5f318abdfbc8d742031931 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 17 Jan 2013 11:21:04 +0400 Subject: [PATCH 165/302] Fix URL for Cuneiform --- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.upstream | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index fb07e0a04b5..3c75af4bcf3 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.tar.bz2"; + url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2"; sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream index 70f7857580c..4fb85a2a1e8 100644 --- a/pkgs/tools/graphics/cuneiform/default.upstream +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -4,4 +4,5 @@ do_overwrite () { ensure_hash set_var_value version "$CURRENT_VERSION" set_var_value sha256 "$CURRENT_HASH" + set_var_value ' url' "$CURRENT_URL" } From 8150827219951e56f336f5bf90770fe4adc7927f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Jan 2013 11:18:32 +0100 Subject: [PATCH 166/302] haskell-network: update 2.4.x branch to version 2.4.1.0 This change affects only GHC 7.6.1. --- .../libraries/haskell/network/{2.4.0.1.nix => 2.4.1.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.4.0.1.nix => 2.4.1.0.nix} (80%) diff --git a/pkgs/development/libraries/haskell/network/2.4.0.1.nix b/pkgs/development/libraries/haskell/network/2.4.1.0.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.4.0.1.nix rename to pkgs/development/libraries/haskell/network/2.4.1.0.nix index e0aa44c38bd..9d5ac3abe78 100644 --- a/pkgs/development/libraries/haskell/network/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.4.0.1"; - sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw"; + version = "2.4.1.0"; + sha256 = "0m44iqlcnpsaa3iqxb4wbx2l1k2ycxzq8v07bwz7br7yyikv16y3"; buildDepends = [ parsec ]; meta = { homepage = "https://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0b1f8f80d76..19df77300b6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -129,7 +129,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP = self.HTTP_4000_2_6; # 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_0_1; # 7.6 ok + network = self.network_2_4_1_0; # 7.6 ok OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok @@ -1266,8 +1266,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {}; - network = self.network_2_4_0_1; + network_2_4_1_0 = callPackage ../development/libraries/haskell/network/2.4.1.0.nix {}; + network = self.network_2_4_1_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; From 3544f3223166583f1e5459822250f1821b258c1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 17 Jan 2013 11:19:09 +0100 Subject: [PATCH 167/302] haskell-hakyll: update to version 4.0.0.0 --- .../libraries/haskell/hakyll/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 944246ae234..9b708eff020 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,16 +1,19 @@ -{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash -, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase -, regexTdfa, snapCore, snapServer, tagsoup, text, time +{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cmdargs +, cryptohash, deepseq, filepath, httpConduit, httpTypes, lrucache +, mtl, pandoc, parsec, random, regexBase, regexTdfa, snapCore +, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.5.3.0"; - sha256 = "1r8vz42lxnnxx875jnf0ii9x99g7wz2fmknscxvm40prp2df1z6v"; + version = "4.0.0.0"; + sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + isLibrary = true; + isExecutable = true; buildDepends = [ - binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet - lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer - tagsoup text time + binary blazeHtml blazeMarkup citeprocHs cmdargs cryptohash deepseq + filepath httpConduit httpTypes lrucache mtl pandoc parsec random + regexBase regexTdfa snapCore snapServer tagsoup text time ]; meta = { homepage = "http://jaspervdj.be/hakyll"; From 8faee15126349fe26f06e6e49e281e8be1e67eec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 17:21:31 +0100 Subject: [PATCH 168/302] linux: Update to 3.2.37 --- 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 212a86f36a3..f843f8b057a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.36"; + version = "3.2.37"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0jyla0mjh1jjk84jywyvd7n6ax27xarkllfjf991rqj32zinlnzn"; + sha256 = "1h8lx0gvb1q962lghjpixa6q89k4yrgvpiw8hplb3w2jicqs4948"; }; config = configWithPlatform stdenv.platform; From 523ee1671b31e254daf87edecc18eea5e1cebe7d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Jan 2013 11:43:56 -0500 Subject: [PATCH 169/302] Add psutil pythonPackage --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07176ad782e..f89992a2fc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1838,6 +1838,21 @@ let pythonPackages = python.modules // rec { }; + psutil = buildPythonPackage rec { + name = "psutil-0.6.1"; + + src = fetchurl { + url = "http://psutil.googlecode.com/files/${name}.tar.gz"; + sha256 = "0vqarv63jqzghr4fi1fqdbvg847fq2gqdj8dzc3x59f9b36a8rfn"; + }; + + meta = { + description = "Process and system utilization information interface for python"; + homepage = http://code.google.com/p/psutil/; + }; + }; + + psycopg2 = buildPythonPackage rec { name = "psycopg2-2.0.13"; From 9248dc1a14c751912b1f9e4541812c814d091e09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 22:05:59 +0100 Subject: [PATCH 170/302] Remove unfree ATI drivers package from the channel Urghhhhh... --- pkgs/os-specific/linux/ati-drivers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 49efcc1e76e..c30d18fe75b 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { patchelf unzip ]; - + inherit kernel glibc /* glibc only used for setting interpreter */; - + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { inherit mesa; # only required to build examples meta = { - description = "ati drivers"; + description = "ATI drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = [ "x86_64-linux" ]; + #platforms = [ "x86_64-linux" ]; }; # moved assertions here because the name is evaluated when the NixOS manual is generated From 0db6ea6f760500d740f49756918c1807e2f48da5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 22:34:08 +0100 Subject: [PATCH 171/302] Remove some oversized packages from the channel E.g. urbanterror takes up 2x720 MiB. --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++-- pkgs/development/compilers/opa/default.nix | 9 ++++----- pkgs/development/libraries/ncbi/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/torcs/default.nix | 2 +- pkgs/games/ufoai/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 2 +- pkgs/games/widelands/default.nix | 3 +-- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index e2a9fd128e9..a2863663bea 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -38,8 +38,8 @@ rec { name = "lazarus-${version}"; meta = { description = "Lazarus graphical IDE for FreePascal language"; - homepage = http://www.lazarus.freepascal.org ; + homepage = http://www.lazarus.freepascal.org; maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; + #platforms = args.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 2a54b90dda9..68413e3e25d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -48,13 +48,12 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides."; + description = "A concise and elegant language for writing distributed web applications"; longDescription = '' - Opa is a new generation of web development platform that lets you write distributed - web applications using a single technology. Among the the many features of Opa are these: - Opa is concise, simple, concurrent, dynamically distributed, and secure. + Opa is a new generation of web development platform that lets you write distributed + web applications using a single technology. Among the the many features of Opa are these: + Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; - homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index 0b795e78ad5..a74cd81854e 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -49,6 +49,6 @@ rec { maintainers = [ a.lib.maintainers.raskin ]; - platforms = a.lib.platforms.linux ; + #platforms = a.lib.platforms.linux ; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 36ccbf98274..2e25cf4afb6 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { homepage = http://www.naev.org; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index cf740def511..da4fd01d3a9 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://torcs.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 85440f88901..e642e6f9124 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 875dfc93bb1..bffc5ad90d1 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = http://www.urbanterror.net; license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 45538acdca3..e20adc8faa7 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -64,8 +64,7 @@ rec { raskin jcumming ]; - platforms = with a.lib.platforms; - linux; + #platforms = a.lib.platforms.linux; license = a.lib.licenses.gpl2Plus; }; passthru = { From deaef8abaf312723300e1c156346573eedfdb70a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 23:24:55 +0100 Subject: [PATCH 172/302] =?UTF-8?q?Pass=20=E2=80=98config=E2=80=99=20to=20?= =?UTF-8?q?stdenv/generic/default.nix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a backport of cf8daf63120adedbeaf5bc8c2f396be2496a741e in stdenv-updates (sans the userHook stuff). --- pkgs/stdenv/default.nix | 7 ++++--- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 6 +++--- pkgs/stdenv/native/default.nix | 4 ++-- pkgs/stdenv/nix/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 8e0da288eec..67000670cd1 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -10,7 +10,7 @@ # system, e.g., cygwin and mingw builds on i686-cygwin. Most people # can ignore it. -{system, stdenvType ? system, allPackages ? import ../.., platform}: +{ system, stdenvType ? system, allPackages ? import ../.., platform, config }: assert system != "i686-cygwin" -> system == stdenvType; @@ -24,7 +24,7 @@ rec { # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). stdenvNative = (import ./native { - inherit system allPackages; + inherit system allPackages config; }).stdenv; stdenvNativePkgs = allPackages { @@ -35,13 +35,14 @@ rec { # The Nix build environment. stdenvNix = import ./nix { + inherit config; stdenv = stdenvNative; pkgs = stdenvNativePkgs; }; # Linux standard environment. - stdenvLinux = (import ./linux {inherit system allPackages platform;}).stdenvLinux; + stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux; # MinGW/MSYS standard environment. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index bed6ad2f90e..852be9612fb 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,5 +1,5 @@ { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell -, extraAttrs ? {}, overrides ? (pkgs: {}) +, extraAttrs ? {}, overrides ? (pkgs: {}), config , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3105e76f817..777b2cf6a32 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,7 +7,7 @@ # The function defaults are for easy testing. { system ? builtins.currentSystem , allPackages ? import ../../top-level/all-packages.nix -, platform ? null }: +, platform ? null, config }: rec { @@ -81,7 +81,7 @@ rec { {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}: import ../generic { - inherit system; + inherit system config; name = "stdenv-linux-boot"; preHook = '' @@ -261,7 +261,7 @@ rec { # dependency (`nix-store -qR') on bootstrapTools or the # first binutils built. stdenvLinux = import ../generic rec { - inherit system; + inherit system config; preHook = commonPreHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index a33a46c8512..524b2a53337 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,4 +1,4 @@ -{ system, allPackages ? import ../../.. }: +{ system, allPackages ? import ../../.., config }: rec { @@ -98,7 +98,7 @@ rec { fetchurlBoot = fetchurl; - inherit system shell gcc overrides; + inherit system shell gcc overrides config; }; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5e242b6e3a1..668bac5f0ae 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, config }: import ../generic rec { + inherit config; + preHook = '' export NIX_ENFORCE_PURITY=1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6038128d5f0..ad19066617a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -196,7 +196,7 @@ let allStdenvs = import ../stdenv { - inherit system stdenvType platform; + inherit system stdenvType platform config; allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; From d8e722985bac5f8448d5287840ee50517154443e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 23:41:37 +0100 Subject: [PATCH 173/302] =?UTF-8?q?Add=20config=20option=20=E2=80=98allowU?= =?UTF-8?q?nfree=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If set to false, mkDerivation will throw an exception if a package has an unfree license. ‘release-lib.nix’ uses this to enforce that we don't build unfree packages as part of the Nixpkgs channel. Since this is set through Nixpkgs' ‘config’ argument, it's more finegrained than $HYDRA_DISALLOW_UNFREE. --- pkgs/os-specific/linux/aufs/3.nix | 1 + pkgs/stdenv/generic/default.nix | 4 ++-- pkgs/top-level/release-lib.nix | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index 130fd5075cd..255804a31de 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation { ''; passthru = { inherit patch; }; + meta = { description = "Another Unionfs implementation for Linux (third generation)"; homepage = http://aufs.sourceforge.net/; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 852be9612fb..b6836ca8d79 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -10,7 +10,7 @@ let lib = import ../../lib; - disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1"; + allowUnfree = config.allowUnfree or true && builtins.getEnv "HYDRA_DISALLOW_UNFREE" != "1"; stdenvGenerator = setupScript: rec { @@ -41,7 +41,7 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: - if disallowUnfree && attrs.meta.license or "" == "unfree" then + if !allowUnfree && attrs.meta.license or "" == "unfree" then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 4a5f7602d02..d03f2724e1f 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,7 +1,11 @@ rec { - allPackages = import ./all-packages.nix; - pkgs = allPackages {}; + # Ensure that we don't build packages marked as unfree. + allPackages = args: import ./all-packages.nix (args // { + config.allowUnfree = false; + }); + + pkgs = allPackages { }; /* !!! Hack: poor man's memoisation function. Necessary for prevent Nixpkgs from being evaluated again and again for every From 9720148a1407764792f2a01579b5be514a58a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 00:20:45 +0100 Subject: [PATCH 174/302] Add pythonPackages.mrbob --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f89992a2fc0..769584f38a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1368,6 +1368,26 @@ let pythonPackages = python.modules // rec { }; + mrbob = buildPythonPackage rec { + name = "mrbob-${version}"; + version = "0.1a6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; + md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ argparse jinja2 ]; + + meta = { + homepage = https://github.com/iElectric/mr.bob.git; + description = "A tool to generate code skeletons from templates"; + }; + }; + + mutagen = buildPythonPackage (rec { name = "mutagen-1.20"; From 64950ff58edd8b7ff68a02dbdf64e806f6b57345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 00:45:13 +0100 Subject: [PATCH 175/302] Add pythonPackages.buildout --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 769584f38a0..2e168b73136 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -352,6 +352,22 @@ let pythonPackages = python.modules // rec { # }); + buildout = buildPythonPackage rec { + name = "buildout-${version}"; + version = "1.7.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.buildout/zc.${name}.tar.gz"; + md5 = "4e3b521600e475c56a0a66459a5fc7bb"; + }; + + meta = { + homepage = http://www.buildout.org/; + description = "A software build and configuration system"; + }; + }; + + carrot = buildPythonPackage rec { name = "carrot-0.10.7"; From ffeb15e77bdfd70f7131781c7ad2e3b134b19898 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 18 Jan 2013 01:01:48 +0100 Subject: [PATCH 176/302] update dropbox to 1.4.21 (stable) --- pkgs/applications/networking/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index f1a906f9250..97b7cb51097 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -21,8 +21,8 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.4.0"; - sha256 = "93933d95cce5956ed99342fa342d01ce2bde8d2e4339afb97f23e0c0ec98875e"; + version = "1.4.21"; + sha256 = "94073842f4a81feee80bca590e1df73fc3cab47ba879407ceba2de48f30d84e2"; # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; From d674d9cf9bb527136f3e551d83a9434e7d7e6105 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Fri, 18 Jan 2013 01:57:01 +0100 Subject: [PATCH 177/302] update minecraft recipe --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3281f07335b..a72223543aa 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,11 +2,11 @@ , mesa, openal}: stdenv.mkDerivation { - name = "minecraft-1.3.1"; + name = "minecraft-1.4.7"; src = fetchurl { url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar"; - sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj"; + sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49"; }; phases = "installPhase"; From 52fb5d86a97ccab82a933a84ac0c33d3308404b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 18 Jan 2013 02:21:24 +0100 Subject: [PATCH 178/302] Add pythonPackages.zodb3 and dependencies --- pkgs/top-level/python-packages.nix | 224 +++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e168b73136..971c4194533 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1271,6 +1271,23 @@ let pythonPackages = python.modules // rec { }; }; + manuel = buildPythonPackage rec { + name = "manuel-${version}"; + version = "1.6.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; + md5 = "53d6a6905301a20f6095e41d11968fff"; + }; + + propagatedBuildInputs = [ six zope_testing ]; + + meta = { + description = "A documentation builder"; + homepage = http://pypi.python.org/pypi/manuel; + license = "ZPL"; + }; + }; markdown = buildPythonPackage rec { version = "2.0.3"; @@ -2910,6 +2927,24 @@ let pythonPackages = python.modules // rec { }); + subunit = buildPythonPackage rec { + name = "subunit-${version}"; + version = "0.0.9"; + + src = fetchurl { + url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz"; + sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56"; + }; + + propagatedBuildInputs = [ testtools ]; + + meta = { + description = "A streaming protocol for test results"; + homepage = https://launchpad.net/subunit; + license = pkgs.lib.licenses.asl20; + }; + }; + # XXX: ValueError: ZIP does not support timestamps before 1980 # svneverever = buildPythonPackage rec { # name = "svneverever-778489a8"; @@ -2971,6 +3006,23 @@ let pythonPackages = python.modules // rec { }; + testtools = buildPythonPackage rec { + name = "testtools-${version}"; + version = "0.9.24"; + + src = fetchurl { + url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz"; + sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7"; + }; + + meta = { + description = "A set of extensions to the Python standard library's unit testing framework"; + homepage = http://pypi.python.org/pypi/testtools; + license = pkgs.lib.licenses.mit; + }; + }; + + trac = buildPythonPackage { name = "trac-0.12.2"; @@ -2993,6 +3045,26 @@ let pythonPackages = python.modules // rec { }; }; + + transaction = buildPythonPackage rec { + name = "transaction-${version}"; + version = "1.4.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; + md5 = "b7c2ff135939f605a8c54e1c13cd5d66"; + }; + + propagatedBuildInputs = [ zopeInterface ]; + + meta = { + description = "Transaction management"; + homepage = http://pypi.python.org/pypi/transaction; + license = "ZPL"; + }; + }; + + turses = buildPythonPackage (rec { name = "turses-0.2.9"; @@ -3311,6 +3383,62 @@ let pythonPackages = python.modules // rec { }; }); + + zconfig = buildPythonPackage rec { + name = "zconfig-${version}"; + version = "2.9.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz"; + md5 = "2c5f73c216140a705be3d9c44b988722"; + }; + + propagatedBuildInputs = [ zope_testrunner ]; + + meta = { + description = "Structured Configuration Library"; + homepage = http://pypi.python.org/pypi/ZConfig; + license = "ZPL"; + }; + }; + + + zc_lockfile = buildPythonPackage rec { + name = "zc_lockfile-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz"; + md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; + }; + + meta = { + description = "Inter-process locks"; + homepage = http://www.python.org/pypi/zc.lockfile; + license = "ZPL"; + }; + }; + + + zdaemon = buildPythonPackage rec { + name = "zdaemon-${version}"; + version = "3.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; + md5 = "975f770544bb4352c5cf32fec22e63c9"; + }; + + propagatedBuildInputs = [ zconfig ]; + + meta = { + description = "A daemon process control library and tools for Unix-based systems"; + homepage = http://pypi.python.org/pypi/zdaemon; + license = "ZPL"; + }; + }; + + zfec = buildPythonPackage (rec { name = "zfec-1.4.7"; @@ -3340,6 +3468,102 @@ let pythonPackages = python.modules // rec { }; }); + + zodb3 = buildPythonPackage rec { + name = "zodb3-${version}"; + version = "3.10.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz"; + md5 = "6f180c6897a1820948fee2a6290503cd"; + }; + + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ]; + + meta = { + description = "An object-oriented database for Python"; + homepage = http://pypi.python.org/pypi/ZODB3; + license = "ZPL"; + }; + }; + + + zope_event = buildPythonPackage rec { + name = "zope_event-${version}"; + version = "4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz"; + md5 = "e08dd299d428d77a1cfcbfe841b81872"; + }; + + meta = { + description = "An event publishing system"; + homepage = http://pypi.python.org/pypi/zope.event; + license = "ZPL"; + }; + }; + + + zope_exceptions = buildPythonPackage rec { + name = "zopeexceptions-${version}"; + version = "4.0.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz"; + md5 = "c95569fcb444ae541777de7ae5297492"; + }; + + propagatedBuildInputs = [ zopeInterface ]; + + meta = { + description = "Exception interfaces and implementations"; + homepage = http://pypi.python.org/pypi/zope.exceptions; + license = "ZPL"; + }; + }; + + + zope_testing = buildPythonPackage rec { + name = "zope_testing-${version}"; + version = "4.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz"; + md5 = "2e3829841090d6adff718b8b73c87b6b"; + }; + + propagatedBuildInputs = [ zopeInterface zope_exceptions ]; + + meta = { + description = "Zope testing helpers"; + homepage = http://pypi.python.org/pypi/zope.testing; + license = "ZPL"; + }; + }; + + + zope_testrunner = buildPythonPackage rec { + name = "zope_testrunner-${version}"; + version = "4.0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip"; + md5 = "cd648fc865a79aa0950e73342836dd4c"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ]; + + meta = { + description = "A flexible test runner with layer support"; + homepage = http://pypi.python.org/pypi/zope.testrunner; + license = "ZPL"; + }; + }; + + zopeInterface = buildPythonPackage { name = "zope-interface-3.6.1"; src = fetchurl { From 2ba4f46752cbd9e6869a4c48fbea4033486c34c4 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 17 Jan 2013 22:52:15 -0800 Subject: [PATCH 179/302] tinc: A VPN daemon with full mesh routing. --- pkgs/tools/networking/tinc/default.nix | 30 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/tinc/default.nix diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix new file mode 100644 index 00000000000..dadadc08520 --- /dev/null +++ b/pkgs/tools/networking/tinc/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, lzo, openssl, zlib}: + +stdenv.mkDerivation rec { + version = "1.0.19"; + name = "tinc-${version}"; + + src = fetchurl { + url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; + sha256 = "183nxj23d05vc3pxwbb692lr048wr81wnv0avzlkdm4r6c3bp7jh"; + }; + + buildInputs = [ lzo openssl zlib ]; + + configureFlags = '' + --localstatedir=/var + --sysconfdir=/etc + ''; + + meta = { + description = "VPN daemon with full mesh routing"; + longDescription = '' + tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and + encryption to create a secure private network between hosts on the + Internet. It features full mesh routing, as well as encryption, + authentication, compression and ethernet bridging. + ''; + homepage="http://www.tinc-vpn.org/"; + license = "gpl2Plus"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad19066617a..a2551580e39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1587,6 +1587,8 @@ let guile = guile_1_8; }; + tinc = callPackage ../tools/networking/tinc { }; + tmux = callPackage ../tools/misc/tmux { }; tor = callPackage ../tools/security/tor { }; From d54c8c4b8360aaedbb5b1220d09ef3a2bef9efdc Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 17 Jan 2013 21:42:22 +0100 Subject: [PATCH 180/302] update kernels: 3.0.59, 3.4.26 and 3.7.3 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 97b3a6bfd0d..557ee6b52c6 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.58"; + version = "3.0.59"; 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 = "10ahi60ass970vjlhnzcf0y5fk3g7ck1a1lnwzy0kkywp6nb2c10"; + sha256 = "0w0l0vsky921j6wvhydl8ggzwkwkhr0lk2lkd7lshhmv9c6bdg86"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index eef4847e5b2..8d8c56daab0 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.25"; + version = "3.4.26"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0jlnrjxyyfw2f87mr9y8c4337yfbnrj5jp3vhm33dwy7i3vdpfs6"; + sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 4a092fe6b3a..2822c33c828 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.7.2"; + version = "3.7.3"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "09s1z2z15xnnqm2syr76l7s3s14zzsalifnnfmry52ibizllzh04"; + sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7"; }; config = configWithPlatform stdenv.platform; From bc8a6e6c19936d3175999ccca2021b61297b1559 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 17 Jan 2013 21:49:33 +0100 Subject: [PATCH 181/302] new download host for zfsonlinux.org: spl/zfs --- pkgs/os-specific/linux/spl/default.nix | 2 +- pkgs/os-specific/linux/zfs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 5943a231a85..94e3573b70e 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "spl-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://zfsonlinux.org/downloads/0.6.0-rc13/spl-0.6.0-rc13.tar.gz; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc13.tar.gz; sha256 = "1frbifj1yd7pznlhsqsiksip5amx4ljvasg8h80haaxk0yvvkr9b"; }; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index b83019ea87a..17c7d3824d7 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "zfs-0.6.0-rc13-${kernel.version}"; src = fetchurl { - url = http://zfsonlinux.org/downloads/0.6.0-rc13/zfs-0.6.0-rc13.tar.gz; + url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc13.tar.gz; sha256 = "1kpx7sa49ir93kmlrjwjzd6v4kzmda4j9cf6bv2p4s3yrmiz3cjv"; }; From bc331e230eb65dafd3251bc2ca72686206b0cc71 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 18 Jan 2013 12:01:14 +0100 Subject: [PATCH 182/302] mpd: Update to 0.17.3 Additionally, turn on a lot more features in mpd by adding dependencies. Can be controlled by xxxSupport flags, as before. By default, everything is enabled. --- pkgs/servers/mpd/default.nix | 88 +++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index a5cc810ada8..54c9d160565 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,39 +1,85 @@ -{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib -, flacSupport ? true, flac, vorbisSupport ? true, libvorbis -, madSupport ? true, libmad, id3tagSupport ? true, libid3tag -, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +{ stdenv, fetchurl, pkgconfig, glib, systemd +, alsaSupport ? true, alsaLib +, flacSupport ? true, flac +, vorbisSupport ? true, libvorbis +, madSupport ? true, libmad +, id3tagSupport ? true, libid3tag +, mikmodSupport ? true, libmikmod , shoutSupport ? true, libshout +, sqliteSupport ? true, sqlite +, curlSupport ? true, curl +, soupSupport ? true, libsoup +, audiofileSupport ? true, audiofile +, bzip2Support ? true, bzip2 +, ffadoSupport ? true, ffado +, ffmpegSupport ? true, ffmpeg +, fluidsynthSupport ? true, fluidsynth +, zipSupport ? true, zziplib +, samplerateSupport ? true, libsamplerate +, mmsSupport ? true, libmms +, mpg123Support ? true, mpg123 +, aacSupport ? true, faad2 }: + let + opt = stdenv.lib.optional; -in -stdenv.mkDerivation rec { - name = "mpd-0.16.8"; + + mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + +in stdenv.mkDerivation rec { + name = "mpd-0.17.3"; src = fetchurl { url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17"; + sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip"; }; - buildInputs = [ pkgconfig glib ] + buildInputs = [ pkgconfig glib systemd ] ++ opt alsaSupport alsaLib ++ opt flacSupport flac ++ opt vorbisSupport libvorbis ++ opt madSupport libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod - ++ opt cueSupport libcue - ++ opt shoutSupport libshout; + ++ opt shoutSupport libshout + ++ opt sqliteSupport sqlite + ++ opt curlSupport curl + ++ opt soupSupport libsoup + ++ opt bzip2Support bzip2 + ++ opt audiofileSupport audiofile + ++ opt ffadoSupport ffado + ++ opt ffmpegSupport ffmpeg + ++ opt fluidsynthSupport fluidsynth + ++ opt samplerateSupport libsamplerate + ++ opt mmsSupport libmms + ++ opt mpg123Support mpg123 + ++ opt aacSupport faad2 + ++ opt zipSupport zziplib; - configureFlags = '' - ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} - ${if flacSupport then "--enable-flac" else "--disable-flac"} - ${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"} - ${if madSupport then "--enable-mad" else "--disable-mad"} - ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} - ${if id3tagSupport then "--enable-id3" else "--disable-id3"} - ${if cueSupport then "--enable-cue" else "--disable-cue"} - ${if shoutSupport then "--enable-shout" else "--disable-shout"} - ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + (mkFlag alsaSupport "alsa") + (mkFlag flacSupport "flac") + (mkFlag vorbisSupport "vorbis") + (mkFlag vorbisSupport "vorbis-encoder") + (mkFlag madSupport "mad") + (mkFlag mikmodSupport "mikmod") + (mkFlag id3tagSupport "id3") + (mkFlag shoutSupport "shout") + (mkFlag sqliteSupport "sqlite") + (mkFlag curlSupport "curl") + (mkFlag soupSupport "soup") + (mkFlag audiofileSupport "audiofile") + (mkFlag bzip2Support "bzip2") + (mkFlag ffadoSupport "ffado") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag fluidsynthSupport "fluidsynth") + (mkFlag zipSupport "zzip") + (mkFlag samplerateSupport "lsr") + (mkFlag mmsSupport "mms") + (mkFlag mpg123Support "mpg123") + (mkFlag aacSupport "aac") + ]; NIX_LDFLAGS = '' ${if shoutSupport then "-lshout" else ""} From 1d94f9051174f0c884ef596d13390d91e4d96bef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: [PATCH 183/302] haskell-hs-bibutils: update to version 4.16 --- 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 8acb621fe3f..b9f3eb3cb8e 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.15"; - sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9"; + version = "4.16"; + sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; From 069c587237b0abfdf2e38ad6b034da9ae2c04db1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:55 +0100 Subject: [PATCH 184/302] haskell-http-conduit: update to version 1.8.7 --- .../libraries/haskell/http-conduit/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 5009d4132de..b9f47b44006 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,21 +1,23 @@ { cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cookie, cprngAes, dataDefault, deepseq, failure -, httpTypes, liftedBase, monadControl, mtl, network, regexCompat -, resourcet, socks, text, time, tls, tlsExtra, transformers -, transformersBase, utf8String, void, zlibConduit +, filepath, httpTypes, liftedBase, mimeTypes, monadControl, mtl +, network, random, regexCompat, resourcet, socks, text, time, tls +, tlsExtra, transformers, transformersBase, utf8String, void +, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.6.3"; - sha256 = "0ykwfii3qcj77ai0jafgbf5017mckz51gmbk3m8kwm1z6dalb27r"; + version = "1.8.7"; + sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie - cprngAes dataDefault deepseq failure httpTypes liftedBase - monadControl mtl network regexCompat resourcet socks text time tls - tlsExtra transformers transformersBase utf8String void zlibConduit + cprngAes dataDefault deepseq failure filepath httpTypes liftedBase + mimeTypes monadControl mtl network random regexCompat resourcet + socks text time tls tlsExtra transformers transformersBase + utf8String void zlibConduit ]; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; From fd6c95461b5983840b2ca40ac2a392a233ecfe8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 18 Jan 2013 12:29:56 +0100 Subject: [PATCH 185/302] haskell-smallcheck: update to version 0.6.2 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 1086a1929a8..a11eb501a86 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6.1"; - sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb"; + version = "0.6.2"; + sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From 9e6d6dae015cc48de6670b874e278ce3f14e4a82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 18 Jan 2013 13:05:54 +0100 Subject: [PATCH 186/302] Test::Warn: Update to 0.24 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b1a9283fca9..138f4b19279 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3953,13 +3953,13 @@ rec { }; TestWarn = buildPerlPackage rec { - name = "Test-Warn-0.23"; + name = "Test-Warn-0.24"; src = fetchurl { url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0"; + sha256 = "12r1mcwrm6cgc3ppgawwv265vmrighj4bl6xc5c41f4c2l6bdxml"; }; - propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode]; - buildInputs = [TestPod]; + propagatedBuildInputs = [ TestSimple TestException ArrayCompare TreeDAGNode ]; + buildInputs = [ TestPod ]; }; TestWWWMechanize = buildPerlPackage rec { From bbd049e9d5b862b779abd5fb9a955e3bf31b62f8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 18 Jan 2013 17:34:01 +0100 Subject: [PATCH 187/302] Allow App names with spaces --- pkgs/development/mobile/titaniumenv/build-app.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 5a06e809c3d..c675116f88a 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -16,7 +16,8 @@ let deleteKeychain = "security delete-keychain $keychainName"; in stdenv.mkDerivation { - inherit name src; + name = stdenv.lib.replaceChars [" "] [""] name; + inherit src; buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; @@ -27,9 +28,9 @@ stdenv.mkDerivation { ${if target == "android" then if release then - "${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out'' else - "${titaniumsdk}/mobilesdk/*/*/android/builder.py build ${name} ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}" + ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}'' else if target == "iphone" then if iosDistribute then '' @@ -52,7 +53,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -80,7 +81,7 @@ stdenv.mkDerivation { cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" fi - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} ${name} "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName" # Remove our generated keychain @@ -95,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}" '' else throw "Target: ${target} is not supported!"} From 7e8fc622e5e0b7887d43d9885da289531d34ed0d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 15:50:21 -0500 Subject: [PATCH 188/302] libnatspec: Needs libiconv --- pkgs/development/libraries/libnatspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index fbab569e38c..d2747b50ce0 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt }: +{ stdenv, fetchurl, popt, libiconvOrEmpty }: stdenv.mkDerivation rec { name = "libnatspec-0.2.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ]; + buildInputs = [ popt ] ++ libiconvOrEmpty; meta = { homepage = http://natspec.sourceforge.net/ ; From 23853fa81b86517a8a5705b77d4c816b42c917e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Jan 2013 17:01:56 -0500 Subject: [PATCH 189/302] libnatspec: The build process doesn't respect buildInputs, so force use of libiconv on not-Linux --- pkgs/development/libraries/libnatspec/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index d2747b50ce0..985745c3898 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, popt, libiconvOrEmpty }: +{ stdenv, fetchurl, popt, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libnatspec-0.2.6"; src = fetchurl { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0zvm9afh1skxgdv62ylrpwyykpjhhskxj0zv7yrdf7jhfdriz0y3"; }; - buildInputs = [ popt ] ++ libiconvOrEmpty; + buildInputs = [ popt ]; meta = { homepage = http://natspec.sourceforge.net/ ; @@ -16,4 +16,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.urkud ]; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_CFLAGS_COMPILE = "-I${libiconv}/include"; + + NIX_CFLAGS_LINK = "-L${libiconv}/lib -liconv"; +}) From cd5755845fe5a31711d223f5f7fc3f50f2f9212b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 19 Jan 2013 00:02:51 +0100 Subject: [PATCH 190/302] Lots of Perl package updates --- doc/meta.xml | 6 + .../Compress-Raw-Bzip2/default.nix | 15 - .../Compress-Raw-Zlib/default.nix | 9 +- .../perl-modules/DBD-Pg/default.nix | 11 +- .../starman-dont-change-name.patch | 23 - .../template-toolkit-nix-store.patch | 23 - pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 2403 ++++++++++++----- 8 files changed, 1679 insertions(+), 813 deletions(-) delete mode 100644 pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix delete mode 100644 pkgs/development/perl-modules/starman-dont-change-name.patch delete mode 100644 pkgs/development/perl-modules/template-toolkit-nix-store.patch diff --git a/doc/meta.xml b/doc/meta.xml index 30b5ad247d1..09252410d80 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -176,6 +176,12 @@ following: (“MIT”) License. + + perl5 + The Perl 5 license (Artistic License, version 1 + and GPL, version 1 or later). + + free Catch-all for free software licenses not listed diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix deleted file mode 100644 index 6515efada6f..00000000000 --- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ fetchurl, buildPerlPackage, bzip2 }: - -buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.049"; - - src = fetchurl { - url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "7881473e0ab5ecc6ce609382e4f7466fb32217e928eef27e7084702bb07ac172"; - }; - - # Don't build a private copy of bzip2. - BUILD_BZIP2 = false; - BZIP2_LIB = "${bzip2}/lib"; - BZIP2_INCLUDE = "${bzip2}/include"; -} diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index c2c7b5f8363..9385981e2c3 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.051"; + name = "Compress-Raw-Zlib-2.060"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "16c7e0d2ed339c0b5ffe787bbcc9fc063ce6f2145d8cd6a18d0c79fa68d36c09"; + sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3"; }; preConfigure = '' @@ -19,4 +19,9 @@ buildPerlPackage rec { ''; doCheck = !stdenv.isDarwin; + + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + license = "perl5"; + }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 0d0cb1accc5..be5faa330ae 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { - name = "DBD-Pg-2.19.2"; + name = "DBD-Pg-2.19.3"; src = fetchurl { url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz"; - sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9"; + sha256 = "0ai6p2094hrh6kjlwfjvpw2z8wqa3scr4ba3p6rqza3z9c9hsd9p"; }; buildInputs = [ postgresql ]; @@ -13,5 +13,10 @@ buildPerlPackage rec { makeMakerFlags = "POSTGRES_HOME=${postgresql}"; - meta.platforms = stdenv.lib.platforms.linux; + meta = { + homepage = http://search.cpan.org/dist/DBD-Pg/; + description = "DBI PostgreSQL interface"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/perl-modules/starman-dont-change-name.patch b/pkgs/development/perl-modules/starman-dont-change-name.patch deleted file mode 100644 index 82454cfdd16..00000000000 --- a/pkgs/development/perl-modules/starman-dont-change-name.patch +++ /dev/null @@ -1,23 +0,0 @@ -Changing the process name breaks applying libcgroup rules, so don't do it. - -diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm ---- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000 +0200 -+++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653 +0100 -@@ -100,7 +100,7 @@ - - sub run_parent { - my $self = shift; -- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []}); -+ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []}); - $self->SUPER::run_parent(@_); - } - -@@ -113,7 +113,7 @@ - DEBUG && warn "[$$] Initializing the PSGI app\n"; - $self->{app} = $self->{options}->{psgi_app_builder}->(); - } -- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []}); -+ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []}); - } - - sub post_accept_hook { diff --git a/pkgs/development/perl-modules/template-toolkit-nix-store.patch b/pkgs/development/perl-modules/template-toolkit-nix-store.patch deleted file mode 100644 index 402f1cb41be..00000000000 --- a/pkgs/development/perl-modules/template-toolkit-nix-store.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -rc Template-Toolkit-2.20-orig/lib/Template/Provider.pm Template-Toolkit-2.20/lib/Template/Provider.pm -*** Template-Toolkit-2.20-orig/lib/Template/Provider.pm 2008-08-06 11:32:02.000000000 +0200 ---- Template-Toolkit-2.20/lib/Template/Provider.pm 2008-11-28 16:37:36.000000000 +0100 -*************** -*** 936,942 **** - sub _template_modified { - my $self = shift; - my $template = shift || return; -! return (stat( $template ))[9]; - } - - #------------------------------------------------------------------------ ---- 936,945 ---- - sub _template_modified { - my $self = shift; - my $template = shift || return; -! # Nix specific hack: timestamps of 0 (1-1-1970) should not be -! # treated as undefined, so return 1 instead. -! my $t = (stat( $template ))[9]; -! return (defined $t && $t == 0) ? 1 : $t; - } - - #------------------------------------------------------------------------ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69fe6be52c9..3df7e5743ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -237,7 +237,7 @@ let ### BUILD SUPPORT - attrSetToDir = arg : import ../build-support/upstream-updater/attrset-to-dir.nix { + attrSetToDir = arg: import ../build-support/upstream-updater/attrset-to-dir.nix { inherit writeTextFile stdenv lib; theAttrSet = arg; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b085dfe49bb..f08553993c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12,7 +12,7 @@ rec { inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn; # Helper functions for packages that use Module::Build to build. - buildModule = { buildInputs ? [], ... } @ args: + buildPerlModule = { buildInputs ? [], ... } @ args: buildPerlPackage (args // { buildInputs = buildInputs ++ [ ModuleBuild ]; preConfigure = "touch Makefile.PL"; @@ -30,10 +30,7 @@ rec { }; propagatedBuildInputs = [ FileNext ]; meta = { - description = "grep-like text finder"; - longDescription = '' - ack is a grep-like tool tailored to working with large trees of source code. - ''; + description = "A grep-like tool tailored to working with large trees of source code"; homepage = http://betterthangrep.com/; license = "free"; # Artistic 2.0 }; @@ -48,13 +45,25 @@ rec { propagatedBuildInputs = [AlgorithmDiff]; }; - AlgorithmDiff = buildPerlPackage rec { - name = "Algorithm-Diff-1.1901"; + AlgorithmC3 = buildPerlModule { + name = "Algorithm-C3-0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TY/TYEMQ/${name}.zip"; - sha256 = "0qk60fi49mpyvnfpjd2dzcmya8x3g5zfgb2hrnl7a5krn045g6i2"; + url = mirror://cpan/authors/id/F/FL/FLORA/Algorithm-C3-0.08.tar.gz; + sha256 = "016cjr63wivg54ms6sjnxz4g75fafgvgwralamv29phcic2cl2am"; }; - buildInputs = [pkgs.unzip]; + meta = { + description = "A module for merging hierarchies using the C3 algorithm"; + license = "perl"; + }; + }; + + AlgorithmDiff = buildPerlPackage rec { + name = "Algorithm-Diff-1.1902"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1902.tar.gz; + sha256 = "0xc315h7xwq65n9n6nq8flv5d89z6kra69hspnyccw3782zhvd68"; + }; + buildInputs = [ pkgs.unzip ]; }; aliased = buildPerlPackage rec { @@ -89,6 +98,9 @@ rec { url = mirror://cpan/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz; sha256 = "1p1vs9px20lrq9mdwpzp309a8r6rchibsdmxang4krk90pi2sh4b"; }; + meta = { + description = "A bundle of Perl5 modules for reading configuration files and parsing command line arguments"; + }; }; ArrayCompare = buildPerlPackage { @@ -188,13 +200,18 @@ rec { inherit (pkgs) db4; }; - BHooksEndOfScope = buildPerlPackage rec { - name = "B-Hooks-EndOfScope-0.08"; + BHooksEndOfScope = buildPerlPackage { + name = "B-Hooks-EndOfScope-0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "07gbfc36qr8pfwrcskq3bbpwscmi7nkvvw54vz5d9ym1fyn3zf0g"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/B-Hooks-EndOfScope-0.12.tar.gz; + sha256 = "1gagn8b9zhbwk4f4cllrvir1mspvq0ladsy0pfkwl9w85q1843lj"; + }; + propagatedBuildInputs = [ ModuleImplementation ModuleRuntime SubExporterProgressive ]; + meta = { + homepage = http://metacpan.org/release/B-Hooks-EndOfScope; + description = "Execute code after a scope finished compilation"; + license = "perl5"; }; - propagatedBuildInputs = [SubExporter VariableMagic]; }; BitVector = buildPerlPackage { @@ -259,38 +276,53 @@ rec { buildInputs = [TestPod]; }; - CaptureTiny = buildPerlPackage rec { - name = "Capture-Tiny-0.11"; + CaptureTiny = buildPerlPackage { + name = "Capture-Tiny-0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "09rhfjgryvfap2v6ym7ywl130r3q8a1p2rq70l1jv415qhj0194c"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.21.tar.gz; + sha256 = "1lvz2639zsjpr3001b2xyidnsd4kcgll5fvaa0pm928wzldb49wg"; + }; + meta = { + homepage = https://metacpan.org/release/Capture-Tiny; + description = "Capture STDOUT and STDERR from Perl, XS or external programs"; + license = "apache_2_0"; }; }; - CarpAssert = buildPerlPackage rec { + CarpAssert = buildPerlPackage { name = "Carp-Assert-0.20"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSCHWERN/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSCHWERN/Carp-Assert-0.20.tar.gz; sha256 = "1wzy4lswvwi45ybsm65zlq17rrqx84lsd7rajvd0jvd5af5lmlqd"; }; + meta = { + }; }; - CarpAssertMore = buildPerlPackage rec { - name = "Carp-Assert-More-1.12"; + CarpAssertMore = buildPerlPackage { + name = "Carp-Assert-More-1.14"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "1m9k6z0m10s03x2hnc9mh5d4r8lnczm9bqd54jmnw0wzm4m33lyr"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.14.tar.gz; + sha256 = "0cq7qk4qbhqppm4raby5k24b5mx5qjgy1884nrddhxillnzlq01z"; + }; + propagatedBuildInputs = [ CarpAssert TestException ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + license = "artistic_2"; }; - propagatedBuildInputs = [TestException CarpAssert]; }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.00"; + name = "Carp-Clan-6.04"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJORE/Carp-Clan-6.00.tar.gz; - sha256 = "0lbin4i0vzagcwkywpd5x4gz3a4ira4yn5g5v1ip0pbpyqnjk15h"; + url = mirror://cpan/authors/id/S/ST/STBEY/Carp-Clan-6.04.tar.gz; + sha256 = "1v71k8s1pi16l5y579gnrg372c6pdvy6qqm6iddm8h1dx7n16bjl"; + }; + propagatedBuildInputs = [ TestException ]; + meta = { + description = "Report errors from perspective of caller of a \"clan\" of modules"; + license = "perl"; }; - propagatedBuildInputs = [TestException]; }; CatalystActionRenderView = buildPerlPackage rec { @@ -314,15 +346,17 @@ rec { [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ]; }; - CatalystAuthenticationStoreDBIxClass = buildPerlPackage rec { - name = "Catalyst-Authentication-Store-DBIx-Class-0.1082"; + CatalystAuthenticationStoreDBIxClass = buildPerlPackage { + name = "Catalyst-Authentication-Store-DBIx-Class-0.1503"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JA/JAYK/${name}.tar.gz"; - sha256 = "1rh5jwqw3fb16ll5id8z0igpqdwr0czi0xbaa2igalxr53hh2cni"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Authentication-Store-DBIx-Class-0.1503.tar.gz; + sha256 = "1l11if91gjfrga7i7bjxwa0zybhkkrpgg6ps3nxm30vmg7xqaf4d"; + }; + propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication CatalystRuntime DBIxClass ListMoreUtils Moose namespaceautoclean TryTiny ]; + meta = { + description = "A storage class for Catalyst Authentication using DBIx::Class"; + license = "perl"; }; - propagatedBuildInputs = [ - CatalystRuntime CatalystPluginAuthentication CatalystModelDBICSchema - ]; }; CatalystComponentInstancePerContext = buildPerlPackage rec { @@ -349,20 +383,19 @@ rec { ]; }; - CatalystDevel = buildPerlPackage rec { - name = "Catalyst-Devel-1.33"; + CatalystDevel = buildPerlPackage { + name = "Catalyst-Devel-1.37"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "0g41rglw460y2n2xbysjbsjb56jkkz2m5jhap2nw3a5jby1ymp07"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Devel-1.37.tar.gz; + sha256 = "0yk526py65iy40z10d6w0fspb8fam5rf1hzsxnfyy4lpy91lp7s9"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ CatalystRuntime CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive FileShareDir ModuleInstall Moose MooseXDaemonize MooseXEmulateClassAccessorFast namespaceautoclean namespaceclean PathClass Starman TemplateToolkit ]; + meta = { + homepage = http://dev.catalyst.perl.org/; + description = "Catalyst Development Tools"; + license = "perl"; }; - buildInputs = [ TestFatal TestMore ]; - propagatedBuildInputs = - [ CatalystRuntime CatalystActionRenderView - CatalystPluginStaticSimple CatalystPluginConfigLoader - ClassAccessor ConfigGeneral FileChangeNotify FileCopyRecursive - FileShareDir Parent PathClass TemplateToolkit YAMLTiny - ]; - CATALYST_DEVEL_NO_510_CHECK = 1; # bug in Perl 5.10.0 }; CatalystEngineHTTPPrefork = buildPerlPackage rec { @@ -392,61 +425,62 @@ rec { buildInputs = [TestPod TestPodCoverage]; }; - CatalystModelDBICSchema = buildPerlPackage rec { - name = "Catalyst-Model-DBIC-Schema-0.54"; + CatalystModelDBICSchema = buildPerlPackage { + name = "Catalyst-Model-DBIC-Schema-0.60"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "19iasq94nph33vz4jrk5x6cqd9ivq0db867s524faba8avrrlxz9"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Model-DBIC-Schema-0.60.tar.gz; + sha256 = "176jqvrmhp0wng446m0qlmh1kgqj4z1czg6s418ffr4a7c3jqyld"; + }; + buildInputs = [ DBDSQLite TestException TestRequires ]; + propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; + meta = { + description = "DBIx::Class::Schema Model Class"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; }; - buildInputs = [ TestMore TestException TestRequires DBDSQLite ]; - propagatedBuildInputs = - [ DBIxClass CatalystRuntime CatalystXComponentTraits Moose MooseXTypes - NamespaceAutoclean CarpClan ListMoreUtils TieIxHash TryTiny - CatalystDevel DBIxClassSchemaLoader MooseXNonMoose - NamespaceClean HashMerge DBIxClassCursorCached - ]; - meta.platforms = stdenv.lib.platforms.linux; }; - CatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.90006"; + CatalystRuntime = buildPerlPackage { + name = "Catalyst-Runtime-5.90019"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "01afjgcc5lqaw6gmzwym8n09q8nksj4jdl2z25m64sfiv1gdyx2w"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Runtime-5.90019.tar.gz; + sha256 = "0madnqyzhcvbv6iql6b10dzfqvajj0fyp1sla83csakkbff38mqp"; + }; + buildInputs = [ ClassDataInheritable DataDump HTTPMessage TestException ]; + propagatedBuildInputs = [ CGISimple ClassC3AdoptNEXT ClassLoad ClassMOP DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI ListMoreUtils LWPUserAgent Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading MROCompat namespaceautoclean namespaceclean PathClass Plack PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI ]; + meta = { + homepage = http://dev.catalyst.perl.org/; + description = "The Catalyst Framework Runtime"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = - [ ClassDataInheritable ListMoreUtils NamespaceAutoclean NamespaceClean - BHooksEndOfScope MooseXEmulateClassAccessorFast ClassMOP - Moose MooseXMethodAttributes MooseXRoleWithOverloading - ClassC3AdoptNEXT CGISimple DataDump DataOptList - HTMLParser HTTPBody HTTPRequestAsCGI - LWP ModulePluggable PathClass SubExporter - TextSimpleTable TimeHiRes TreeSimple TreeSimpleVisitorFactory - URI TaskWeaken /* TextBalanced */ MROCompat MooseXTypes - MooseXGetopt MooseXTypesCommon StringRewritePrefix - MooseXTypesLoadableClass Plack PlackMiddlewareReverseProxy - ]; - meta.platforms = stdenv.lib.platforms.linux; }; - CatalystPluginAccessLog = buildPerlPackage rec { - name = "Catalyst-Plugin-AccessLog-1.04"; + CatalystPluginAccessLog = buildPerlPackage { + name = "Catalyst-Plugin-AccessLog-1.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "1cbbg6fviyv398lyhmv14ya0v0h0xs04d29zz9r49vzsbw6shy33"; + url = mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.05.tar.gz; + sha256 = "0hqvckaw91q5yc25a33bp0d4qqxlgkp7rxlvi8n8svxd1406r55s"; + }; + propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; + meta = { + description = "Request logging from within Catalyst"; + license = "perl"; }; - propagatedBuildInputs = [ CatalystRuntime DateTime ]; }; - CatalystPluginAuthentication = buildPerlPackage rec { - name = "Catalyst-Plugin-Authentication-0.10018"; + CatalystPluginAuthentication = buildPerlPackage { + name = "Catalyst-Plugin-Authentication-0.10022"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "1znm81baidzhiiyanigy8rs8jq97vh94fiv4xvkrmaxz0k6vppdx"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10022.tar.gz; + sha256 = "1yxx89j6q10ydmwwhv3zq68gwndcnh4vvdqiv7az5w2rf2w1nvip"; + }; + buildInputs = [ ClassMOP Moose TestException ]; + propagatedBuildInputs = [ CatalystPluginSession CatalystRuntime ClassInspector Moose MooseXEmulateClassAccessorFast MROCompat namespaceautoclean StringRewritePrefix TryTiny ]; + meta = { + description = "Infrastructure plugin for the Catalyst authentication framework"; + license = "perl"; }; - propagatedBuildInputs = - [ CatalystRuntime CatalystPluginSession ClassInspector ]; }; CatalystPluginAuthorizationACL = buildPerlPackage rec { @@ -459,15 +493,17 @@ rec { }; CatalystPluginAuthorizationRoles = buildPerlPackage { - name = "Catalyst-Plugin-Authorization-Roles-0.07"; + name = "Catalyst-Plugin-Authorization-Roles-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/Catalyst-Plugin-Authorization-Roles-0.07.tar.gz; - sha256 = "07b8zc7b06p0fprjj68fk7rgh781r9s3q8dx045sk03w0fnk3b4b"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz; + sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ CatalystPluginAuthentication CatalystRuntime SetObject UNIVERSALisa ]; + meta = { + description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; + license = "perl"; }; - propagatedBuildInputs = [ - CatalystRuntime CatalystPluginAuthentication - TestException SetObject UNIVERSALisa - ]; }; CatalystPluginConfigLoader = buildPerlPackage rec { @@ -497,15 +533,18 @@ rec { propagatedBuildInputs = [CatalystRuntime HTMLWidget]; }; - CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.34"; + CatalystPluginSession = buildPerlPackage { + name = "Catalyst-Plugin-Session-0.36"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "0vgm3pjymzxqnjn8cj8ld1wprwj3hq15n26djvjmnx6pwyf2ffgz"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-0.36.tar.gz; + sha256 = "14wgkrg3w69gwg6zg991k5f611xqsnyx0i0xzhw9rx2j5nf9rj4b"; + }; + buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; + propagatedBuildInputs = [ CatalystRuntime Moose MooseXEmulateClassAccessorFast MROCompat namespaceclean ObjectSignature ]; + meta = { + description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; + license = "perl"; }; - buildInputs = [ TestMockObject TestDeep ]; - propagatedBuildInputs = - [ CatalystRuntime ObjectSignature MROCompat ]; }; CatalystPluginSessionStateCookie = buildPerlPackage rec { @@ -528,22 +567,30 @@ rec { [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; }; - CatalystPluginStackTrace = buildPerlPackage rec { + CatalystPluginStackTrace = buildPerlPackage { name = "Catalyst-Plugin-StackTrace-0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-StackTrace-0.11.tar.gz; sha256 = "1ingivnga1yb4dqsj6icc4a58i9wdalzpn2qflsn8n2skgm223qb"; }; propagatedBuildInputs = [ CatalystRuntime DevelStackTrace MROCompat ]; + meta = { + description = "Display a stack trace on the debug screen"; + license = "perl"; + }; }; - CatalystPluginStaticSimple = buildPerlPackage rec { - name = "Catalyst-Plugin-Static-Simple-0.29"; + CatalystPluginStaticSimple = buildPerlPackage { + name = "Catalyst-Plugin-Static-Simple-0.30"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "1wjh1a24gksjxzzl9wblbaar5gjvlm38kndjx8629fm9dcbqvc14"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/Catalyst-Plugin-Static-Simple-0.30.tar.gz; + sha256 = "18zar1n4imgnv7b4dr5sxyikry4668ngqgc6f0dr210bqafvwv7w"; + }; + propagatedBuildInputs = [ CatalystRuntime MIMETypes Moose MooseXTypes namespaceautoclean ]; + meta = { + description = "Make serving static pages painless"; + license = "perl"; }; - propagatedBuildInputs = [CatalystRuntime MIMETypes]; }; CatalystViewDownload = buildPerlPackage rec { @@ -556,25 +603,31 @@ rec { propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; }; - CatalystViewJSON = buildPerlPackage rec { + CatalystViewJSON = buildPerlPackage { name = "Catalyst-View-JSON-0.33"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Catalyst-View-JSON-0.33.tar.gz; sha256 = "03yda9skcfnwkm4hf2a3y7g2rdjdia5hzfnll0h7z4wiyb8kxfii"; }; - propagatedBuildInputs = [ CatalystRuntime JSONAny YAML ]; + buildInputs = [ JSON ]; + propagatedBuildInputs = [ CatalystRuntime JSONAny MROCompat YAML ]; + meta = { + description = "JSON view for your data"; + license = "perl"; + }; }; - CatalystViewTT = buildPerlPackage rec { - name = "Catalyst-View-TT-0.37"; + CatalystViewTT = buildPerlPackage { + name = "Catalyst-View-TT-0.40"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "00vv4rkhpablmmfn70nybxy1jlfxhyf72ck3bch2gcfgqqysxvqz"; + url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-View-TT-0.40.tar.gz; + sha256 = "0j73mk631p9x0b0l24ikavh9nxl6lpya4g46fpanjk396d2zj8bs"; + }; + propagatedBuildInputs = [ CatalystRuntime ClassAccessor MROCompat PathClass TemplateToolkit TemplateTimer ]; + meta = { + description = "Template View Class"; + license = "perl"; }; - propagatedBuildInputs = [ - CatalystRuntime TemplateToolkit ClassAccessor - PathClass TemplateTimer - ]; }; CatalystXComponentTraits = buildPerlPackage rec { @@ -584,17 +637,21 @@ rec { sha256 = "0a2mhfgv0kqmaxf2crs8mqk44lyhd9qcwlpzhrc0b0dh4z503mr4"; }; propagatedBuildInputs = - [ CatalystRuntime MooseXTraitsPluggable NamespaceAutoclean ListMoreUtils ]; + [ CatalystRuntime MooseXTraitsPluggable namespaceautoclean ListMoreUtils ]; }; - CatalystXScriptServerStarman = buildPerlPackage rec { - name = "CatalystX-Script-Server-Starman-0.01"; + CatalystXScriptServerStarman = buildPerlPackage { + name = "CatalystX-Script-Server-Starman-0.02"; src = fetchurl { - url = "mirror://cpan/modules/by-module/CatalystX/${name}.tar.gz"; - sha256 = "18hpp35bjyw65x564m1m82mr0nmff6836vfjqdwf2lwsb4n8s4xr"; + url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.02.tar.gz; + sha256 = "0h02mpkc4cmi3jpvcd7iw7xyzx55bqvvl1qkf967gqkvpklm0qx5"; }; buildInputs = [ TestWWWMechanizeCatalyst ]; - propagatedBuildInputs = [ CatalystRuntime Starman ]; + propagatedBuildInputs = [ CatalystRuntime Moose namespaceautoclean Starman ]; + meta = { + description = "Replace the development server with Starman"; + license = "perl"; + }; }; CGICookieXS = buildPerlPackage rec { @@ -622,20 +679,27 @@ rec { buildInputs = [ DBFile ]; }; - CGISimple = buildPerlPackage rec { + CGISimple = buildPerlPackage { name = "CGI-Simple-1.113"; src = fetchurl { - url = "mirror://cpan/modules/by-module/CGI/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AN/ANDYA/CGI-Simple-1.113.tar.gz; sha256 = "0g8v0jd7dk310k6ncz47qa1cfrysi8yib1zwkhasv4zhswgqiqjj"; }; propagatedBuildInputs = [ IOStringy ]; + meta = { + description = "A Simple totally OO CGI interface that is CGI.pm compliant"; + license = "perl"; + }; }; ClassAccessor = buildPerlPackage { - name = "Class-Accessor-0.31"; + name = "Class-Accessor-0.34"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.31.tar.gz; - sha256 = "1a4v5qqdf9bipd6ba5n47mag0cmgwp97cid67i510aw96bcjrsiy"; + url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz; + sha256 = "1z6fqg0yz8gay15r1iasslv8f1n1mzjkrhs47fvbj3rqz36y1cfd"; + }; + meta = { + license = "perl"; }; }; @@ -648,14 +712,18 @@ rec { propagatedBuildInputs = [ClassAccessor]; }; - ClassAccessorGrouped = buildPerlPackage rec { - name = "Class-Accessor-Grouped-0.10003"; + ClassAccessorGrouped = buildPerlPackage { + name = "Class-Accessor-Grouped-0.10009"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; - sha256 = "036cyp74cdz8y5nig2b1iyqk6ps60sbqb0dqy0ybp3j5qiy28mix"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10009.tar.gz; + sha256 = "1cs6wvng9xxhmrps7qb7ccxswqkqskwj862dp4fqfra14aprlg4c"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; + meta = { + description = "Lets you build groups of accessors"; + license = "perl"; }; - buildInputs = [ TestMore TestException ]; - propagatedBuildInputs = [ ClassInspector SubName ClassXSAccessor ]; }; ClassAutouse = buildPerlPackage { @@ -674,31 +742,45 @@ rec { }; }; - ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.21"; + ClassC3 = buildPerlPackage { + name = "Class-C3-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/Class-C3-0.24.tar.gz; + sha256 = "1nhwf7bj7z5szk7sxmq0ynqh2k9p42a7zkfyikkairfb78xckpkz"; + }; + propagatedBuildInputs = [ AlgorithmC3 ]; + meta = { + description = "A pragma to use the C3 method resolution order algortihm"; + license = "perl"; }; }; - ClassC3AdoptNEXT = buildPerlPackage rec { - name = "Class-C3-Adopt-NEXT-0.07"; + ClassC3AdoptNEXT = buildPerlPackage { + name = "Class-C3-Adopt-NEXT-0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1kxbdq10vicrbz3i6hvml3mma5x0r523gfdd649f9bvrsizb0jxj"; + url = mirror://cpan/authors/id/F/FL/FLORA/Class-C3-Adopt-NEXT-0.13.tar.gz; + sha256 = "1rwgbx6dsy4rpas94p8wakzj7hrla1p15jnbm24kwhsv79gp91ld"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ ListMoreUtils MROCompat ]; + meta = { + homepage = http://search.cpan.org/dist/Class-C3-Adopt-NEXT; + description = "Make NEXT suck less"; + license = "perl"; }; - propagatedBuildInputs = [MROCompat TestException ListMoreUtils]; }; - ClassC3Componentised = buildPerlPackage rec { + ClassC3Componentised = buildPerlPackage { name = "Class-C3-Componentised-1.001000"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FR/FREW/Class-C3-Componentised-1.001000.tar.gz; sha256 = "1nzav8arxll0rya7r2vp032s3acliihbb9mjlfa13rywhh77bzvl"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; + meta = { + license = "perl"; + }; }; ClassDataAccessor = buildPerlPackage { @@ -725,11 +807,15 @@ rec { }; }; - ClassInspector = buildPerlPackage rec { - name = "Class-Inspector-1.24"; + ClassInspector = buildPerlPackage { + name = "Class-Inspector-1.28"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "0rhsn73g516knx5djqzlgygjk8ij6xxjkm1sim0facvd4z0wlw0a"; + url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.28.tar.gz; + sha256 = "04iij8dbcgaim7g109frpyf7mh4ydsd8zh53r53chk0zxnivg91w"; + }; + meta = { + description = "Get information about a class and its structure"; + license = "perl"; }; }; @@ -741,6 +827,20 @@ rec { }; }; + ClassMethodModifiers = buildPerlPackage { + name = "Class-Method-Modifiers-2.00"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SA/SARTAK/Class-Method-Modifiers-2.00.tar.gz; + sha256 = "0lvj38ahqqyhv9dpi7ks1cq35f19nfw8ygxw22x2mcmagl8mnkhs"; + }; + buildInputs = [ TestFatal ]; + meta = { + homepage = https://github.com/sartak/Class-Method-Modifiers/tree; + description = "Provides Moose-like method modifiers"; + license = "perl"; + }; + }; + ClassMix = buildPerlPackage rec { name = "Class-Mix-0.005"; src = fetchurl { @@ -768,24 +868,34 @@ rec { }; }; - ClassLoad = buildPerlPackage rec { - name = "Class-Load-0.12"; + ClassLoad = buildPerlPackage { + name = "Class-Load-0.20"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; - sha256 = "0siw8hyqnmn0flk1hbd6fnnfqlhkgfr1d5442rri1d8a0rs1a36r"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Load-0.20.tar.gz; + sha256 = "084cxrm0hcpyz3ly1iqkcjpl4bs03n42na37d3pzwa8xbs44ag42"; + }; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "A working (require "Class::Name") and more"; + license = "perl5"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ DataOptList PackageStash ModuleRuntime ]; }; - ClassLoadXS = buildModule rec { - name = "Class-Load-XS-0.03"; + ClassLoadXS = buildPerlModule { + name = "Class-Load-XS-0.06"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; - sha256 = "1k3fffm4z6hvml5gqh27p7l78xs220s2d7ybd2a42akxrx8gk9r8"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Load-XS-0.06.tar.gz; + sha256 = "1dl739nnfw2j9rjgqxx24jqbanyvncqfnkwm27af8ik6kiqk50ik"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ ModuleImplementation TestFatal TestRequires ]; propagatedBuildInputs = [ ClassLoad ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "XS implementation of parts of Class::Load"; + license = "artistic_2"; + }; }; ClassUnload = buildPerlPackage rec { @@ -797,33 +907,58 @@ rec { propagatedBuildInputs = [ ClassInspector ]; }; - ClassXSAccessor = buildPerlPackage rec { - name = "Class-XSAccessor-1.13"; + ClassXSAccessor = buildPerlPackage { + name = "Class-XSAccessor-1.16"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Class/${name}.tar.gz"; - sha256 = "1nj21xq8bqvfz2mafrfskzw2p2j48b5k3rqxgxk99lw5ysmkz834"; + url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.16.tar.gz; + sha256 = "1yjpw9kssy4m52407k45hxjnqz02494z7x8j44pjzkyi8msafvg5"; + }; + meta = { + description = "Generate fast XS accessors without runtime compilation"; + license = "perl5"; }; }; - Clone = buildPerlPackage rec { - name = "Clone-0.31"; + Clone = buildPerlPackage { + name = "Clone-0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RD/RDF/${name}.tar.gz"; - sha256 = "0fazl71hrc0r56gnc7vzwz9283p7h62gc8wsna7zgyfvrajjnhwl"; + url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.34.tar.gz; + sha256 = "0qk32i2ncmn7wm2dbjpwhwa4js079bgfs4ayb90mnxjhwq5358ix"; + }; + meta = { + description = "Recursively copy Perl datatypes"; + license = "perl5"; }; }; CommonSense = buildPerlPackage rec { - name = "common-sense-3.4"; + name = "common-sense-3.6"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "0s1lym5519gwdgwd6c6cq9c9iagr7bmb16jklq5iq3nsdyb0qc2l"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.6.tar.gz; + sha256 = "0nkbp1by0mpvg1x6053fbh9dl8nnswlyfmqp8k2lppd717hw5ql6"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; }; }; - CompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 { - inherit fetchurl buildPerlPackage; - inherit (pkgs) bzip2; + CompressRawBzip2 = buildPerlPackage { + name = "Compress-Raw-Bzip2-2.060"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.060.tar.gz; + sha256 = "02azwhglk2w68aa47sjqhj6vwzi66mv4hwal87jccjfy17gcwvx7"; + }; + + # Don't build a private copy of bzip2. + BUILD_BZIP2 = false; + BZIP2_LIB = "${pkgs.bzip2}/lib"; + BZIP2_INCLUDE = "${pkgs.bzip2}/include"; + + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Low-Level Interface to bzip2 compression library"; + license = "perl5"; + }; }; CompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib { @@ -850,11 +985,14 @@ rec { }; }; - ConfigGeneral = buildPerlPackage rec { - name = "Config-General-2.50"; + ConfigGeneral = buildPerlPackage { + name = "Config-General-2.51"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; - sha256 = "0ff5qh6dx8qijbkx5yfvn3fhn5m2hkcl8yjmqxwnvcg78h33s3ps"; + url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.51.tar.gz; + sha256 = "1khby072f10jbml0dlh82bg1s91ph8z6xa9bpk0l180q936k1xcg"; + }; + meta = { + license = "perl"; }; }; @@ -901,21 +1039,59 @@ rec { propagatedBuildInputs = [ CGICookieXS ]; }; - CPANMeta = buildPerlPackage rec { - name = "CPAN-Meta-2.112150"; + CPANMeta = buildPerlPackage { + name = "CPAN-Meta-2.120921"; src = fetchurl { - url = "mirror://cpan/modules/by-module/CPAN/${name}.tar.gz"; - sha256 = "0k48ccws3j158mrr348gishh5q7vg4fmx36fgrnnnydv0psic4n0"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.120921.tar.gz; + sha256 = "12cprk636jaklc97vdh55yjvzcr13h3csdnv3dgna84r2jijka79"; + }; + propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements ]; + meta = { + homepage = https://github.com/dagolden/cpan-meta; + description = "The distribution metadata for a CPAN dist"; + license = "perl5"; }; - propagatedBuildInputs = - [ CPANMetaYAML JSONPP ParseCPANMeta VersionRequirements version ]; }; - CPANMetaYAML = buildPerlPackage rec { - name = "CPAN-Meta-YAML-0.003"; + CPANMetaCheck = buildPerlPackage { + name = "CPAN-Meta-Check-0.004"; src = fetchurl { - url = "mirror://cpan/modules/by-module/CPAN/${name}.tar.gz"; - sha256 = "1mdmn9znk60izxdvvawsylv7n85x4y6lx8pa0gnkcp6d96q031af"; + url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.004.tar.gz; + sha256 = "0ccybgfc0p41shmc6nmbg20xljq2ygfjcxmyaf6y07yk6wdcyf7s"; + }; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Verify requirements in a CPAN::Meta object"; + license = "perl5"; + }; + }; + + CPANMetaRequirements = buildPerlPackage { + name = "CPAN-Meta-Requirements-2.122"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz; + sha256 = "1fq2blw9ynja34fm9ck24m3qcpyk0hp25dhxvgs01k7yz64ryffh"; + }; + buildInputs = [ TestMore ]; + meta = { + homepage = https://github.com/dagolden/cpan-meta-requirements; + description = "A set of version requirements for a CPAN dist"; + license = "perl5"; + }; + }; + + CPANMetaYAML = buildPerlPackage { + name = "CPAN-Meta-YAML-0.008"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.008.tar.gz; + sha256 = "1fxc8ybn6mdgzxyq1n69rgihmpfaarfclmbdw2rznya5zg2b0nz0"; + }; + meta = { + homepage = https://github.com/dagolden/cpan-meta-yaml; + description = "Read and write a subset of YAML for CPAN Meta files"; + license = "perl5"; }; }; @@ -1052,12 +1228,16 @@ rec { propagatedBuildInputs = [ FileFindRule ]; }; - DataDump = buildPerlPackage rec { + DataDump = buildPerlPackage { name = "Data-Dump-1.21"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; + url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.21.tar.gz; sha256 = "1fcy6q8p406ag8g50l7znns3kxazfb458l6kw8pbsp4axnkz9ydx"; }; + meta = { + description = "Pretty printing of data structures"; + license = "perl"; + }; }; DataDumperConcise = buildPerlPackage rec { @@ -1102,13 +1282,18 @@ rec { }; }; - DataOptList = buildPerlPackage rec { + DataOptList = buildPerlPackage { name = "Data-OptList-0.107"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.107.tar.gz; sha256 = "0r2sbvh1kj69al5crg394v5j5wkffvqdb17fz1rjfgb6h3v93xi8"; }; - propagatedBuildInputs = [SubInstall ParamsUtil]; + propagatedBuildInputs = [ ParamsUtil SubInstall ]; + meta = { + homepage = http://github.com/rjbs/data-optlist; + description = "Parse and validate simple name/value option pairs"; + license = "perl5"; + }; }; DataPage = buildPerlPackage { @@ -1136,7 +1321,7 @@ rec { }; buildInputs = [ TestRequires ]; propagatedBuildInputs = - [ ClassLoad Moose TaskWeaken TieToObject NamespaceClean ]; + [ ClassLoad Moose TaskWeaken TieToObject namespaceclean ]; }; DateCalc = buildPerlPackage { @@ -1156,14 +1341,19 @@ rec { }; }; - DateTime = buildModule rec { - name = "DateTime-0.74"; + DateTime = buildPerlModule { + name = "DateTime-0.78"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0wabln41nk73w4j3lc1ri8jzmxd3yyskdlagv9jflqaz8awcs8qy"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-0.78.tar.gz; + sha256 = "0gicc3ib42jba989lxwy5i5sp4w3bmakdimgfxqbb57mbdarpxc5"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone MathRound ]; + propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ParamsValidate ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "A date and time object"; + license = "artistic_2"; + }; }; DateTimeFormatBuilder = buildPerlPackage rec { @@ -1220,6 +1410,19 @@ rec { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; }; + DevelCaller = buildPerlPackage { + name = "Devel-Caller-2.06"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz; + sha256 = "1pxpimifzmnjnvf4icclx77myc15ahh0k56sj1djad1855mawwva"; + }; + propagatedBuildInputs = [ PadWalker ]; + meta = { + description = "Meatier versions of C"; + license = "perl5"; + }; + }; + DevelChecklib = buildPerlPackage rec { name = "Devel-CheckLib-0.98"; src = fetchurl { @@ -1241,7 +1444,7 @@ rec { DBDPg = import ../development/perl-modules/DBD-Pg { inherit stdenv fetchurl buildPerlPackage DBI; - inherit (pkgs) postgresql; + postgresql = pkgs.postgresql91; }; DBFile = import ../development/perl-modules/DB_File { @@ -1249,38 +1452,46 @@ rec { inherit (pkgs) db4; }; - DBI = buildPerlPackage rec { - name = "DBI-1.616"; + DBI = buildPerlPackage { + name = "DBI-1.623"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.623.tar.gz; + sha256 = "18g3bl4bg0ww0n3aqc0gg3ckiql7cyf7v2aqma9ga086xgwp6bci"; + }; + meta = { + homepage = http://dbi.perl.org/; + description = "Database independent interface for Perl"; + license = "perl5"; }; }; - DBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.08196"; + DBIxClass = buildPerlPackage { + name = "DBIx-Class-0.08204"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARODLAND/${name}.tar.gz"; - sha256 = "15k1kgbrsnkwr0ib6cyr114zk904lisy4k09gfiynag9wjhv47lm"; + url = mirror://cpan/authors/id/G/GE/GETTY/DBIx-Class-0.08204.tar.gz; + sha256 = "0pghq6b60fyffb233hdk9qi47wcbf2sgp08679v9nxh4i5qp49gx"; + }; + buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; + meta = { + homepage = http://www.dbix-class.org/; + description = "Extensible and flexible object <-> relational mapper."; + license = "perl"; }; - buildInputs = [ DBDSQLite TestException TestWarn ]; - propagatedBuildInputs = - [ PackageStash ClassAccessorGrouped ClassC3Componentised - ClassInspector ConfigAny ContextPreserve DBI DataCompare - DataDumperConcise DataPage HashMerge MROCompat ModuleFind - PathClass SQLAbstract ScopeGuard SubName TryTiny - NamespaceClean - ]; }; - DBIxClassCursorCached = buildPerlPackage rec { + DBIxClassCursorCached = buildPerlPackage { name = "DBIx-Class-Cursor-Cached-1.001002"; src = fetchurl { - url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001002.tar.gz; sha256 = "19r7jr6pknxiirrybq0cd0lnr76xiw05arnfqgk9nrhp6c7vvil0"; }; - buildInputs = [ DBDSQLite ]; - propagatedBuildInputs = [ CacheCache DBIxClass CarpClan ]; + buildInputs = [ CacheCache DBDSQLite ]; + propagatedBuildInputs = [ CarpClan DBIxClass ]; + meta = { + description = "Cursor class with built-in caching support"; + license = "perl"; + }; }; DBIxClassHTMLWidget = buildPerlPackage rec { @@ -1292,29 +1503,44 @@ rec { propagatedBuildInputs = [DBIxClass HTMLWidget]; }; - DBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.07014"; + DBIxClassIntrospectableM2M = buildPerlPackage { + name = "DBIx-Class-IntrospectableM2M-0.001001"; src = fetchurl { - url = "mirror://cpan/modules/by-module/DBIx/${name}.tar.gz"; - sha256 = "0qrsh6i8p4mpx5bapn40cpsbvnvzivli71gymbiqjd0mjflbsjf6"; + url = mirror://cpan/authors/id/G/GR/GRODITI/DBIx-Class-IntrospectableM2M-0.001001.tar.gz; + sha256 = "0p9zx1yc1f6jg583l206wilsni2v8mlngc2vf2q8yn10pmy4y6wm"; + }; + propagatedBuildInputs = [ DBIxClass ]; + meta = { + description = "Introspect many-to-many relationships"; + license = "perl"; }; - buildInputs = [ TestException TestMore TestWarn DBDSQLite ]; - propagatedBuildInputs = - [ DataDump LinguaENInflectNumber LinguaENInflectPhrase - ClassAccessor ClassAccessorGrouped ClassC3Componentised - MROCompat CarpClan DBIxClass ClassLoad ClassUnload - ListMoreUtils NamespaceClean ScopeGuard TryTiny TaskWeaken - StringCamelCase StringToIdentifierEN - ]; }; - DevelGlobalDestruction = buildPerlPackage rec { - name = "Devel-GlobalDestruction-0.02"; + DBIxClassSchemaLoader = buildPerlPackage { + name = "DBIx-Class-Schema-Loader-0.07033"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NU/NUFFIN/${name}.tar.gz"; - sha256 = "174m5dx2z89h4308gx6s6vmg93qzaq0bh9m91hp2vqbyialnarhw"; + url = mirror://cpan/authors/id/R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07033.tar.gz; + sha256 = "1vrcxxlbvdch5r9v5i6vrb4fqqfbpxybpdqndmlnc2jzlqjwjahi"; + }; + buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBI DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose namespaceautoclean TestException TestPod TestWarn ]; + propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DataDump DBIxClass HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger ListMoreUtils MROCompat namespaceclean ScopeGuard StringCamelCase StringToIdentifierEN SubName TaskWeaken TryTiny ]; + meta = { + description = "Create a DBIx::Class::Schema based on a database"; + license = "perl"; + }; + }; + + DevelGlobalDestruction = buildPerlPackage { + name = "Devel-GlobalDestruction-0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Devel-GlobalDestruction-0.09.tar.gz; + sha256 = "1hvrv88167rc2chqgxpd6q0ir5fki1q6r3w11v3lxfs118fdi65m"; + }; + propagatedBuildInputs = [ SubExporterProgressive ]; + meta = { + homepage = http://search.cpan.org/dist/Devel-GlobalDestruction; + license = "perl5"; }; - propagatedBuildInputs = [SubExporter ScopeGuard]; }; DevelHide = buildPerlPackage rec { @@ -1325,21 +1551,30 @@ rec { }; }; - DevelStackTrace = buildPerlPackage rec { - name = "Devel-StackTrace-1.27"; + DevelStackTrace = buildPerlPackage { + name = "Devel-StackTrace-1.30"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz"; - sha256 = "01p7b9cmji582bld81c3b84jffhdi59zydnxjj6fh3m29zyysmfs"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz; + sha256 = "1m13wzg4pmbc0f1w2rn9ybqwkqg66zw9zv34ayk7gr3349v7kbzl"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "An object representing a stack trace"; + license = "artistic_2"; }; }; - DevelStackTraceAsHTML = buildPerlPackage rec { + DevelStackTraceAsHTML = buildPerlPackage { name = "Devel-StackTrace-AsHTML-0.11"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Devel/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.11.tar.gz; sha256 = "0y0r42gszp3bxbs9j2nn3xgs8ij1cnadrywwwdc6r0y8m0siyapg"; }; propagatedBuildInputs = [ DevelStackTrace ]; + meta = { + description = "Displays stack trace in HTML"; + license = "perl"; + }; }; DevelSymdump = buildPerlPackage rec { @@ -1362,12 +1597,15 @@ rec { }; DigestHMAC = buildPerlPackage { - name = "Digest-HMAC-1.01"; + name = "Digest-HMAC-1.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.01.tar.gz; - sha256 = "042d6nknc5icxqsy5asrh8v2shmvg7b3vbj95jyk4sbqlqpacwz3"; + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; + sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; + }; + meta = { + description = "Keyed-Hashing for Message Authentication"; + license = "perl"; }; - propagatedBuildInputs = [DigestSHA1]; }; DigestMD4 = buildPerlPackage rec { @@ -1378,55 +1616,70 @@ rec { }; }; - DigestSHA = buildPerlPackage rec { - name = "Digest-SHA-5.47"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSHELOR/${name}.tar.gz"; - sha256 = "1xk9hdds4dk5iklxr8fdfbgfvd8cwgcjh5jqmjxhaw57ss2dh5wx"; - }; - }; + DigestSHA = null; DigestSHA1 = buildPerlPackage { - name = "Digest-SHA1-2.12"; + name = "Digest-SHA1-2.13"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.12.tar.gz; - sha256 = "19gmbb3yb9pr0y02c6rf99zh14a7a67l4frl7cs0lzpxb41484xa"; + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz; + sha256 = "1k23p5pjk42vvzg8xcn4iwdii47i0qm4awdzgbmz08bl331dmhb8"; + }; + meta = { + description = "Perl interface to the SHA-1 algorithm"; + license = "perl"; }; }; - DistCheckConflicts = buildPerlPackage rec { + DistCheckConflicts = buildPerlPackage { name = "Dist-CheckConflicts-0.02"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.02.tar.gz; sha256 = "1lh7j20vvsh4dyh74hr0wnabyv8vcdkilfi93m2fbk69qk3w995j"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ListMoreUtils SubExporter ]; + propagatedBuildInputs = [ SubExporter ListMoreUtils ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Declare version conflicts for your dist"; + license = "perl5"; + }; }; - EmailAbstract = buildPerlPackage rec { + EmailAbstract = buildPerlPackage { name = "Email-Abstract-3.004"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.004.tar.gz; sha256 = "0fiaagxc2hy5g3qiipv4cspkwbaggdmsxbll1f4jx2qnq5hm668d"; }; propagatedBuildInputs = [ EmailSimple MROCompat ]; - }; - - EmailAddress = buildPerlPackage rec { - name = "Email-Address-1.889"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0icpln4cs058x5lbqsg4wzb8p02qv7bb1z6ljxh70yd3y1mn0nxn"; + meta = { + license = "perl"; }; }; - EmailDateFormat = buildPerlPackage rec { + EmailAddress = buildPerlPackage { + name = "Email-Address-1.897"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.897.tar.gz; + sha256 = "17v5jvwhkd5clyihwsldnh4k7vpmaisn064s3mkxlr9dnz7nd10r"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "RFC 2822 Address Parsing"; + license = "perl5"; + }; + }; + + EmailDateFormat = buildPerlPackage { name = "Email-Date-Format-1.002"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.002.tar.gz; sha256 = "114fqcnmvzi0z100yx89j6rgwbicb0bslswhyr8z2pzsvwv3czqc"; }; + meta = { + description = "Produce RFC 8822 date strings"; + license = "perl"; + }; }; EmailSend = buildPerlPackage rec { @@ -1438,26 +1691,31 @@ rec { propagatedBuildInputs = [EmailSimple EmailAddress ModulePluggable ReturnValue]; }; - EmailSender = buildPerlPackage rec { + EmailSender = buildPerlPackage { name = "Email-Sender-0.120002"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-0.120002.tar.gz; sha256 = "1cp735ndmh76xzijsm1hd0yh0m9yj34jc8akjhidkn677h2021dc"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = - [ CaptureTiny EmailAbstract EmailAddress ListMoreUtils Moose - Throwable TryTiny - ]; + propagatedBuildInputs = [ CaptureTiny EmailAbstract EmailAddress EmailSimple ListMoreUtils Moose Throwable TryTiny ]; + meta = { + homepage = https://github.com/rjbs/email-sender; + description = "A library for sending email"; + license = "perl5"; + }; }; - EmailSimple = buildPerlPackage rec { - name = "Email-Simple-2.100"; + EmailSimple = buildPerlPackage { + name = "Email-Simple-2.102"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1q86p9r5sb1dwdhcbnkfrbx08440cf74vzgrqc05cgi8mmhdfsh9"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.102.tar.gz; + sha256 = "19da1a06vnixhqfl41mfjrihvvxjgdgkq9bczp8k9mpr29xlbnq4"; }; propagatedBuildInputs = [ EmailDateFormat ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + license = "perl5"; + }; }; EmailValid = buildPerlPackage { @@ -1494,14 +1752,19 @@ rec { }; }; - EvalClosure = buildPerlPackage rec { - name = "Eval-Closure-0.06"; + EvalClosure = buildPerlPackage { + name = "Eval-Closure-0.08"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "0qjfigd7r3xwizf8wff3g2mhidbqqlb6xy125iwd03f3i5hmnhic"; + url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.08.tar.gz; + sha256 = "01x449ljj8mhr3jgfvnhzn0zz3xc81krslxiq29srqccsqjf933k"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ SubExporter TryTiny ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Safely and cleanly create closures via string eval"; + license = "perl5"; + }; }; ExceptionClass = buildPerlPackage rec { @@ -1521,14 +1784,6 @@ rec { }; }; - ExtUtilsInstall = buildPerlPackage rec { - name = "ExtUtils-Install-1.54"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "19igil4iwh3jdyvjm8s0ypm8wxsny6nv4z3b3lkwhq0ccjgd3rp3"; - }; - }; - ExtUtilsMakeMaker = buildPerlPackage rec{ name = "ExtUtils-MakeMaker-6.59"; src = fetchurl { @@ -1557,7 +1812,7 @@ rec { }; }; - FileChangeNotify = buildModule rec { + FileChangeNotify = buildPerlModule rec { name = "File-ChangeNotify-0.20"; src = fetchurl { url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; @@ -1566,7 +1821,7 @@ rec { buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassMOP Moose MooseXParamsValidate MooseXSemiAffordanceAccessor - NamespaceAutoclean + namespaceautoclean ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; }; @@ -1655,36 +1910,42 @@ rec { }; }; - FileShareDir = buildPerlPackage rec { - name = "File-ShareDir-1.00"; + FileShareDir = buildPerlPackage { + name = "File-ShareDir-1.03"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1afr1r1ys2ij8i4r0i85hfrgrbvcha8c7cgkhcrdya1f0lnpw59z"; + url = mirror://cpan/authors/id/A/AD/ADAMK/File-ShareDir-1.03.tar.gz; + sha256 = "0fczaqjxyzmzgrmn3ib84cj6pd2085wsvni3wf5b018i21j2wi2r"; + }; + propagatedBuildInputs = [ ClassInspector ]; + meta = { + description = "Locate per-dist and per-module shared files"; + license = "perl"; }; - propagatedBuildInputs = [ClassInspector ParamsUtil]; }; - FilesysNotifySimple = buildPerlPackage rec { + FilesysNotifySimple = buildPerlPackage { name = "Filesys-Notify-Simple-0.08"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Filesys/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.08.tar.gz; sha256 = "042klyvi8fbkhmyg1h7883bbjdhiclmky9w2wfga7piq5il6nxgi"; }; - }; - - FileTemp = buildPerlPackage rec { - name = "File-Temp-0.22"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TJ/TJENNESS/${name}.tar.gz"; - sha256 = "11a738swa2as5d6mva798slxnd7ndhqii027ydm0av3y94i957wq"; + meta = { + description = "Simple and dumb file system watcher"; + license = "perl"; }; }; - FileSlurp = buildPerlPackage rec { - name = "File-Slurp-9999.13"; + FileTemp = null; + + FileSlurp = buildPerlPackage { + name = "File-Slurp-9999.19"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1rdkih4iv77y4xaprwdaw85d8pmja01152ngw66rb1h9rby3n1dv"; + url = mirror://cpan/authors/id/U/UR/URI/File-Slurp-9999.19.tar.gz; + sha256 = "0hrn4nipwx40d6ji8ssgr5nw986z9iqq8cn0kdpbszh9jplynaff"; + }; + meta = { + description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; + license = "perl"; }; }; @@ -1764,14 +2025,18 @@ rec { }; }; - GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.090"; + GetoptLongDescriptive = buildPerlPackage { + name = "Getopt-Long-Descriptive-0.093"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Getopt/${name}.tar.gz"; - sha256 = "17ghqd50y3627ajc7wl6n7sv055p2gg0h40lavx7qhwyg5rf46lw"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.093.tar.gz; + sha256 = "0iccps0jlcjm68i5yywgs477plfnkc6b2386bzb99blm3jwdfyac"; + }; + propagatedBuildInputs = [ ParamsValidate SubExporter SubExporterUtil ]; + meta = { + homepage = https://github.com/rjbs/Getopt-Long-Descriptive; + description = "Getopt::Long, but simpler and more powerful"; + license = "perl5"; }; - buildInputs = [ TestMore ]; - propagatedBuildInputs = [ ParamsValidate SubExporter ]; }; Graph = buildPerlPackage rec { @@ -1818,13 +2083,20 @@ rec { sha256 = "07h7dyldxwqhq3x4fp9hacnc4vgipp0jk50b5cbvib975nfxx98z"; }; propagatedBuildInputs = [ Clone ]; + meta = { + description = "Merges arbitrarily deep hashes into a single hash"; + }; }; - HashMultiValue = buildPerlPackage rec { - name = "Hash-MultiValue-0.10"; + HashMultiValue = buildPerlPackage { + name = "Hash-MultiValue-0.13"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Hash/${name}.tar.gz"; - sha256 = "1n9klrg01myij2svcmdc212msmsr3cmsl2yw5k9my8j3s96b5yn1"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Hash-MultiValue-0.13.tar.gz; + sha256 = "0flflmk2kxq9sjmhxr1547lidgigibhck912j4ambdwg21sbxjjd"; + }; + meta = { + description = "Store multiple values per key"; + license = "perl"; }; }; @@ -1837,13 +2109,17 @@ rec { buildInputs = [ pkgs.unzip ]; }; - HTMLForm = buildPerlPackage rec { - name = "HTML-Form-6.00"; + HTMLForm = buildPerlPackage { + name = "HTML-Form-6.03"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "11s9mlybjm14sa6m3wcfjf9pv00yynv0yk4parx44ga9h1a6y6xl"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Form-6.03.tar.gz; + sha256 = "0dpwr7yz6hjc3bcqgcbdzjjk9l58ycdjmbam9nfcmm85y2a1vh38"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage URI ]; + meta = { + description = "Class that represents an HTML form element"; + license = "perl"; + }; }; HTMLFormFu = buildPerlPackage rec { @@ -1865,13 +2141,17 @@ rec { ]; }; - HTMLParser = buildPerlPackage rec { - name = "HTML-Parser-3.68"; + HTMLParser = buildPerlPackage { + name = "HTML-Parser-3.69"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "1hhniqqpvi01vxsyvmcj677yg7a12zy0a3ynwxwg3ig6shn8a3j3"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.69.tar.gz; + sha256 = "01i4lj37dgwbj9mna756dzzz5lvx7adcnjk9s0hskqq0cn81r2vl"; + }; + propagatedBuildInputs = [ HTMLTagset ]; + meta = { + description = "HTML parser class"; + license = "perl"; }; - propagatedBuildInputs = [HTMLTagset]; }; HTMLScrubber = buildPerlPackage { @@ -1917,13 +2197,19 @@ rec { buildInputs = [TestPod]; }; - HTMLTree = buildPerlPackage rec { - name = "HTML-Tree-4.2"; + HTMLTree = buildPerlModule { + name = "HTML-Tree-5.03"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JF/JFEARN/${name}.tar.gz"; - sha256 = "80e4e3caa5e0e025dee5ed383a8d4cc7479ae4802184c4757dafd147a8fca7c9"; + url = mirror://cpan/authors/id/C/CJ/CJM/HTML-Tree-5.03.tar.gz; + sha256 = "13qlqbpixw470gnck0xgny8hyjj576m8y24bba2p9ai2lvy76vbx"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ HTMLParser HTMLTagset ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Work with HTML in a DOM-like tree structure"; + license = "perl5"; }; - propagatedBuildInputs = [HTMLParser]; }; HTMLWidget = buildPerlPackage { @@ -1939,30 +2225,55 @@ rec { ]; }; - HTTPBody = buildPerlPackage rec { - name = "HTTP-Body-1.12"; + HTTPBody = buildPerlPackage { + name = "HTTP-Body-1.17"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "1229hhcm762n9x82jkhl8hmjcaigprcsrhymcdbkqlwch2agm6g2"; + url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.17.tar.gz; + sha256 = "1476zdcg1cdal3ik6ccwm3rqfgsdac6b63f92wmipvn8lkjdl70k"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ LWP ]; + propagatedBuildInputs = [ HTTPMessage ]; + meta = { + description = "HTTP Body Parser"; + license = "perl"; + }; }; - HTTPCookies = buildPerlPackage rec { - name = "HTTP-Cookies-6.00"; + HTTPCookies = buildPerlPackage { + name = "HTTP-Cookies-6.01"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "0758c3rj22z1bj7pbypmh1jadgd6w68nn8inhds96r39jhc79d9h"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Cookies-6.01.tar.gz; + sha256 = "087bqmg22dg3vj7gssh3pcsh9y1scimkbl5h1kc8jqyfhgisvlzm"; }; propagatedBuildInputs = [ HTTPDate HTTPMessage ]; + meta = { + description = "HTTP cookie jars"; + license = "perl"; + }; }; - HTTPDate = buildPerlPackage rec { - name = "HTTP-Date-6.00"; + HTTPDaemon = buildPerlPackage { + name = "HTTP-Daemon-6.01"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "15nrnfir4xqdd3lm0s0jgh9zwxx5ylmvl63xqmj5wipzl4l76vs6"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; + sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; + }; + propagatedBuildInputs = [ HTTPDate HTTPMessage LWPMediaTypes ]; + meta = { + description = "A simple http server class"; + license = "perl"; + }; + }; + + HTTPDate = buildPerlPackage { + name = "HTTP-Date-6.02"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Date-6.02.tar.gz; + sha256 = "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8"; + }; + meta = { + description = "Date conversion routines"; + license = "perl"; }; }; @@ -1982,13 +2293,30 @@ rec { }; }; - HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.02"; + HTTPMessage = buildPerlPackage { + name = "HTTP-Message-6.06"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "10ai2vabbx6yqsyz6rbi7hp4vljmlq9kyn74jvjp95la5v4b6c93"; + url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Message-6.06.tar.gz; + sha256 = "0qxdrcak97azjvqyx1anpb2ky6vp6vc37x0wcfjdqfajkh09fzh8"; + }; + propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; + meta = { + description = "HTTP style messages"; + license = "perl"; + }; + }; + + HTTPNegotiate = buildPerlPackage { + name = "HTTP-Negotiate-6.01"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz; + sha256 = "05p053vjs5g91v5cmjnny7a3xzddz5k7vnjw81wfh01ilqg9qwhw"; + }; + propagatedBuildInputs = [ HTTPMessage ]; + meta = { + description = "Choose a variant to serve"; + license = "perl"; }; - propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI ]; }; HTTPParserXS = buildPerlPackage rec { @@ -2000,15 +2328,6 @@ rec { buildInputs = [ TestMore ]; }; - HTTPRequest = buildPerlPackage rec { - name = "HTTP-Message-6.03"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b"; - }; - propagatedBuildInputs = [ HTTPDate URI HTMLParser LWP ]; - }; - HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -2018,23 +2337,28 @@ rec { propagatedBuildInputs = [ ClassAccessor LWP ]; }; - HTTPResponseEncoding = buildPerlPackage rec { + HTTPResponseEncoding = buildPerlPackage { name = "HTTP-Response-Encoding-0.06"; src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; - propagatedBuildInputs = [ LWP ]; + propagatedBuildInputs = [ LWPUserAgent HTTPMessage ]; + meta = { + description = "Adds encoding() to HTTP::Response"; + }; }; - HTTPServerSimple = buildPerlPackage rec { - name = "HTTP-Server-Simple-0.38"; + HTTPServerSimple = buildPerlPackage { + name = "HTTP-Server-Simple-0.44"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JE/JESSE/${name}.tar.gz"; - sha256 = "1m1lmpbg0zhiv2vyc3fyyqfsv3jhhb2mbdl5624fqb0va2pnla6n"; + url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.44.tar.gz; + sha256 = "05klpfkss2a6i5ihmvcm27fyar0f2v4ispg2f49agab3va1gix6g"; }; - propagatedBuildInputs = [URI]; doCheck = false; + meta = { + license = "perl"; + }; }; I18NLangTags = buildPerlPackage { @@ -2053,15 +2377,18 @@ rec { }; }; - IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.037"; + IOCompress = buildPerlPackage { + name = "IO-Compress-2.060"; src = fetchurl { - url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "07hs3afzg9ry6ir2f9rf3fg8b129cihs989mr0nh9wdvxgxqmr1q"; + url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.060.tar.gz; + sha256 = "03zaq9xzg0z9wcgj1hws8zhzdgdlwiz48nh6sy663bn7rzxm5k28"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; - # Work around a self-referencing Makefile variable. - makeFlags = "INSTALLARCHLIB=$(INSTALLSITEARCH)"; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "IO Interface to compressed data files/buffers"; + license = "perl5"; + }; }; IODigest = buildPerlPackage { @@ -2073,6 +2400,19 @@ rec { propagatedBuildInputs = [PerlIOviadynamic]; }; + IOHTML = buildPerlPackage { + name = "IO-HTML-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-0.04.tar.gz; + sha256 = "0c4hc76c1gypdwfasnibr2qlf9x3bnhyw357lhqlrczbm6vn8hw5"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Open an HTML file with automatic charset detection"; + license = "perl5"; + }; + }; + IOLockedFile = buildPerlPackage rec { name = "IO-LockedFile-0.23"; src = fetchurl { @@ -2132,13 +2472,18 @@ rec { }; }; - IPCRun = buildPerlPackage rec { - name = "IPC-Run-0.82"; + IPCRun = buildPerlPackage { + name = "IPC-Run-0.92"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "1v5yfavvhxscqkdl68xs7i7vcp9drl3y1iawppzwqcl1fprd58ip"; + url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-0.92.tar.gz; + sha256 = "1lj6kmr8rs6na77b3v673vvw6qsr511bmhgf257x4xqmvxnv91p1"; }; doCheck = false; /* attempts a network connection to localhost */ + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; + license = "perl5"; + }; }; IPCRun3 = buildPerlPackage rec { @@ -2184,7 +2529,7 @@ rec { licenses = [ "GPLv1+" /* or */ "Artistic" ]; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; }; @@ -2254,39 +2599,53 @@ rec { }; }; - JSON = buildPerlPackage rec { + JSON = buildPerlPackage { name = "JSON-2.53"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz; sha256 = "0rfms17d0pkai26kqyzaylbr5wxcrrhyjkyshq85l41xb0g1iplh"; }; - propagatedBuildInputs = [JSONXS]; + meta = { + description = "JSON (JavaScript Object Notation) encoder/decoder"; + license = "perl"; + }; }; - JSONAny = buildPerlPackage rec { - name = "JSON-Any-1.19"; + JSONAny = buildPerlPackage { + name = "JSON-Any-1.29"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PERIGRIN/${name}.tar.gz"; - sha256 = "16h2p2qcbh0a6wfr5lfspilmjmpdnkn1rrkqw34v8xq1a77fl870"; + url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; + sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; + }; + buildInputs = [ JSON ]; + meta = { + description = "Wrapper Class for the various JSON classes."; + license = "perl"; }; - propagatedBuildInputs = [JSON]; }; JSONPP = buildPerlPackage rec { name = "JSON-PP-2.27200"; src = fetchurl { - url = "mirror://cpan/modules/by-module/JSON/${name}.tar.gz"; + url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-2.27200.tar.gz; sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; }; + meta = { + description = "JSON::XS compatible pure-Perl module."; + license = "perl"; + }; }; - JSONXS = buildPerlPackage rec { - name = "JSON-XS-2.32"; + JSONXS = buildPerlPackage { + name = "JSON-XS-2.33"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "012bf324pf5lnrf6ck2y167i1q1zzzc0w43b381qfnk7v5fcvaik"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-2.33.tar.gz; + sha256 = "0p68f85xz6xx2c9ydz4bij5x4d1747rxs3jdq53ab915mnc1qfdl"; + }; + propagatedBuildInputs = [ CommonSense ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; }; - buildInputs = [CommonSense]; }; libxml_perl = buildPerlPackage rec { @@ -2298,11 +2657,14 @@ rec { propagatedBuildInputs = [XMLParser]; }; - LinguaENInflect = buildPerlPackage rec { - name = "Lingua-EN-Inflect-1.893"; + LinguaENInflect = buildPerlPackage { + name = "Lingua-EN-Inflect-1.895"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; - sha256 = "1j0jxf3pqnsshakmpdwkgcmlz26hzmkrhg33kz52qzdfys254xmy"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.895.tar.gz; + sha256 = "0drzg9a2dkjxgf00n6jg0jzhd8972bh3j4wdnmdxpqi3zmfqhwcy"; + }; + meta = { + description = "Convert singular to plural"; }; }; @@ -2326,13 +2688,17 @@ rec { [ LinguaENInflect LinguaENInflectNumber LinguaENTagger ]; }; - LinguaENTagger = buildPerlPackage rec { - name = "Lingua-EN-Tagger-0.16"; + LinguaENTagger = buildPerlPackage { + name = "Lingua-EN-Tagger-0.23"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Lingua/${name}.tar.gz"; - sha256 = "0nzjgpxd0i5a3sacxsqfvvrfyamxlmzfa9y14r4vs7sc8qm20xd2"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.23.tar.gz; + sha256 = "0xq6567gijczxzq72ghfa9jr8zyc1p0ax9s12mv7slibpkfkm2d2"; + }; + propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; + meta = { + description = "Part-of-speech tagger for English natural language processing."; + license = "gpl_3"; }; - propagatedBuildInputs = [ HTMLParser LinguaStem ]; }; LinguaStem = buildPerlPackage rec { @@ -2353,12 +2719,16 @@ rec { propagatedBuildInputs = [ CommonSense ]; }; - ListMoreUtils = buildPerlPackage rec { + ListMoreUtils = buildPerlPackage { name = "List-MoreUtils-0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + url = mirror://cpan/authors/id/A/AD/ADAMK/List-MoreUtils-0.33.tar.gz; sha256 = "1bcljhhsk5g0xykvgbxz10ilmj02s58ydiy3g8hbzdr29i20np1i"; }; + meta = { + description = "Provide the stuff missing in List::Util"; + license = "perl"; + }; }; LocaleGettext = buildPerlPackage { @@ -2411,22 +2781,29 @@ rec { }; }; - LWP = buildPerlPackage rec { - name = "libwww-perl-6.03"; + LWP = buildPerlPackage { + name = "libwww-perl-6.04"; src = fetchurl { - url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "1zlnz4ylk1y0rw56vlf9knawwjx72b1gm09yp06ccpgmmndif4dg"; + url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.04.tar.gz; + sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr"; }; - propagatedBuildInputs = - [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ]; + propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; doCheck = false; # tries to start a daemon + meta = { + description = "The World-Wide Web library for Perl"; + license = "perl"; + }; }; - LWPMediaTypes = buildPerlPackage rec { - name = "LWP-MediaTypes-6.01"; + LWPMediaTypes = buildPerlPackage { + name = "LWP-MediaTypes-6.02"; src = fetchurl { - url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "1fhxql3xnhrlyzkjyss4swvhyh0r58cv2kwjcpj3mdbbg54ah9fz"; + url = mirror://cpan/authors/id/G/GA/GAAS/LWP-MediaTypes-6.02.tar.gz; + sha256 = "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q"; + }; + meta = { + description = "Guess media type for a file or a URL"; + license = "perl"; }; }; @@ -2441,6 +2818,19 @@ rec { doCheck = false; # tries to connect to https://www.apache.org/. }; + LWPUserAgent = buildPerlPackage { + name = "LWP-UserAgent-6.04"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/libwww-perl-6.04.tar.gz; + sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr"; + }; + propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPNegotiate HTTPMessage LWPMediaTypes NetHTTP URI WWWRobotRules ]; + meta = { + description = "The World-Wide Web library for Perl"; + license = "perl"; + }; + }; + LWPxParanoidAgent = buildPerlPackage rec { name = "LWPx-ParanoidAgent-1.07"; src = fetchurl { @@ -2508,25 +2898,29 @@ rec { buildInputs = [ ProcWaitStat ]; }; - MIMETypes = buildPerlPackage rec { - name = "MIME-Types-1.27"; + MIMETypes = buildPerlPackage { + name = "MIME-Types-1.38"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz"; - sha256 = "1zhzyb85zbil2jwrh74rg3bnm9wl74fcg2s64y8b57bk04fdfb7l"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-1.38.tar.gz; + sha256 = "12m8cvj80qbwxckj5jildl5zw6p1jincj3m1s77z6lnw3h59rj4l"; + }; + meta = { + description = "Definition of MIME types"; + license = "perl5"; }; - propagatedBuildInputs = [TestPod]; }; - ModuleBuild = buildPerlPackage rec { - name = "Module-Build-0.3800"; + ModuleBuild = buildPerlPackage { + name = "Module-Build-0.4003"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "1gk0xn5s48f0n3a6k4izw6sigsk84rk06hky7dd48hdmvrq23f4v"; + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4003.tar.gz; + sha256 = "1izx26gfnjffnj0j601hkc008b31y9f25hms1nzidfkb6r3110s2"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Build and install Perl modules"; + license = "perl5"; }; - propagatedBuildInputs = - [ ExtUtilsInstall ExtUtilsManifest ExtUtilsCBuilder ExtUtilsParseXS - CPANMeta PerlOSType ModuleMetadata - ]; }; ModuleFind = buildPerlPackage { @@ -2537,6 +2931,35 @@ rec { }; }; + ModuleImplementation = buildPerlPackage { + name = "Module-Implementation-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.06.tar.gz; + sha256 = "0v8qajzkpkwb9mfj2p46j352bwiszkg1zk778b008axqb817hfys"; + }; + buildInputs = [ TestFatal TestRequires ]; + propagatedBuildInputs = [ ModuleRuntime TryTiny ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Loads one of several alternate underlying implementations for a module"; + license = "artistic_2"; + }; + }; + + ModuleInstall = buildPerlPackage { + name = "Module-Install-1.06"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AD/ADAMK/Module-Install-1.06.tar.gz; + sha256 = "06a5375q1cr21rzcr07z3n8w6hv611a9p199jrnpsj9vbcwwi7ny"; + }; + buildInputs = [ YAMLTiny ]; + propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; + meta = { + description = "Standalone, extensible Perl module installer"; + license = "perl"; + }; + }; + ModuleMetadata = buildPerlPackage rec { name = "Module-Metadata-1.000005"; src = fetchurl { @@ -2567,28 +2990,58 @@ rec { propagatedBuildInputs = [UNIVERSALrequire]; }; - ModuleRuntime = buildPerlPackage rec { - name = "Module-Runtime-0.011"; + ModuleRuntime = buildPerlPackage { + name = "Module-Runtime-0.013"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Module/${name}.tar.gz"; - sha256 = "0hbpn2jd11gsni77aw189ss4q83jlcvcxr49x9j28bh36hjgif7s"; + url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.013.tar.gz; + sha256 = "08qhqg1qshrispcpzf24jbbpx2gh5ks84amnv9wmd46wj0yy0dzc"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Runtime module handling"; + license = "perl5"; }; - propagatedBuildInputs = [ ParamsClassify ]; }; - Moose = buildPerlPackage rec { - name = "Moose-2.0401"; + ModuleScanDeps = buildPerlPackage { + name = "Module-ScanDeps-1.10"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "07mx4xqfl0bk21kk49gs86ba3wcviarfx9yhxxw96pmaxd0l932i"; + url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.10.tar.gz; + sha256 = "0z85zqvqpj2ck80sw91hmzn94q8m3s40anybw324xh3pcrm9cg5s"; + }; + meta = { + description = "Recursively scan Perl code for dependencies"; + license = "perl"; + }; + }; + + Moo = buildPerlPackage { + name = "Moo-1.000007"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/Moo-1.000007.tar.gz; + sha256 = "02q5j5vsfv8ykzmkqk8zac88svard4g6rl455slgz8y2w3xn41ql"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; + meta = { + description = "Minimalist Object Orientation (with Moose compatiblity)"; + license = "perl5"; + }; + }; + + Moose = buildPerlPackage { + name = "Moose-2.0604"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; + sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; + }; + buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "A postmodern object system for Perl 5"; + license = "perl5"; }; - buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = - [ DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure - ListMoreUtils MROCompat PackageDeprecationManager PackageStash - PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny - ClassLoad ClassLoadXS - ]; }; MooseAutobox = buildPerlPackage rec { @@ -2610,7 +3063,7 @@ rec { propagatedBuildInputs = [ Moose ]; }; - MooseXAttributeChained = buildModule rec { + MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; @@ -2619,44 +3072,91 @@ rec { propagatedBuildInputs = [ Moose TryTiny ]; }; - MooseXEmulateClassAccessorFast = buildPerlPackage rec { + MooseXDaemonize = buildPerlPackage { + name = "MooseX-Daemonize-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MI/MICHAELR/MooseX-Daemonize-0.15.tar.gz; + sha256 = "1h6rzdmk68q4p0nh2bzmwwvr5iaf7pvdfrpwdxmr3z5pc64wajvd"; + }; + buildInputs = [ TestMoose ]; + propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass ]; + meta = { + description = "Role for daemonizing your Moose based application"; + license = "perl"; + }; + }; + + MooseXEmulateClassAccessorFast = buildPerlPackage { name = "MooseX-Emulate-Class-Accessor-Fast-0.00903"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Emulate-Class-Accessor-Fast-0.00903.tar.gz; sha256 = "1lkn1h4sxr1483jicsgsgzclbfw63g2i2c3m4v4j9ar75yrb0kh8"; }; buildInputs = [ TestException ]; - propagatedBuildInputs = [ Moose NamespaceClean ]; - }; - - MooseXGetopt = buildPerlPackage rec { - name = "MooseX-Getopt-0.37"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "161j44v2b4qzv75lk35gvfvs864vcyhkzq6phmhh8zllg3cnfc8k"; + propagatedBuildInputs = [ Moose namespaceclean ]; + meta = { + description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; + license = "perl"; }; - buildInputs = [ TestFatal TestRequires TestWarn ]; - propagatedBuildInputs = [ Moose GetoptLongDescriptive MooseXRoleParameterized ]; }; - MooseXMethodAttributes = buildPerlPackage rec { - name = "MooseX-MethodAttributes-0.25"; + MooseXGetopt = buildPerlPackage { + name = "MooseX-Getopt-0.50"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0rkk0rija7s96747y46qz49g88kymgxvn70mr21id9i8n7cdacww"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.50.tar.gz; + sha256 = "0fwm5vb8z8q4b6fmf7gz4xzw5z713mmfnxzjph6vfyyymlr5bll9"; + }; + buildInputs = [ PathClass TestCheckDeps TestFatal TestMoose TestNoWarnings TestRequires TestTrap TestWarn ]; + propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized ]; + meta = { + homepage = http://metacpan.org/release/MooseX-Getopt; + description = "A Moose role for processing command line options"; + license = "perl5"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ Moose MooseXTypes NamespaceAutoclean NamespaceClean ]; }; - MooseXNonMoose = buildPerlPackage rec { + MooseXMarkAsMethods = buildPerlPackage { + name = "MooseX-MarkAsMethods-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; + sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; + }; + buildInputs = [ TestMoose ]; + propagatedBuildInputs = [ BHooksEndOfScope Moose namespaceautoclean ]; + meta = { + homepage = http://metacpan.org/release/MooseX-MarkAsMethods/; + description = "Mark overload code symbols as methods"; + license = "lgpl_2_1"; + }; + }; + + MooseXMethodAttributes = buildPerlPackage { + name = "MooseX-MethodAttributes-0.28"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.28.tar.gz; + sha256 = "0srk85z6py9brw1jfvacd76y6219wycq3dj0wackbkmmbq04ln0g"; + }; + buildInputs = [ namespaceautoclean TestCheckDeps TestException ]; + propagatedBuildInputs = [ Moose MooseXTypes namespaceautoclean ]; + meta = { + homepage = https://github.com/karenetheridge/moosex-methodattributes; + description = "Code attribute introspection"; + license = "perl5"; + }; + }; + + MooseXNonMoose = buildPerlPackage { name = "MooseX-NonMoose-0.22"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; + url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.22.tar.gz; sha256 = "0mhyabg5f6kngkm1w7hfglkdzjdn5pbgm7vgia0aqy9mwwclbpdp"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ListMoreUtils Moose ]; + meta = { + description = "Easy subclassing of non-Moose classes"; + license = "perl5"; + }; }; MooseXSetOnce = buildPerlPackage rec { @@ -2669,32 +3169,48 @@ rec { propagatedBuildInputs = [ Moose ]; }; - MooseXParamsValidate = buildPerlPackage rec { - name = "MooseX-Params-Validate-0.10"; + MooseXParamsValidate = buildPerlPackage { + name = "MooseX-Params-Validate-0.18"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "16mjxa72gn41pvrk0fgyi98iw6yc7qafnbzr6v2xfiabp9wf5j5m"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.18.tar.gz; + sha256 = "02yim0lmr7p2nzswy97d5ylbs4ksmgklqq350p119i2611x7ai0k"; + }; + buildInputs = [ Moose TestFatal ]; + propagatedBuildInputs = [ DevelCaller Moose ParamsValidate SubExporter ]; + meta = { + description = "An extension of Params::Validate using Moose's types"; + license = "perl5"; }; - propagatedBuildInputs = [Moose ParamsValidate SubExporter TestException]; }; - MooseXRoleParameterized = buildPerlPackage rec { - name = "MooseX-Role-Parameterized-0.26"; + MooseXRoleParameterized = buildPerlPackage { + name = "MooseX-Role-Parameterized-1.00"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "1wfqdkjhwzbzk2cm65r5gz9n6406j8mdq78iga7dnj3mp2csn631"; + url = mirror://cpan/authors/id/S/SA/SARTAK/MooseX-Role-Parameterized-1.00.tar.gz; + sha256 = "0642h71j90i0jrqxz1snizkw9pch8v1s1w0zndrcl5bb85lx3z7y"; }; - buildInputs = [ TestFatal TestMore ]; + buildInputs = [ TestFatal TestMoose ]; propagatedBuildInputs = [ Moose ]; + meta = { + homepage = http://github.com/sartak/MooseX-Role-Parameterized/tree; + description = "Roles with composition parameters"; + license = "perl"; + }; }; - MooseXRoleWithOverloading = buildPerlPackage rec { - name = "MooseX-Role-WithOverloading-0.09"; + MooseXRoleWithOverloading = buildPerlPackage { + name = "MooseX-Role-WithOverloading-0.13"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0qs013vkm0ysykd3hibk4m8bkl0rnysxzralwq19zrvxaqk2krn8"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz; + sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw"; + }; + buildInputs = [ TestCheckDeps TestNoWarnings ]; + propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ]; + meta = { + homepage = http://metacpan.org/release/MooseX-Role-WithOverloading; + description = "Roles which support overloading"; + license = "perl5"; }; - propagatedBuildInputs = [ Moose MooseXTypes NamespaceAutoclean aliased ]; }; MooseXSemiAffordanceAccessor = buildPerlPackage rec { @@ -2713,7 +3229,7 @@ rec { sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n"; }; buildInputs = [ TestException TestUseOk ]; - propagatedBuildInputs = [ ClassMOP Moose NamespaceAutoclean ]; + propagatedBuildInputs = [ ClassMOP Moose namespaceautoclean ]; }; MooseXTraitsPluggable = buildPerlPackage rec { @@ -2724,18 +3240,22 @@ rec { }; buildInputs =[ TestException ]; propagatedBuildInputs = - [ ClassMOP Moose NamespaceAutoclean ListMoreUtils ]; + [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; }; - MooseXTypes = buildPerlPackage rec { - name = "MooseX-Types-0.30"; + MooseXTypes = buildPerlPackage { + name = "MooseX-Types-0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1c9z30fbk2h11xkgq8v2idnpaqay3m7ig9bb8scnawgrm49v2f4l"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Types-0.35.tar.gz; + sha256 = "11namg9pjw328ybvj70cgn15aac093jwdm4jv0b173gb7vkflx8a"; + }; + buildInputs = [ TestFatal TestMoose TestRequires ]; + propagatedBuildInputs = [ CarpClan Moose namespaceclean SubInstall SubName ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Organise your Moose types in libraries"; + license = "perl5"; }; - buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = - [ Moose CarpClan NamespaceClean SubInstall SubName ]; }; MooseXTypesCommon = buildPerlPackage rec { @@ -2754,7 +3274,20 @@ rec { url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; sha256 = "035d2gzq1j60skn39jav2jr6sbx1hq9vqmmfjfc3cvhahfzrygs4"; }; - propagatedBuildInputs = [ ClassLoad Moose MooseXTypes NamespaceClean ]; + propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; + }; + + MooseXTypesPathClass = buildPerlPackage { + name = "MooseX-Types-Path-Class-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TH/THEPLER/MooseX-Types-Path-Class-0.06.tar.gz; + sha256 = "02lw86r6pp6saiwc7ns890mlwq93vhkqyri3cipsfwhnhcap847g"; + }; + propagatedBuildInputs = [ ClassMOP Moose MooseXTypes PathClass ]; + meta = { + description = "A Path::Class type library for Moose"; + license = "perl"; + }; }; Mouse = buildPerlPackage rec { @@ -2767,15 +3300,19 @@ rec { doCheck = false; # check can't find its own Mouse::Tiny module }; - MROCompat = buildPerlPackage rec { - name = "MRO-Compat-0.11"; + MROCompat = buildPerlPackage { + name = "MRO-Compat-0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "0p2hl0cygcds3jjq3awackd72j3vzidfyjacj7gxdlqh65a2fjq7"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/MRO-Compat-0.12.tar.gz; + sha256 = "1mhma2g83ih9f8nkmg2k9l0x6izhhbb6k5lli4rpllxad4wbk9dv"; + }; + meta = { + description = "Mro::* interface compatibility for Perls < 5.9.5"; + license = "perl"; }; }; - MusicBrainzDiscID = buildModule rec { + MusicBrainzDiscID = buildPerlModule rec { name = "MusicBrainz-DiscID-0.03"; src = fetchurl { url = "mirror://cpan/authors/id/N/NJ/NJH/${name}.tar.gz"; @@ -2799,22 +3336,33 @@ rec { doCheck = false; # Test performs network access. }; - NamespaceAutoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.12"; + namespaceautoclean = buildPerlPackage rec { + name = "namespace-autoclean-0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "125g5ny4sqf9kj1sxaqh1jipzyii56p9nsp45jg9fg67i4ljm9pg"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/namespace-autoclean-0.13.tar.gz; + sha256 = "1w53k9f9zla90qdn7cyc9dx8zcv26gwy2y87gcazqsq1aj371m04"; + }; + buildInputs = [ Moose SubName ]; + propagatedBuildInputs = [ BHooksEndOfScope ClassMOP namespaceclean ]; + meta = { + homepage = http://metacpan.org/release/namespace-autoclean; + description = "Keep imports out of your namespace"; + license = "perl5"; }; - propagatedBuildInputs = [ BHooksEndOfScope ClassMOP NamespaceClean Moose ]; }; - NamespaceClean = buildPerlPackage rec { - name = "namespace-clean-0.21"; + namespaceclean = buildPerlPackage rec { + name = "namespace-clean-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "0djqishj6mcw1jn9saff4i2glq89dq3rc7slpprcky31jay6jq5i"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.24.tar.gz; + sha256 = "0c0jj44f3y26scybnxp2lnkcydjqh0lfr6l1jsy13r3x9r4d8qd6"; + }; + propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; + meta = { + homepage = http://search.cpan.org/dist/namespace-clean; + description = "Keep imports and functions out of your namespace"; + license = "perl5"; }; - propagatedBuildInputs = [ BHooksEndOfScope DevelHide PackageStash ]; }; NetAddrIP = buildPerlPackage rec { @@ -2869,19 +3417,26 @@ rec { doCheck = false; }; - NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.01"; + NetHTTP = buildPerlPackage { + name = "Net-HTTP-6.05"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; - sha256 = "0ipad5y605fr968snxmp1sxrkvag9r5y0g8qvj9n7ca9nbwq7n3n"; + url = mirror://cpan/authors/id/G/GA/GAAS/Net-HTTP-6.05.tar.gz; + sha256 = "1r2bv3cw4m054qfsm6i7rpvhrql1d78izpc36prv3xvahfsqxawc"; + }; + meta = { + description = "Low-level HTTP connection (client)"; + license = "perl"; }; }; NetIP = buildPerlPackage { - name = "Net-IP-1.25"; + name = "Net-IP-1.26"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz; - sha256 = "1iv0ka6d8kp9iana6zn51sxbcmz2h3mbn6cd8pald36q5whf5mjc"; + url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz; + sha256 = "0ffn2xqqbkfi7v303sp5dwgbv36jah3vg8r4nxhxfiv60vric3q4"; + }; + meta = { + description = "Perl extension for manipulating IPv4/IPv6 addresses"; }; }; @@ -2894,13 +3449,30 @@ rec { }; }; - NetServer = buildPerlPackage rec { - name = "Net-Server-0.99"; + NetOAuth = buildPerlPackage { + name = "Net-OAuth-0.28"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; - sha256 = "0pdf2fvklpcxrdz3wwmhbvjs6kvzcvjw28f3pny8z17188lv06n1"; + url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; + sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; + }; + buildInputs = [ TestWarn ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWPUserAgent URI ]; + meta = { + description = "An implementation of the OAuth protocol"; + license = "perl"; + }; + }; + + NetServer = buildPerlPackage { + name = "Net-Server-2.007"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.007.tar.gz; + sha256 = "0a03m237cw6j5bvm2yxk2b2gbfx7wj0w2x5zivi9ddqvbcad6vqw"; }; doCheck = false; # seems to hang waiting for connections + meta = { + description = "Extensible, general Perl server engine"; + }; }; NetSMTP = buildPerlPackage { @@ -2943,15 +3515,18 @@ rec { }; NetTwitterLite = buildPerlPackage { - name = "Net-Twitter-Lite-0.10003"; - + name = "Net-Twitter-Lite-0.11002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.10003.tar.gz; - sha256 = "1qh5bw68ad4fqiqbqwhgj859kq35asjmp0fsmrqhlbqy195pwi1i"; + url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.11002.tar.gz; + sha256 = "032gyn1h3r5d83wvz7nj3k7g50wcf73lbbmjc18466ml90vigys0"; }; + propagatedBuildInputs = [ CryptSSLeay LWPUserAgent NetOAuth URI ]; doCheck = false; - - propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay]; + meta = { + homepage = http://github.com/semifor/Net-Twitter-Lite; + description = "A perl interface to the Twitter API"; + license = "perl"; + }; }; NumberCompare = buildPerlPackage rec { @@ -2992,7 +3567,7 @@ rec { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff"; }; - propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPRequest XMLSimple ]; + propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPMessage XMLSimple ]; }; NetOpenIDConsumer = buildPerlPackage rec { @@ -3004,33 +3579,48 @@ rec { propagatedBuildInputs = [ NetOpenIDCommon JSON ]; }; - PackageDeprecationManager = buildPerlPackage rec { - name = "Package-DeprecationManager-0.11"; + PackageDeprecationManager = buildPerlPackage { + name = "Package-DeprecationManager-0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1q2jgq3dfva5wfsl1jn8711bk7fvf5cgpjddd8if9cx3zixnq2n1"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.13.tar.gz; + sha256 = "0fkvq3xxwc3l5hg64dr9sj3l12dl59i44cg407qx9sd6r51j3qfi"; + }; + buildInputs = [ TestRequires TestFatal ]; + propagatedBuildInputs = [ ParamsUtil SubInstall ListMoreUtils ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Manage deprecation warnings for your distribution"; + license = "artistic_2"; }; - buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ ListMoreUtils ParamsUtil SubInstall ]; }; - PackageStash = buildPerlPackage rec { - name = "Package-Stash-0.33"; + PackageStash = buildPerlPackage { + name = "Package-Stash-0.34"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "0md52rqgcnvspg3l2hvwc31jilq4gkbdwgr5h32gy1hmslaxhpzn"; + url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz; + sha256 = "1674zs96ndq3czs6v8xkdqqz4fnka0i2835nnns9zbw2q01yirj6"; + }; + buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; + propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation PackageDeprecationManager ]; + meta = { + homepage = http://metacpan.org/release/Package-Stash; + description = "Routines for manipulating stashes"; + license = "perl5"; }; - buildInputs = [ TestFatal TestRequires ]; - propagatedBuildInputs = [ DistCheckConflicts PackageDeprecationManager PackageStashXS ]; }; - PackageStashXS = buildPerlPackage rec { - name = "Package-Stash-XS-0.25"; + PackageStashXS = buildPerlPackage { + name = "Package-Stash-XS-0.26"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "1i45mhd17sfq41j62r8kkx2d2f4mi0sp6vl86mmk8a4ssq85i73k"; + url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.26.tar.gz; + sha256 = "1pfdpb3x40f5ldp5kp0d9xvrz4wk2fc3ww53wrq4dp326s08h7r9"; + }; + buildInputs = [ TestRequires TestFatal ]; + meta = { + homepage = http://metacpan.org/release/Package-Stash-XS; + description = "Faster and more correct implementation of the Package::Stash API"; + license = "perl5"; }; - buildInputs = [ TestFatal ]; }; ParamsClassify = buildPerlPackage rec { @@ -3042,19 +3632,42 @@ rec { buildInputs = [ ExtUtilsParseXS ]; }; - ParamsUtil = buildPerlPackage rec { - name = "Params-Util-1.01"; + ParamsUtil = buildPerlPackage { + name = "Params-Util-1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "6a1613b669f18bf329003c7dbd11435248cffa9c1497645073821a68c0987a40"; + url = mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz; + sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Simple, compact and correct param-checking functions"; + license = "perl5"; }; }; - ParamsValidate = buildModule rec { - name = "Params-Validate-1.00"; + ParamsValidate = buildPerlModule { + name = "Params-Validate-1.07"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Params/${name}.tar.gz"; - sha256 = "1yziygqb8km28xr3yzzsllzgg7xnxdh4wqfm2kmf2s6qck0dkij4"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.07.tar.gz; + sha256 = "15mz2wxarxjlr3365m1hhcnfs6d2mw3m0yimnlv06j13cxs39py1"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ModuleImplementation ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Validate method/function parameters"; + license = "artistic_2"; + }; + }; + + PARDist = buildPerlPackage { + name = "PAR-Dist-0.49"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz; + sha256 = "078ycyn8pw3rba4k3qwcqrqfcym5c1pivymwa0bvs9sab45j4iwy"; + }; + meta = { + description = "Create and manipulate PAR distributions"; }; }; @@ -3067,10 +3680,10 @@ rec { }; ParseCPANMeta = buildPerlPackage rec { - name = "Parse-CPAN-Meta-1.4401"; + name = "Parse-CPAN-Meta-1.4404"; src = fetchurl { url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz"; - sha256 = "0g381a0wynh9xc9wf44drw5vhfbd3wa693myy018jwq9vp51pf5q"; + sha256 = "1y4mr5hmkkl405x4v31kx2nmlahpg0c38k8s65vgqc4s28wxafmh"; }; propagatedBuildInputs = [ CPANMetaYAML JSONPP ]; }; @@ -3083,11 +3696,15 @@ rec { }; }; - PathClass = buildPerlPackage rec { - name = "Path-Class-0.24"; + PathClass = buildPerlPackage { + name = "Path-Class-0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/${name}.tar.gz"; - sha256 = "1g4in1k3nvk7w034hmhix9hjbjgpshwc5m8xvpga84rfzbadpnyc"; + url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.29.tar.gz; + sha256 = "1z3wvci2qcb1m9qrkxphbnfnr4jqgxbxnxrmdb25ks8gap98hk4z"; + }; + meta = { + description = "Cross-platform path specification manipulation"; + license = "perl"; }; }; @@ -3165,26 +3782,45 @@ rec { }; }; - Plack = buildPerlPackage rec { - name = "Plack-0.9985"; + Plack = buildPerlPackage { + name = "Plack-1.0015"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/${name}.tar.gz"; - sha256 = "0cik1iwpwky7aliwi59z93ykd13ysp4xg5dps1vd4dhqylkn4ns8"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0015.tar.gz; + sha256 = "1zg30bb55ws8fka5iawmfqnc3wg6ggigl0wljgvw0mk466sr3lxf"; + }; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ DevelStackTrace DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HashMultiValue HTTPBody HTTPMessage LWPUserAgent StreamBuffered TestTCP TryTiny URI ]; + meta = { + homepage = http://plackperl.org; + description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; + license = "perl"; }; - buildInputs = [ TestRequires TestTCP HTTPRequestAsCGI ]; - propagatedBuildInputs = - [ LWP FileShareDir TryTiny DevelStackTrace DevelStackTraceAsHTML HTTPBody - HashMultiValue FilesysNotifySimple - ]; }; - PlackMiddlewareReverseProxy = buildPerlPackage rec { - name = "Plack-Middleware-ReverseProxy-0.10"; + PlackMiddlewareReverseProxy = buildPerlPackage { + name = "Plack-Middleware-ReverseProxy-0.15"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz"; - sha256 = "0w9bl1z71frra0dgz4gsxskvj1c8dhjkhrj2gqwdds6jcqyny7mf"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz; + sha256 = "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f"; + }; + propagatedBuildInputs = [ Plack ]; + meta = { + description = "Supports app to run as a reverse proxy backend"; + license = "perl"; + }; + }; + + PlackTestExternalServer = buildPerlPackage { + name = "Plack-Test-ExternalServer-0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FL/FLORA/Plack-Test-ExternalServer-0.01.tar.gz; + sha256 = "1dbg1p3rgvvbkkpvca5jlc2mzx8iqyiybk88al93pvbca65h1g7h"; + }; + propagatedBuildInputs = [ HTTPMessage LWPUserAgent Plack TestTCP URI ]; + meta = { + description = "Run HTTP tests on external live servers"; + license = "perl"; }; - propagatedBuildInputs = [ Plack YAML ]; }; PPI = buildPerlPackage rec { @@ -3223,11 +3859,13 @@ rec { }; }; - PadWalker = buildPerlPackage rec { - name = "PadWalker-1.9"; + PadWalker = buildPerlPackage { + name = "PadWalker-1.96"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; - sha256 = "0lvh0qlyrpnkssqkhfxhbjpb5lyr4fp6d1p7la8k6w3wv1qmbl1s"; + url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-1.96.tar.gz; + sha256 = "180c72l3ssnsdbyifl9lzdz83x4zidf3nfgyx6l0j41a5wj0w9fz"; + }; + meta = { }; }; @@ -3347,6 +3985,32 @@ rec { }; }; + RoleTiny = buildPerlPackage { + name = "Role-Tiny-1.002004"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IL/ILMARI/Role-Tiny-1.002004.tar.gz; + sha256 = "0n126kazifmx6grdk4rmq226xklfc996cqw4ix26z9jcccl4v756"; + }; + buildInputs = [ TestFatal ]; + meta = { + description = "Roles, like a nouvelle cuisine portion size slice of Moose"; + license = "perl5"; + }; + }; + + SafeIsa = buildPerlPackage { + name = "Safe-Isa-1.000002"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MS/MSTROUT/Safe-Isa-1.000002.tar.gz; + sha256 = "07jr4fy6zbw9zwpalxzxlkn4nym6fd0304fsrb5ag0v156ygpwvl"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Call isa, can, does and DOES safely on things that may not be objects"; + license = "perl5"; + }; + }; + ScalarString = buildPerlPackage rec { name = "Scalar-String-0.002"; src = fetchurl { @@ -3356,18 +4020,27 @@ rec { }; ScopeGuard = buildPerlPackage { - name = "Scope-Guard-0.03"; + name = "Scope-Guard-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.03.tar.gz; - sha256 = "07x966fkqxlwnngxs7a2jrhabh8gzhjfpqq56n9gkwy7f340sayb"; + url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.20.tar.gz; + sha256 = "1lsagnz6pli035zvx5c1x4qm9fabi773vns86yd8lzfpldhfv3sv"; + }; + meta = { + description = "Lexically-scoped resource management"; + license = "perl"; }; }; - ScopeUpper = buildPerlPackage rec { - name = "Scope-Upper-0.12"; + ScopeUpper = buildPerlPackage { + name = "Scope-Upper-0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; - sha256 = "1yrjx22hlsv2qdgicnz589j9iipyxl56y6pnks2cfg6icpp97v5w"; + url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.21.tar.gz; + sha256 = "058nfnzp31k7hmdvbsr72nvrw0i23gwjplb6g6pag3s18m7fl1p6"; + }; + meta = { + homepage = http://search.cpan.org/dist/Scope-Upper/; + description = "Act on upper scopes"; + license = "perl5"; }; }; @@ -3406,15 +4079,18 @@ rec { propagatedBuildInputs = [ IOStringy OLEStorageLight ]; }; - SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.72"; + SQLAbstract = buildPerlPackage { + name = "SQL-Abstract-1.73"; src = fetchurl { - url = "mirror://cpan/modules/by-module/SQL/${name}.tar.gz"; - sha256 = "12abz50zz51s1f5hvs5xl6smb369sjid1zyjkfygkiglqp4an0kr"; + url = mirror://cpan/authors/id/F/FR/FREW/SQL-Abstract-1.73.tar.gz; + sha256 = "081ppyvsc66yshmfr9q9v7hp9g58725nnibd771i9g153vzs49kb"; + }; + buildInputs = [ TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; + meta = { + description = "Generate SQL from Perl data structures"; + license = "perl"; }; - buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = - [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; }; SQLAbstractLimit = buildPerlPackage rec { @@ -3460,16 +4136,19 @@ rec { ]; }; - Starman = buildPerlPackage rec { - name = "Starman-0.2014"; + Starman = buildPerlPackage { + name = "Starman-0.3006"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Plack/${name}.tar.gz"; - sha256 = "0hf3wpm2q4zcgjahjrpkkzy4fn74vkddg9yqs7p97xb290pvlbki"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.3006.tar.gz; + sha256 = "0dlwrrq570v5mbpzsi4pmj6n2sjm3xpcilhh6dvpq8qbp550wixy"; }; - patches = [ ../development/perl-modules/starman-dont-change-name.patch ]; - buildInputs = [ TestRequires TestTCP ]; - propagatedBuildInputs = [ Plack DataDump HTTPParserXS NetServer ]; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ DataDump HTTPDate HTTPParserXS HTTPMessage NetServer Plack TestTCP ]; doCheck = false; # binds to various TCP ports1 + meta = { + description = "High-performance preforking PSGI/Plack web server"; + license = "perl"; + }; }; StatisticsDescriptive = buildPerlPackage rec { @@ -3497,6 +4176,32 @@ rec { propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; }; + StreamBuffered = buildPerlPackage { + name = "Stream-Buffered-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.02.tar.gz; + sha256 = "0bfa3h2pryrbrcd1r7235k0ik4gw35r5ig8h8y3dfmk9l3y96vjr"; + }; + meta = { + homepage = http://plackperl.org; + description = "Temporary buffer to save bytes"; + license = "perl"; + }; + }; + + strictures = buildPerlPackage { + name = "strictures-1.004004"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/strictures-1.004004.tar.gz; + sha256 = "0d7fanr4ggmlqvdxf63ci7nxba2vrdz9558xy35hfpm8max7s48j"; + }; + meta = { + homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; + description = "Turn on strict and make all warnings fatal"; + license = "perl5"; + }; + }; + StringCamelCase = buildPerlPackage rec { name = "String-CamelCase-0.02"; src = fetchurl { @@ -3521,11 +4226,17 @@ rec { }; }; - StringRewritePrefix = buildPerlPackage rec { - name = "String-RewritePrefix-0.004"; + StringRewritePrefix = buildPerlPackage { + name = "String-RewritePrefix-0.006"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "17v0pwiprsz9ibxlhpi789jxg691nz9prpabvb4dn4nb0qbi0yd0"; + url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.006.tar.gz; + sha256 = "1b9fg805g0agsyij28w8hhmnf485bii8zl03i092mv1p2hqrpxll"; + }; + propagatedBuildInputs = [ SubExporter ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Rewrite strings based on a set of known prefixes"; + license = "perl5"; }; }; @@ -3536,16 +4247,48 @@ rec { sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm"; }; propagatedBuildInputs = - [ LinguaENInflectPhrase TextUnidecode NamespaceClean ]; + [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; }; - SubExporter = buildPerlPackage rec { - name = "Sub-Exporter-0.982"; + SubExporter = buildPerlPackage { + name = "Sub-Exporter-0.984"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0xf8q05k5xs3bw6qy3pnnl5d670njxsxbw2dprl7n50hf488cbvj"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.984.tar.gz; + sha256 = "190qly7nv7zf17c1v0gnqhyf25p6whhh2m132mh4xzs5mqadwq0f"; + }; + propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; + meta = { + homepage = https://github.com/rjbs/sub-exporter; + description = "A sophisticated exporter for custom-built routines"; + license = "perl5"; + }; + }; + + SubExporterProgressive = buildPerlPackage { + name = "Sub-Exporter-Progressive-0.001006"; + src = fetchurl { + url = mirror://cpan/authors/id/L/LE/LEONT/Sub-Exporter-Progressive-0.001006.tar.gz; + sha256 = "0s13fz86c8slhgban10sywp2skjdxnl3nvkqqy7pbwg81g3v9rr2"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Only use Sub::Exporter if you need it"; + license = "perl5"; + }; + }; + + SubExporterUtil = buildPerlPackage { + name = "Sub-Exporter-Util-0.984"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.984.tar.gz; + sha256 = "190qly7nv7zf17c1v0gnqhyf25p6whhh2m132mh4xzs5mqadwq0f"; + }; + propagatedBuildInputs = [ DataOptList ParamsUtil SubInstall ]; + meta = { + homepage = https://github.com/rjbs/sub-exporter; + description = "A sophisticated exporter for custom-built routines"; + license = "perl5"; }; - propagatedBuildInputs = [SubInstall DataOptList ParamsUtil]; }; SubIdentify = buildPerlPackage rec { @@ -3556,20 +4299,28 @@ rec { }; }; - SubInstall = buildPerlPackage rec { - name = "Sub-Install-0.925"; + SubInstall = buildPerlPackage { + name = "Sub-Install-0.926"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1sccc4nwp9y24zkr42ww2gwg6zwax4madi9spsdym1pqna3nwnm6"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.926.tar.gz; + sha256 = "0gkns6p11j46j6yzacanhbqgd4ws5r0ppg6yivz7cjbq8dk4kcmc"; + }; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Install subroutines into packages easily"; + license = "perl5"; }; }; - SubName = buildPerlPackage rec { + SubName = buildPerlPackage { name = "Sub-Name-0.05"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + url = mirror://cpan/authors/id/F/FL/FLORA/Sub-Name-0.05.tar.gz; sha256 = "1w9sf51ai2r3i0kv5wnq7h9g3hcd6zb6i51ivvykb3hzx82vilf9"; }; + meta = { + description = "(Re)name a sub"; + }; }; SubOverride = buildPerlPackage rec { @@ -3582,10 +4333,15 @@ rec { }; SubUplevel = buildPerlPackage { - name = "Sub-Uplevel-0.2002"; + name = "Sub-Uplevel-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2002.tar.gz; - sha256 = "19b2b9xsw7lvvkcmmnhhv8ybxdkbnrky9nnqgjridr108ww9m5rh"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.24.tar.gz; + sha256 = "1yzxqsim8vpavzqm2wfksh8dpmy6qbr9s3hdqqicp38br3lzd4qg"; + }; + meta = { + homepage = https://github.com/dagolden/sub-uplevel; + description = "Apparently run a function in a higher stack frame"; + license = "perl5"; }; }; @@ -3678,34 +4434,41 @@ rec { }; TaskWeaken = buildPerlPackage { - name = "Task-Weaken-1.02"; + name = "Task-Weaken-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.02.tar.gz; - sha256 = "10f9kd1lwbscmmjwgbfwa4kkp723mb463lkbmh29rlhbsl7kb5wz"; + url = mirror://cpan/authors/id/A/AD/ADAMK/Task-Weaken-1.04.tar.gz; + sha256 = "1i7kd9v8fjsqyhr4rx4a1jv7n5vfjjm1v4agb24pizh0b72p3qk7"; + }; + meta = { + description = "Ensure that a platform has weaken support"; + license = "perl"; }; }; TemplateTimer = buildPerlPackage { - name = "Template-Timer-0.04"; + name = "Template-Timer-1.00"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-0.04.tar.gz; - sha256 = "0j0gmxbq1svp0rb4kprwj2fk2mhl07yah08bksfz0a0pfz6lsam4"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz; + sha256 = "1d3pbcx1kz73ncg8s8lx3ifwphz838qy0m40gdar7790cnrlqcdp"; + }; + propagatedBuildInputs = [ TemplateToolkit ]; + meta = { + description = "Rudimentary profiling for Template Toolkit"; + license = "null"; }; - propagatedBuildInputs = [TemplateToolkit]; }; TemplateToolkit = buildPerlPackage rec { - name = "Template-Toolkit-2.22"; + name = "Template-Toolkit-2.24"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABW/${name}.tar.gz"; - sha256 = "023sb6mf43m085pf8qq1dh1ill66p424mmj66xna5ji1nkw96pm3"; + url = mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.24.tar.gz; + sha256 = "1j01kpsdpwxrwbsz2y1d8xyyliw9l23g0f3jigxvgxs9qal4m0rq"; + }; + propagatedBuildInputs = [ AppConfig ]; + meta = { + description = "Comprehensive template processing system"; + license = "perl5"; }; - propagatedBuildInputs = [AppConfig]; - patches = [ - # Needed to make TT works proy on templates in the Nix store. - # !!! unnecessary with Nix >= 0.13. - ../development/perl-modules/template-toolkit-nix-store.patch - ]; }; TermReadKey = buildPerlPackage { @@ -3749,22 +4512,43 @@ rec { buildInputs = [ LogTrace ]; }; - TestDeep = buildPerlPackage rec { - name = "Test-Deep-0.109"; + TestCheckDeps = buildPerlPackage { + name = "Test-CheckDeps-0.002"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "0nqqxj00ln3b4pma47bj2rcpblpvipfrchqbcxahlq9lh1q4p5s6"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.002.tar.gz; + sha256 = "0fmm9xsgial599bqb6rcrc6xp0627rcdp0ivx8wsy807py5jk5i6"; + }; + propagatedBuildInputs = [ CPANMetaCheck ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Check for presence of dependencies"; + license = "perl5"; }; - propagatedBuildInputs = [TestTester TestNoWarnings]; }; - TestDifferences = buildPerlPackage rec { - name = "Test-Differences-0.500"; + TestDeep = buildPerlPackage { + name = "Test-Deep-0.110"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/${name}.tar.gz"; - sha256 = "0ha36j6wr1d47zzilb28bvkm5lm5c6i4rqp4aqyknwg4qmagjr4w"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-0.110.tar.gz; + sha256 = "12rd9fknm778685ypyc599lcmzbqvbqnjhcrkybgpq2siai9q4h5"; + }; + propagatedBuildInputs = [ TestNoWarnings TestTester ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + }; + }; + + TestDifferences = buildPerlPackage { + name = "Test-Differences-0.61"; + src = fetchurl { + url = mirror://cpan/authors/id/O/OV/OVID/Test-Differences-0.61.tar.gz; + sha256 = "044wg7nqmhvh5ms8z305f9bzldhigr020l1a7iqycxqv05h6b6vm"; + }; + propagatedBuildInputs = [ TextDiff ]; + meta = { + description = "Test strings and data structures and show differences if not ok"; + license = "perl"; }; - propagatedBuildInputs = [ TestMore TextDiff ]; }; TestException = buildPerlPackage rec { @@ -3776,13 +4560,18 @@ rec { propagatedBuildInputs = [ SubUplevel ]; }; - TestFatal = buildPerlPackage rec { - name = "Test-Fatal-0.006"; + TestFatal = buildPerlPackage { + name = "Test-Fatal-0.010"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0laxzphmqwq0rrizv3n7pcnrn345yh70cip61sl8f8mw8dir1jdx"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.010.tar.gz; + sha256 = "01ck4wyrj4nqyr1cz3lcff6g9nryadsflpf85jmsa6vcl2bq8pl0"; }; propagatedBuildInputs = [ TryTiny ]; + meta = { + homepage = https://github.com/rjbs/test-fatal; + description = "Incredibly simple helpers for testing code with exceptions"; + license = "perl5"; + }; }; TestHarness = buildPerlPackage rec { @@ -3810,6 +4599,21 @@ rec { propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan]; }; + TestMoose = buildPerlPackage { + name = "Test-Moose-2.0604"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; + sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; + }; + buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "A postmodern object system for Perl 5"; + license = "perl5"; + }; + }; + TestMockTime = buildPerlPackage rec { name = "Test-MockTime-0.09"; src = fetchurl { @@ -3821,12 +4625,17 @@ rec { TestMore = TestSimple; TestNoWarnings = buildPerlPackage { - name = "Test-NoWarnings-0.084"; + name = "Test-NoWarnings-1.04"; src = fetchurl { - url = mirror://cpan/authors/id/F/FD/FDALY/Test-NoWarnings-0.084.tar.gz; - sha256 = "19g47pa3brr9px3jnwziapvxcnghqqjjwxz1jfch4asawpdx2s8b"; + url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; + sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; + }; + buildInputs = [ TestTester ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Make sure you didn't emit any warnings while testing"; + license = "open_source"; }; - propagatedBuildInputs = [TestTester]; }; TestObject = buildPerlPackage rec { @@ -3857,10 +4666,15 @@ rec { }; TestPod = buildPerlPackage { - name = "Test-Pod-1.26"; + name = "Test-Pod-1.45"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Pod-1.26.tar.gz; - sha256 = "025rviipiaa1rf0bp040jlwaxwvx48kdcjriaysvkjpyvilwvqd4"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-Pod-1.45.tar.gz; + sha256 = "0yv0bglm4b9zfi9l5z6x2dy6pzlh8n5z9yl7py5v6h48mwgk74fk"; + }; + meta = { + homepage = http://search.cpan.org/dist/Test-Pod/; + description = "Check for POD errors in files"; + license = "perl5"; }; }; @@ -3873,12 +4687,16 @@ rec { propagatedBuildInputs = [PodCoverage]; }; - TestRequires = buildPerlPackage rec { + TestRequires = buildPerlPackage { name = "Test-Requires-0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.06.tar.gz; sha256 = "1ksyg4npzx5faf2sj80rm74qjra4q679750vfqfvw3kg1d69wvwv"; }; + meta = { + description = "Checks to see if the module can be loaded"; + license = "perl"; + }; }; TestScript = buildPerlPackage rec { @@ -3898,13 +4716,7 @@ rec { }; }; - TestSimple = buildPerlPackage rec { - name = "Test-Simple-0.98"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "1a0jrl3n2g05qn6c79pv5bnc1wlq36qccwdgf1pjrrvmrgi07cig"; - }; - }; + TestSimple = null; TestSubCalls = buildPerlPackage rec { name = "Test-SubCalls-1.09"; @@ -3915,20 +4727,24 @@ rec { propagatedBuildInputs = [ HookLexWrap ]; }; - TestTCP = buildPerlPackage rec { - name = "Test-TCP-1.13"; + TestTCP = buildPerlPackage { + name = "Test-TCP-1.18"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "00vbkynkdflqgdvywdxzgg3yx1w7nfb68py8l3lglq9jq4pq9wbb"; + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-1.18.tar.gz; + sha256 = "0flm7x0z7amppi9y6s8mxm0pkrgfihfpfjs0w4i6s80jiss1gfld"; + }; + propagatedBuildInputs = [ TestSharedFork ]; + meta = { + description = "Testing TCP program"; + license = "perl"; }; - propagatedBuildInputs = [ TestMore TestSharedFork ]; }; TestTester = buildPerlPackage { - name = "Test-Tester-0.107"; + name = "Test-Tester-0.108"; src = fetchurl { - url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz; - sha256 = "0qgmsl6s6xm39211lywyzwrlz0gcmax7fb8zipybs9yxfmwcvyx2"; + url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.108.tar.gz; + sha256 = "1pby9w41b7z0cgnxpgkh397x7z68855sjg5yda48r6lck3lga62h"; }; }; @@ -3940,26 +4756,32 @@ rec { }; }; - TestWarn = buildPerlPackage rec { - name = "Test-Warn-0.23"; + TestWarn = buildPerlPackage { + name = "Test-Warn-0.24"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; - sha256 = "1733s39s4pm0hsshvvjsv1vbri09l4g0g7yyg64y65yqcyanfdf0"; + url = mirror://cpan/authors/id/C/CH/CHORNY/Test-Warn-0.24.tar.gz; + sha256 = "12r1mcwrm6cgc3ppgawwv265vmrighj4bl6xc5c41f4c2l6bdxml"; + }; + propagatedBuildInputs = [ SubUplevel TreeDAGNode ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "Perl extension to test methods for warnings"; + license = "perl5"; }; - propagatedBuildInputs = [TestSimple TestException ArrayCompare TreeDAGNode]; - buildInputs = [TestPod]; }; - TestWWWMechanize = buildPerlPackage rec { - name = "Test-WWW-Mechanize-1.24"; + TestWWWMechanize = buildPerlPackage { + name = "Test-WWW-Mechanize-1.44"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "11knym5ppish78rk8r1hymvq1py43h7z8d6nk8p4ig3p246xx5qa"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz; + sha256 = "062pj242vsc73bw11jqpap92ax9wzc9f2m4xhyp1wzrwkfchpl2q"; + }; + propagatedBuildInputs = [ CarpAssertMore HTMLTree HTTPServerSimple LWP TestLongString URI WWWMechanize ]; + meta = { + homepage = https://github.com/petdance/test-www-mechanize; + description = "Testing-specific WWW::Mechanize subclass"; + license = "artistic_2"; }; - propagatedBuildInputs = [ - CarpAssertMore URI TestLongString WWWMechanize - ]; - doCheck = false; }; TestWWWMechanizeCatalyst = buildPerlPackage rec { @@ -3976,11 +4798,27 @@ rec { doCheck = false; # listens on an external port }; - TextAligner = buildPerlPackage rec { - name = "Text-Aligner-0.03"; + TestWWWMechanizePSGI = buildPerlPackage { + name = "Test-WWW-Mechanize-PSGI-0.35"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANNO/${name}.tar.gz"; - sha256 = "137m8w13ffdm3fbvy6yw0izrl2p87zawp1840qvsdw1nd0plxyp9"; + url = mirror://cpan/authors/id/L/LB/LBROCARD/Test-WWW-Mechanize-PSGI-0.35.tar.gz; + sha256 = "1hih8s49zf38bisvhnhzrrj0zwyiivkrbs7nmmdqm1qqy27wv7pc"; + }; + propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; + meta = { + description = "Test PSGI programs using WWW::Mechanize"; + license = "perl"; + }; + }; + + TextAligner = buildPerlPackage { + name = "Text-Aligner-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AN/ANNO/Text-Aligner-0.07.tar.gz; + sha256 = "1vpb87binmmysr4sxfjinxg4bh3rb4rmrx48yyczgmyddmda9rik"; + }; + meta = { + description = "Align text in columns"; }; }; @@ -3992,13 +4830,17 @@ rec { }; }; - TextDiff = buildPerlPackage rec { - name = "Text-Diff-1.37"; + TextDiff = buildPerlPackage { + name = "Text-Diff-1.41"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; - sha256 = "08das6k4nrf8dgcg2l1jcy8868kgzx976j38rpdndgrgq0nz148n"; + url = mirror://cpan/authors/id/O/OV/OVID/Text-Diff-1.41.tar.gz; + sha256 = "1ynjsa4sr1yvyh65sdfvahaafglibz70j8b6rj01cg1iisj50zx6"; }; propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + description = "Perform diffs on files and record sets"; + license = "perl"; + }; }; TextGlob = buildPerlPackage rec { @@ -4044,20 +4886,29 @@ rec { }; TextSimpleTable = buildPerlPackage { - name = "Text-SimpleTable-0.05"; + name = "Text-SimpleTable-2.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Text-SimpleTable-0.05.tar.gz; - sha256 = "028pdfmr2gnaq8w3iar8kqvrpxcghnag8ls7h4227l9zbxd1k9p9"; + url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.03.tar.gz; + sha256 = "15hpry9jwrf1vbjyk21s65rllxrdvp2fdzzv9gsvczggby2yyzfs"; + }; + meta = { + description = "Simple eyecandy ASCII tables"; + license = "artistic_2"; }; }; - TextTable = buildPerlPackage rec { - name = "Text-Table-1.114"; + TextTable = buildPerlPackage { + name = "Text-Table-1.126"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANNO/${name}.tar.gz"; - sha256 = "0qnpfyv7l98hyah3bnq19c33m9jh5sg0fmw2xxzaygmnp2pgpmpm"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.126.tar.gz; + sha256 = "18v9ll360q4hlhmpks175da7y8nf6ywygd39archnw3zpn1cv7h1"; + }; + propagatedBuildInputs = [ TextAligner ]; + meta = { + homepage = http://www.shlomifish.org/open-source/projects/docmake/; + description = "Organize Data in Tables"; + license = "bsd"; }; - propagatedBuildInputs = [TextAligner]; }; TextTabularDisplay = buildPerlPackage rec { @@ -4069,6 +4920,20 @@ rec { propagatedBuildInputs = [TextAligner]; }; + TestTrap = buildPerlPackage { + name = "Test-Trap-v0.2.2"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.2.2.tar.gz; + sha256 = "1ci5ag9pm850ww55n2929skvw3avy6xcrwmmi2yyn0hifxx9dybs"; + }; + buildInputs = [ TestTester ]; + propagatedBuildInputs = [ DataDump ]; + meta = { + description = "Trap exit codes, exceptions, output, etc."; + license = "perl"; + }; + }; + TextUnidecode = buildPerlPackage rec { name = "Text-Unidecode-0.04"; src = fetchurl { @@ -4086,11 +4951,15 @@ rec { propagatedBuildInputs = [ DevelStackTrace Moose ]; }; - TieIxHash = buildPerlPackage rec { - name = "Tie-IxHash-1.21"; + TieIxHash = buildPerlPackage { + name = "Tie-IxHash-1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GS/GSAR/${name}.tar.gz"; - sha256 = "1xpj2c1dzcp14hfnxahy4r5f19c8afh8k6sfryq9gi76aadvjyk8"; + url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.22.tar.gz; + sha256 = "0f0m0x8nkidxd0pxnls1i8kc8d7bd89dqgihz29wj3ggk43qffr7"; + }; + meta = { + description = "Ordered associative arrays for Perl"; + license = "perl"; }; }; @@ -4120,10 +4989,16 @@ rec { }; TreeDAGNode = buildPerlPackage { - name = "Tree-DAG_Node-1.06"; + name = "Tree-DAG_Node-1.09"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COGENT/Tree-DAG_Node-1.06.tar.gz; - sha256 = "0anvwfh4vqj41ipq52p65sqlvw3rvm6cla5hbws13gyk9mvp09ah"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.09.tgz; + sha256 = "1k2byyk7dnm8l6i1igagpfr58b02zsq5hwd9jcdp8yrlih7dzii3"; + }; + buildInputs = [ TestPod ]; + meta = { + homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + description = "An N-ary tree"; + license = "perl5"; }; }; @@ -4133,7 +5008,11 @@ rec { url = mirror://cpan/authors/id/S/ST/STEVAN/Tree-Simple-1.18.tar.gz; sha256 = "0bb2hc8q5rwvz8a9n6f49kzx992cxczmrvq82d71757v087dzg6g"; }; - propagatedBuildInputs = [TestException]; + buildInputs = [ TestException ]; + meta = { + description = "A simple tree object"; + license = "perl"; + }; }; TreeSimpleVisitorFactory = buildPerlPackage { @@ -4146,11 +5025,14 @@ rec { buildInputs = [TestException]; }; - TryTiny = buildPerlPackage rec { - name = "Try-Tiny-0.09"; + TryTiny = buildPerlPackage { + name = "Try-Tiny-0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOY/${name}.tar.gz"; - sha256 = "1fjhwq347wa74h94nd54lx194s26s7x9whfc0kkpcng2sgs54vvs"; + url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.12.tar.gz; + sha256 = "0awv2w33jb1xw3bsrfwsz53dgwm8s8vnpk4ssxxp3n89i7116p2g"; + }; + meta = { + homepage = https://github.com/doy/try-tiny.git; }; }; @@ -4162,11 +5044,16 @@ rec { }; }; - UNIVERSALisa = buildModule rec { - name = "UNIVERSAL-isa-1.01"; + UNIVERSALisa = buildPerlPackage { + name = "UNIVERSAL-isa-1.20120726"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; - sha256 = "0iksklmfhiaxg2rsw827n97k1mris6dg596rdwk2gmrwl0rsk0wz"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-isa-1.20120726.tar.gz; + sha256 = "1qal99sp888b50kwank9ffyprv7kqx42p4vyfahdabf915lyzc61"; + }; + meta = { + homepage = https://github.com/chromatic/UNIVERSAL-isa; + description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; + license = "perl"; }; }; @@ -4178,11 +5065,15 @@ rec { }; }; - URI = buildPerlPackage rec { - name = "URI-1.59"; + URI = buildPerlPackage { + name = "URI-1.60"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1inanl9vs6q1bwvig1s8hdwagjw4484gs4s7pjnx5f4xb2dx526b"; + url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz; + sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz"; + }; + meta = { + description = "Uniform Resource Identifiers (absolute and relative)"; + license = "perl"; }; }; @@ -4249,14 +5140,32 @@ rec { doCheck = false; # performs network access }; - WWWMechanize = buildPerlPackage rec { - name = "WWW-Mechanize-1.54"; + WWWMechanize = buildPerlPackage { + name = "WWW-Mechanize-1.72"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "1yxvw5xfng5fj4422869p5dwvmrkmqph9gdm2nl12wngydk93lnh"; + url = mirror://cpan/authors/id/J/JE/JESSE/WWW-Mechanize-1.72.tar.gz; + sha256 = "0vs3p2697675bswjayfmm37lg3xsxm94z1mif18s732kwvnpg6m6"; }; - propagatedBuildInputs = [LWP HTTPResponseEncoding HTTPServerSimple]; + propagatedBuildInputs = [ HTMLForm HTMLParser HTMLTree HTTPDaemon HTTPMessage HTTPServerSimple LWP LWPUserAgent TestWarn URI ]; doCheck = false; + meta = { + homepage = https://github.com/bestpractical/www-mechanize; + description = "Handy web browsing in a Perl object"; + license = "perl5"; + }; + }; + + WWWRobotRules = buildPerlPackage { + name = "WWW-RobotRules-6.02"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz; + sha256 = "07m50dp5n5jxv3m93i55qvnd67a6g7cvbvlik115kmc8lbkh5da6"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Database of robots.txt-derived permissions"; + license = "perl"; + }; }; X11GUITest = buildPerlPackage rec { @@ -4369,27 +5278,29 @@ rec { }; }; - # XSLoader = buildPerlPackage { - # name = "XSLoader-0.08"; - # src = fetchurl { - # url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; - # sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; - # }; - # }; - - YAML = buildPerlPackage rec { - name = "YAML-0.80"; + YAML = buildPerlPackage { + name = "YAML-0.84"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "81ada73c7eda69dad3cc679b2facba50f2634edcc16c59a7b66bffb9f2fa0e90"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/YAML-0.84.tar.gz; + sha256 = "03349n2z32gwjqiq7l3g57avvphl2rw3lmwc8i5cl9hmfw51yd8a"; + }; + meta = { + homepage = https://github.com/ingydotnet/yaml-pm/tree; + description = "YAML Ain't Markup Language (tm)"; + license = "perl"; }; }; - YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.05"; + YAMLSyck = buildPerlPackage { + name = "YAML-Syck-1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AU/AUDREYT/${name}.tar.gz"; - sha256 = "15acwp2qdxfmhfqj4c1s57xyy48hcfc87lblww3lbvihqbysyzss"; + url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.22.tar.gz; + sha256 = "0n3k71i0b8mhdrl5kp1cwyvjbkqahyqkhp81wl3qnkfhyi39f55y"; + }; + meta = { + homepage = http://search.cpan.org/dist/YAML-Syck; + description = "Fast, lightweight YAML loader and dumper"; + license = "mit"; }; }; From 49dbf7057d2beeb8c7fb0b49c82455130bf0db59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 19 Jan 2013 01:28:15 +0100 Subject: [PATCH 191/302] Add pythonPackages Distutils2 and eggdeps --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 971c4194533..a7799b75b99 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -620,6 +620,25 @@ let pythonPackages = python.modules // rec { }); + distutils2 = buildPythonPackage rec { + name = "distutils2-${version}"; + version = "1.0a4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz"; + md5 = "52bc9dffb394970c27e02853ae3a3241"; + }; + + doCheck = false; + + meta = { + description = "A Python Packaging Library"; + homepage = http://pypi.python.org/pypi/Distutils2; + license = "PSF"; + }; + }; + + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; @@ -3065,6 +3084,24 @@ let pythonPackages = python.modules // rec { }; + eggdeps = buildPythonPackage rec { + name = "eggdeps-${version}"; + version = "0.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz"; + md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; + }; + + propagatedBuildInputs = [ zopeInterface zope_testing ]; + meta = { + description = "A tool which computes a dependency graph between active Python eggs"; + homepage = http://thomas-lotze.de/en/software/eggdeps/; + license = "ZPL"; + }; + }; + + turses = buildPythonPackage (rec { name = "turses-0.2.9"; From c296be5519bad552a98882eb53ac5e85e04b48fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Jan 2013 02:26:03 +0100 Subject: [PATCH 192/302] stellarium: update to version 0.11.4a --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e890ee58307..541340df629 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.4"; + name = "stellarium-0.11.4a"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535"; + sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; From ff461b0755f35de49cfe6d29a49fbf5c4c457b33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 19 Jan 2013 02:31:21 +0100 Subject: [PATCH 193/302] maxima: update to version 5.29.1 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 18d145b6dde..d644a1633cb 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.28.0"; + version = "5.29.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda"; + sha256 = "1p94l28adcn0826nah460r9pz71h7wd5klsg885sl2gzds75bn74"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From 8f0ea2b4c09a28553907cd28a24f4e75aad82ebd Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 19 Jan 2013 18:21:23 +0100 Subject: [PATCH 194/302] pythonPackages: default to python's maintainers and platforms --- pkgs/development/python-modules/generic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 8a70741c36b..b014d93ba12 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -40,6 +40,8 @@ , preInstall ? "" , postInstall ? "" +, meta ? {} + , ... } @ attrs: # Keep extra attributes from ATTR, e.g., `patchPhase', etc. @@ -48,6 +50,12 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; + # default values for maintainers and platforms + meta = { + maintainers = python.meta.maintainers; + platforms = python.meta.platforms; + } // meta; + # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; From ddba22fa2e9e4c0a5dc0612ffd6d3646e99089b6 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 19 Jan 2013 19:34:52 +0100 Subject: [PATCH 195/302] chromiumBeta and Dev update dev should be 26.0.1386.0, but its link is broken --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b274527dfba..a7687e731f5 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "25.0.1364.29"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2"; - sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp"; + version = "25.0.1364.36"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; + sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; beta = { - version = "24.0.1312.52"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.52.tar.bz2"; - sha256 = "04fp04591dszx07wwdsgxf0wb2sxm863z1qxn5dii6f9yjqgh3gk"; + version = "25.0.1364.36"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; + sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; stable = { version = "24.0.1312.52"; From 3066f86e0dcd4629204e9643dfe6d67afb7c8269 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sat, 19 Jan 2013 11:25:43 -0800 Subject: [PATCH 196/302] Fixed tinc license. --- pkgs/tools/networking/tinc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index dadadc08520..b42b364f605 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { authentication, compression and ethernet bridging. ''; homepage="http://www.tinc-vpn.org/"; - license = "gpl2Plus"; + license = stdenv.lib.licenses.gpl2; }; } From 04194c576eca6d4f13e5a7c79a9a69e831365cd1 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sat, 19 Jan 2013 13:33:32 -0800 Subject: [PATCH 197/302] tinc: GPLv2+, not GPLv2. --- pkgs/tools/networking/tinc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index b42b364f605..bcfb584da1b 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { authentication, compression and ethernet bridging. ''; homepage="http://www.tinc-vpn.org/"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; }; } From 4b9df608e286dca85426bca05a67aa86c1d8c400 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 20 Jan 2013 00:39:13 +0100 Subject: [PATCH 198/302] v4l: Fix building of ir-keytable --- pkgs/os-specific/linux/v4l-utils/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index ea63dadc8bd..70a81605ea0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -13,11 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4; - # The keytable wants to touch /etc files and udev scripts in /lib. - # I skip it. - patchPhase = '' - sed -i s/keytable// utils/Makefile - ''; + configureFlags = [ + "--with-udevdir=$(out)/lib/udev" + ]; installPhase = '' make PREFIX=$out install From a72c9d728df9be917e4d9e363e3376419d6831db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 20 Jan 2013 11:56:52 +0100 Subject: [PATCH 199/302] Distutils2: patch to work with Python2 (only), until the issue http://bugs.python.org/issue17002 is resolved upstream --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7799b75b99..592bcbd5b37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -629,6 +629,10 @@ let pythonPackages = python.modules // rec { md5 = "52bc9dffb394970c27e02853ae3a3241"; }; + patchPhase = '' + sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py + ''; + doCheck = false; meta = { From ced57493ee6853fd05cec18c5f9abeaa530e5370 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:23:28 +0100 Subject: [PATCH 200/302] v4l-utils: update to version 0.9.3 This update fixes the build of the SANE back and front-ends. --- pkgs/os-specific/linux/v4l-utils/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 70a81605ea0..8e6584465d0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -4,28 +4,22 @@ assert withQt4 -> qt4 != null; stdenv.mkDerivation rec { - name = "v4l-utils-0.8.8"; + name = "v4l-utils-0.9.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z"; + sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah"; }; - buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4; + buildInputs = [ which ]; + propagatedBuildInputs = [ libjpeg ] ++ stdenv.lib.optional withQt4 qt4; - configureFlags = [ - "--with-udevdir=$(out)/lib/udev" - ]; - - installPhase = '' - make PREFIX=$out install - ''; + preConfigure = ''configureFlags="--with-udevdir=$out/lib/udev"''; meta = { homepage = http://linuxtv.org/projects.php; description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device"; - # (The libs are of LGPLv2.1+, some other pieces are GPL) - license = "free"; + license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL. maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; From 46843e60a1aca56c2ff6e505be95058430968297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: [PATCH 201/302] haskell-certificate: update to version 1.3.5 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index eb40a4744f9..036e7ddc124 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.3"; - sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2"; + version = "1.3.5"; + sha256 = "17g2alyib89y2k8jjg4b6jskz0ndpr92yi8hzra7vw7ygfi5mi4j"; isLibrary = true; isExecutable = true; buildDepends = [ From 5b3e861748467b7756446377811906a73331457a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:49 +0100 Subject: [PATCH 202/302] haskell-hakyll: update to version 4.1.1.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9b708eff020..2824234ede3 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.0.0.0"; - sha256 = "165r9x158nnnwzd1cxymskkxvfhxsnpam8bi3gjy8bql8arsibzr"; + version = "4.1.1.0"; + sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz"; isLibrary = true; isExecutable = true; buildDepends = [ From 0184ed349bf0d2dec1ec3ee023354fd46c827f26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 203/302] haskell-highlighting-kate: update to version 0.5.3.5 --- .../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 cc591acf202..afb6a4be662 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.4"; - sha256 = "1xm9dr71qna1w65vzaf63hbchpvshfjvvs5038sy04x2ddwdix77"; + version = "0.5.3.5"; + sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From f13f0860152f596a85376659fe609240c3616c70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 204/302] haskell-pandoc-types: update to version 1.10 --- pkgs/development/libraries/haskell/pandoc-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 6dfbc1fc15f..d4f49791d30 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.9.1"; - sha256 = "1174nkaig0g71n3kqrhgqn7xmr9rni3l3dh1xpypc0ksjm0ym21i"; + version = "1.10"; + sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; buildDepends = [ syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; From 3a4f88d02bc0bfb56c1253f807807d86395d07c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 205/302] haskell-pandoc: update to version 1.10 --- .../libraries/haskell/pandoc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index b3bfbc50b5f..98f4dfb0501 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,20 +1,20 @@ { cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs -, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl -, network, pandocTypes, parsec, random, syb, tagsoup, temporary -, texmath, time, utf8String, xml, zipArchive, zlib +, dataDefault, extensibleExceptions, filepath, highlightingKate +, HTTP, json, mtl, network, pandocTypes, parsec, random, syb +, tagsoup, temporary, texmath, text, time, xml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4.5"; - sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb"; + version = "1.10"; + sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml blazeMarkup citeprocHs + base64Bytestring blazeHtml blazeMarkup citeprocHs dataDefault extensibleExceptions filepath highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath - time utf8String xml zipArchive zlib + text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; meta = { From 6eec1e54c9ef11d771a8db659f02a5af92dbd56a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 206/302] haskell-tls-extra: update to version 0.6.1 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 5bcce9df16b..c9ab989ed76 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.6.0"; - sha256 = "11cf91cgbyp4xzbr3n9h20rvbb6756r9dk74r5w158f3xmlgk5nx"; + version = "0.6.1"; + sha256 = "0gc3dz3s188jk6q2lai56y4ckxh62s9gm04d7jznr6jzpx2i4fan"; isLibrary = true; isExecutable = true; buildDepends = [ From 58dc4a76ad36bb9de719e9019194fac215cf0b13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 207/302] haskell-yst: update to version 0.3.1 --- pkgs/development/libraries/haskell/yst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 5cb5fb6a209..5087bfce12c 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.3.0.1"; - sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv"; + version = "0.3.1"; + sha256 = "1ax3j21b4ac9x4vvvfgnhz0sczd7l7ia6mcxnqhbc3166sn91vig"; isLibrary = false; isExecutable = true; buildDepends = [ From f8447dc1e0ef4809a026a12e674a97f7b517cec7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 20 Jan 2013 16:42:50 +0100 Subject: [PATCH 208/302] haskell-hlint: update to version 1.8.41 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 4cbd57a8c5f..5b7a925e20b 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.40"; - sha256 = "18w4dhxv7c1y4x1agdjq99ss5i77jnm8p9vg3jp9gvhk2arhcl0x"; + version = "1.8.41"; + sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q"; isLibrary = true; isExecutable = true; buildDepends = [ From 7fef7e53ce7e068044a2fb806fa1ec28cf16d90c Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Jan 2013 02:28:09 +0100 Subject: [PATCH 209/302] pythonPackages: use pygobject and pygtk of same python version --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 592bcbd5b37..5e4995d2d5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1600,7 +1600,7 @@ let pythonPackages = python.modules // rec { sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; - buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -2850,7 +2850,7 @@ let pythonPackages = python.modules // rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ]; + propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; From e185691ced86fc517a2daea762d7d11e525c6ae8 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 20 Jan 2013 16:45:02 +0100 Subject: [PATCH 210/302] python: nose2, nose2Cov and covCore --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e4995d2d5d..b098caebe47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -502,6 +502,18 @@ let pythonPackages = python.modules // rec { }; }; + covCore = buildPythonPackage rec { + name = "cov-core-1.7"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/cov-core/cov-core-1.7.tar.gz"; + md5 = "59c1e22e636633e10120beacbf45b28c"; + }; + meta = { + description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; + }; + propagatedBuildInputs = [ coverage ]; + }; + cssselect = buildPythonPackage rec { name = "cssselect-0.7.1"; src = fetchurl { @@ -1592,6 +1604,32 @@ let pythonPackages = python.modules // rec { buildInputs = [ coverage ]; }; + nose2 = buildPythonPackage rec { + name = "nose2-0.4.5"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; + md5 = "d7e51c848227488e3cc0424faf5511cd"; + }; + meta = { + description = "nose2 is the next generation of nicer testing for Python"; + }; + propagatedBuildInputs = [ six ]; + # AttributeError: 'module' object has no attribute 'collector' + doCheck = false; + }; + + nose2Cov = buildPythonPackage rec { + name = "nose2-cov-1.0a4"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz"; + md5 = "6442f03e2ea732b0e38eb5b00fbe0b31"; + }; + meta = { + description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; + }; + buildInputs = [ covCore nose2 ]; + }; + notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; From bcc0c1dc591542bedcf39db53f7f80733aacbc5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 Jan 2013 17:25:09 +0100 Subject: [PATCH 211/302] Update nixUnstable --- pkgs/tools/package-management/nix/unstable.nix | 12 ++++++++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 30e52da8638..4c053c9e820 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.2pre2980_9de6bc5"; + name = "nix-1.4pre3044_536c85e"; src = fetchurl { - url = "http://hydra.nixos.org/build/3338447/download/4/${name}.tar.bz2"; - sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0"; + url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz"; + sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = '' - --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-store-dir=${storeDir} --localstatedir=${stateDir} --sysconfdir=/etc --with-dbi=${perlPackages.DBI}/${perl.libPrefix} --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + makeFlags = "profiledir=$(out)/etc/profile.d"; + + installFlags = "sysconfdir=$(out)/etc"; + doInstallCheck = true; crossAttrs = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173f080f652..a21103c84a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8978,14 +8978,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nut = callPackage ../applications/misc/nut { }; From 9c2bc27eb2ccded853aabd1382fd912df4b5e4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 20 Jan 2013 18:51:41 +0100 Subject: [PATCH 212/302] Fixing mcelog, so it puts the proper files in share/doc It was running "cp mce.pdf $out/share/doc", which created the file 'doc'. Then buildEnv complained that 'share/doc' exists. --- pkgs/os-specific/linux/mcelog/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 82c502ede72..b60b6134fdd 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -25,9 +25,13 @@ in stdenv.mkDerivation { makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc"; + preInstall = '' + ensureDir $out/share/doc + ''; + meta = { description = "Tool to display logged machine check exceptions"; homepage = http://mcelog.org/; license = stdenv.lib.licenses.gpl2; }; -} \ No newline at end of file +} From a865154f62179b1af6546a4d2d3338b5937afcf2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 04:43:59 +0100 Subject: [PATCH 213/302] Add myself as (additional) maintainer to all python packages. --- pkgs/development/python-modules/generic/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index b014d93ba12..70bf92f0ae9 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -50,11 +50,13 @@ python.stdenv.mkDerivation (attrs // { name = namePrefix + name; - # default values for maintainers and platforms + # default to python's platforms and add maintainer(s) to every + # package meta = { - maintainers = python.meta.maintainers; platforms = python.meta.platforms; - } // meta; + } // meta // { + maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ]; + }; # checkPhase after installPhase to run tests on installed packages phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase"; From 9ee07ba54ff80f714610633acf63afa742d2633e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 05:35:41 +0100 Subject: [PATCH 214/302] python-mrbob: add missing dependency --- 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 b098caebe47..10bb5821447 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1445,7 +1445,7 @@ let pythonPackages = python.modules // rec { md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.unzip six ]; propagatedBuildInputs = [ argparse jinja2 ]; From b469185673c3e24746cbf54277fc8640b7fe66c0 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 06:42:22 +0100 Subject: [PATCH 215/302] pythonPackages26 fixes --- pkgs/top-level/python-packages.nix | 42 ++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10bb5821447..0ca54c90c4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1,6 +1,12 @@ { pkgs, python }: -let pythonPackages = python.modules // rec { +let +isPy26 = python.majorVersion == "2.6"; +isPy27 = python.majorVersion == "2.7"; +optional = pkgs.lib.optional; +optionals = pkgs.lib.optionals; + +pythonPackages = python.modules // rec { inherit python; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; @@ -996,8 +1002,7 @@ let pythonPackages = python.modules // rec { sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0"; }; - buildInputs = [ pkgs.setuptools ] ++ - (if python.majorVersion == "2.6" then [ argparse ] else []); + buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse); meta = { description = "automatically generated zsh completion function for Python's option parser modules"; @@ -1101,6 +1106,14 @@ let pythonPackages = python.modules // rec { }; }; + importlib = if isPy26 then (buildPythonPackage { + name = "importlib-1.0.2"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; + md5 = "4aa23397da8bd7c7426864e88e4db7e1"; + }; + doCheck = false; + }) else null; iptools = buildPythonPackage rec { version = "0.4.0"; @@ -1445,7 +1458,7 @@ let pythonPackages = python.modules // rec { md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; }; - buildInputs = [ pkgs.unzip six ]; + buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]); propagatedBuildInputs = [ argparse jinja2 ]; @@ -1604,7 +1617,7 @@ let pythonPackages = python.modules // rec { buildInputs = [ coverage ]; }; - nose2 = buildPythonPackage rec { + nose2 = if isPy26 then null else (buildPythonPackage rec { name = "nose2-0.4.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; @@ -1616,9 +1629,9 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ six ]; # AttributeError: 'module' object has no attribute 'collector' doCheck = false; - }; + }); - nose2Cov = buildPythonPackage rec { + nose2Cov = if isPy26 then null else (buildPythonPackage rec { name = "nose2-cov-1.0a4"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz"; @@ -1628,7 +1641,7 @@ let pythonPackages = python.modules // rec { description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; }; buildInputs = [ covCore nose2 ]; - }; + }); notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -1743,6 +1756,15 @@ let pythonPackages = python.modules // rec { # }; # }); + ordereddict = if isPy26 then (buildPythonPackage { + name = "ordereddict-1.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/ordereddict/ordereddict-1.1.tar.gz"; + md5 = "a0ed854ee442051b249bfad0f638bbec"; + }; + doCheck = false; + }) else null; + ply = buildPythonPackage (rec { name = "ply-3.2"; @@ -3152,9 +3174,7 @@ let pythonPackages = python.modules // rec { sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; }; - propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ - (if python.majorVersion == "2.6" then [ argparse ] - else []); + propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; #buildInputs = [ tox ]; # needs tox From 3ab50c106df00400ca754e1bbd77fe698f565238 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 06:50:10 +0100 Subject: [PATCH 216/302] python-ipdb --- pkgs/top-level/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ca54c90c4d..f40997ecc64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1149,6 +1149,15 @@ pythonPackages = python.modules // rec { }; }; + ipdb = buildPythonPackage { + name = "ipdb-0.7"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz"; + md5 = "d879f9b2b0f26e0e999809585dcaec61"; + }; + propagatedBuildInputs = [ ipython ]; + }; + jedi = buildPythonPackage (rec { name = "jedi-0.5b5"; From 8dd5f835fc4c08aa2f1801d7f96e72ae1b4635bb Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:37:07 +0100 Subject: [PATCH 217/302] python-coverage-3.6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f40997ecc64..4ebf9507203 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,11 +492,11 @@ pythonPackages = python.modules // rec { }); coverage = buildPythonPackage rec { - name = "coverage-3.5.3"; + name = "coverage-3.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz"; - md5 = "5f1f523940c473faa8a9f6ca29f78efc"; + md5 = "67d4e393f4c6a5ffc18605409d2aa1ac"; }; meta = { From 8b777bbf5751b00ef8179118e1d1a520987245c3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:37:28 +0100 Subject: [PATCH 218/302] nose2Cov does not create pth for deps - propagate manually --- 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 4ebf9507203..dbc0948d74e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1649,7 +1649,7 @@ pythonPackages = python.modules // rec { meta = { description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; }; - buildInputs = [ covCore nose2 ]; + propagatedBuildInputs = [ covCore nose2 ]; }); notify = pkgs.stdenv.mkDerivation (rec { From 52e9981e0e5fc57888377dcfbf5993e5d7fd0bb2 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 08:38:54 +0100 Subject: [PATCH 219/302] buildPythonPackage defaults to python.meta.platforms --- pkgs/top-level/python-packages.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbc0948d74e..96b338f89db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -114,7 +114,6 @@ pythonPackages = python.modules // rec { homepage = https://github.com/teythoon/afew; description = "afew is an initial tagging script for notmuch mail."; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -143,7 +142,6 @@ pythonPackages = python.modules // rec { homepage = https://github.com/pazz/alot; description = "Terminal MUA using notmuch mail"; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -467,7 +465,6 @@ pythonPackages = python.modules // rec { description = "Simple, lightweight, and easily extensible STOMP message broker"; homepage = http://code.google.com/p/coilmq/; license = pkgs.lib.licenses.asl20; - platforms = python.meta.platforms; }; }); @@ -487,7 +484,6 @@ pythonPackages = python.modules // rec { homepage = http://pypi.python.org/pypi/configobj; license = pkgs.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -504,7 +500,6 @@ pythonPackages = python.modules // rec { homepage = http://nedbatchelder.com/code/coverage/; license = pkgs.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = python.meta.platforms; }; }; @@ -633,7 +628,6 @@ pythonPackages = python.modules // rec { description = "Easily download, build, install, upgrade, and uninstall Python packages"; homepage = http://packages.python.org/distribute; license = "PSF or ZPL"; - platforms = python.meta.platforms; }; }); @@ -881,7 +875,6 @@ pythonPackages = python.modules // rec { homepage = http://pypi.python.org/pypi/flake8; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -945,7 +938,6 @@ pythonPackages = python.modules // rec { license = "MIT"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -1008,7 +1000,6 @@ pythonPackages = python.modules // rec { description = "automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = python.meta.platforms; }; }; @@ -1102,7 +1093,6 @@ pythonPackages = python.modules // rec { description = "A comprehensive HTTP client library"; license = pkgs.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -1171,7 +1161,6 @@ pythonPackages = python.modules // rec { description = "An autocompletion tool for Python that can be used for text editors."; license = pkgs.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -1688,7 +1677,6 @@ pythonPackages = python.modules // rec { description = "A Python wrapper around notmuch"; homepage = http://notmuchmail.org/; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -1804,7 +1792,6 @@ pythonPackages = python.modules // rec { license = "revised-BSD"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -1835,8 +1822,6 @@ pythonPackages = python.modules // rec { tunnel -- this is how sftp works, for example. it is written entirely in python (no C or platform-dependent code) and is released under the GNU LGPL (lesser GPL). ''; - - platforms = python.meta.platforms; }; }; @@ -1930,7 +1915,6 @@ pythonPackages = python.modules // rec { ''; maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = python.meta.platforms; }; }; @@ -2215,7 +2199,6 @@ pythonPackages = python.modules // rec { description = "A Python wrapper for the GPGME library."; license = pkgs.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }; @@ -2448,7 +2431,6 @@ pythonPackages = python.modules // rec { license = "revised BSD"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }); @@ -3014,7 +2996,6 @@ pythonPackages = python.modules // rec { description = "Lightweight and extensible STOMP messaging client"; homepage = http://bitbucket.org/hozn/stompclient; license = pkgs.lib.licenses.asl20; - platforms = python.meta.platforms; }; }); @@ -3244,7 +3225,6 @@ pythonPackages = python.modules // rec { license = "MIT"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = python.meta.platforms; }; }; @@ -3302,7 +3282,6 @@ pythonPackages = python.modules // rec { homepage = http://excess.org/urwid; license = pkgs.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.garbas ]; - platforms = python.meta.platforms; }; }); @@ -3722,7 +3701,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/cliapp/; description = "Python framework for Unix command line programs."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3743,7 +3721,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/tracing/; description = "Python debug logging helper."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3764,7 +3741,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/ttystatus/; description = "Progress and status updates on terminals for Python."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3787,7 +3763,6 @@ pythonPackages = python.modules // rec { homepage = http://liw.fi/larch/; description = "Python B-tree library."; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3807,7 +3782,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Fixed size round-robin style database"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3830,7 +3804,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Backend data caching and persistence daemon for Graphite"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3849,7 +3822,6 @@ pythonPackages = python.modules // rec { homepage = https://launchpad.net/txamqp; description = "Library for communicating with AMQP peers and brokers using Twisted"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; @@ -3871,7 +3843,6 @@ pythonPackages = python.modules // rec { homepage = http://graphite.wikidot.com/; description = "Enterprise scalable realtime graphing"; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = python.meta.platforms; }; }; From adf7a68158d2208cd0ccbfff1498d091c79f32d8 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 21 Jan 2013 04:28:23 +0100 Subject: [PATCH 220/302] perl package version maintenance as those packages are needed by wget and its dependencies --- .../Compress-Raw-Bzip2/default.nix | 4 +- .../Compress-Raw-Zlib/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 51 +++++++++++-------- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix index 6515efada6f..5d6ab248202 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, bzip2 }: buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.049"; + name = "Compress-Raw-Bzip2-2.060"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "7881473e0ab5ecc6ce609382e4f7466fb32217e928eef27e7084702bb07ac172"; + sha256 = "02azwhglk2w68aa47sjqhj6vwzi66mv4hwal87jccjfy17gcwvx7"; }; # Don't build a private copy of bzip2. diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index c2c7b5f8363..d5d5a9f16a4 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.051"; + name = "Compress-Raw-Zlib-2.060"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "16c7e0d2ed339c0b5ffe787bbcc9fc063ce6f2145d8cd6a18d0c79fa68d36c09"; + sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3"; }; preConfigure = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 138f4b19279..efd173ffcf1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1479,10 +1479,10 @@ rec { }; EncodeLocale = buildPerlPackage rec { - name = "Encode-Locale-1.02"; + name = "Encode-Locale-1.03"; src = fetchurl { url = "mirror://cpan/modules/by-module/Encode/${name}.tar.gz"; - sha256 = "0h2kim6mg236s749wlg35lhv1zdkrkr0bm65spkg005cn0mbmi90"; + sha256 = "0m9d1vdphlyzybgmdanipwd9ndfvyjgk3hzw250r299jjgh3fqzp"; }; }; @@ -1623,10 +1623,10 @@ rec { }; FileListing = buildPerlPackage rec { - name = "File-Listing-6.03"; + name = "File-Listing-6.04"; src = fetchurl { url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; - sha256 = "154hp49pcngsqrwi1pbw3fx82v7vql4dc9wh7qfj37vmy8sn1s93"; + sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; }; propagatedBuildInputs = [ HTTPDate ]; }; @@ -1878,10 +1878,10 @@ rec { }; HTMLParser = buildPerlPackage rec { - name = "HTML-Parser-3.68"; + name = "HTML-Parser-3.69"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; - sha256 = "1hhniqqpvi01vxsyvmcj677yg7a12zy0a3ynwxwg3ig6shn8a3j3"; + sha256 = "01i4lj37dgwbj9mna756dzzz5lvx7adcnjk9s0hskqq0cn81r2vl"; }; propagatedBuildInputs = [HTMLTagset]; }; @@ -1962,19 +1962,19 @@ rec { }; HTTPCookies = buildPerlPackage rec { - name = "HTTP-Cookies-6.00"; + name = "HTTP-Cookies-6.01"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "0758c3rj22z1bj7pbypmh1jadgd6w68nn8inhds96r39jhc79d9h"; + sha256 = "087bqmg22dg3vj7gssh3pcsh9y1scimkbl5h1kc8jqyfhgisvlzm"; }; propagatedBuildInputs = [ HTTPDate HTTPMessage ]; }; HTTPDate = buildPerlPackage rec { - name = "HTTP-Date-6.00"; + name = "HTTP-Date-6.02"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "15nrnfir4xqdd3lm0s0jgh9zwxx5ylmvl63xqmj5wipzl4l76vs6"; + sha256 = "0cz357kafhhzw7w59iyi0wvhw7rlh5g1lh38230ckw7rl0fr9fg8"; }; }; @@ -1995,12 +1995,12 @@ rec { }; HTTPMessage = buildPerlPackage rec { - name = "HTTP-Message-6.02"; + name = "HTTP-Message-6.06"; src = fetchurl { url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "10ai2vabbx6yqsyz6rbi7hp4vljmlq9kyn74jvjp95la5v4b6c93"; + sha256 = "0qxdrcak97azjvqyx1anpb2ky6vp6vc37x0wcfjdqfajkh09fzh8"; }; - propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI ]; + propagatedBuildInputs = [ EncodeLocale HTMLParser HTTPDate IOCompress LWPMediaTypes URI IOHTML ]; }; HTTPParserXS = buildPerlPackage rec { @@ -2066,14 +2066,15 @@ rec { }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.037"; + name = "IO-Compress-2.060"; src = fetchurl { url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "07hs3afzg9ry6ir2f9rf3fg8b129cihs989mr0nh9wdvxgxqmr1q"; + sha256 = "03zaq9xzg0z9wcgj1hws8zhzdgdlwiz48nh6sy663bn7rzxm5k28"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Work around a self-referencing Makefile variable. makeFlags = "INSTALLARCHLIB=$(INSTALLSITEARCH)"; + doCheck = !stdenv.isDarwin; }; IODigest = buildPerlPackage { @@ -2085,6 +2086,14 @@ rec { propagatedBuildInputs = [PerlIOviadynamic]; }; + IOHTML = buildPerlPackage rec { + name = "IO-HTML-0.04"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "0c4hc76c1gypdwfasnibr2qlf9x3bnhyw357lhqlrczbm6vn8hw5"; + }; + }; + IOLockedFile = buildPerlPackage rec { name = "IO-LockedFile-0.23"; src = fetchurl { @@ -2424,10 +2433,10 @@ rec { }; LWP = buildPerlPackage rec { - name = "libwww-perl-6.03"; + name = "libwww-perl-6.04"; src = fetchurl { url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "1zlnz4ylk1y0rw56vlf9knawwjx72b1gm09yp06ccpgmmndif4dg"; + sha256 = "0z92fpwk6lh2gghv050r0qb216jmjl2m0c6zby935q8lv0q5wwgr"; }; propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPMessage LWPMediaTypes URI NetHTTP ]; @@ -2435,10 +2444,10 @@ rec { }; LWPMediaTypes = buildPerlPackage rec { - name = "LWP-MediaTypes-6.01"; + name = "LWP-MediaTypes-6.02"; src = fetchurl { url = "mirror://cpan/modules/by-module/LWP/${name}.tar.gz"; - sha256 = "1fhxql3xnhrlyzkjyss4swvhyh0r58cv2kwjcpj3mdbbg54ah9fz"; + sha256 = "0xmnblp962qy02akah30sji8bxrqcyqlff2w95l199ghql60ny8q"; }; }; @@ -2882,10 +2891,10 @@ rec { }; NetHTTP = buildPerlPackage rec { - name = "Net-HTTP-6.01"; + name = "Net-HTTP-6.05"; src = fetchurl { url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; - sha256 = "0ipad5y605fr968snxmp1sxrkvag9r5y0g8qvj9n7ca9nbwq7n3n"; + sha256 = "1r2bv3cw4m054qfsm6i7rpvhrql1d78izpc36prv3xvahfsqxawc"; }; }; From 352c0067e69a4ef27a78cc814982d33e7cd2f6c4 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 21 Jan 2013 04:29:26 +0100 Subject: [PATCH 221/302] some tests for nettle and gnutls donot seem to work on OS X --- pkgs/development/libraries/gnutls/default.nix | 2 +- pkgs/development/libraries/nettle/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3e5ba3079f0..a1c1f3f357f 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (rec { # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD); + doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); meta = { description = "The GNU Transport Layer Security Library"; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 2a4d89bb4f0..2e444c32177 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (rec { buildInputs = [ gnum4 ]; propagatedBuildInputs = [ gmp ]; - doCheck = (stdenv.system != "i686-cygwin"); + doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); enableParallelBuilding = true; From 8511c359d10ce4f1855f1eb85e5b09a9196234d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:07:57 +0100 Subject: [PATCH 222/302] perl-packages: remove 'HTTPParser' attribute, which is a duplicate of 'HTTPMessage' --- pkgs/top-level/perl-packages.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index efd173ffcf1..312d2241992 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2012,15 +2012,6 @@ rec { buildInputs = [ TestMore ]; }; - HTTPRequest = buildPerlPackage rec { - name = "HTTP-Message-6.03"; - src = fetchurl { - url = "mirror://cpan/modules/by-module/HTTP/${name}.tar.gz"; - sha256 = "c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b"; - }; - propagatedBuildInputs = [ HTTPDate URI HTMLParser LWP ]; - }; - HTTPRequestAsCGI = buildPerlPackage rec { name = "HTTP-Request-AsCGI-1.2"; src = fetchurl { @@ -3013,7 +3004,7 @@ rec { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff"; }; - propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPRequest XMLSimple ]; + propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPMessage XMLSimple ]; }; NetOpenIDConsumer = buildPerlPackage rec { From 13352be4fdfac628c18eea0abb766335dd8c48f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:08:23 +0100 Subject: [PATCH 223/302] perl-Net-OpenID-Consumer: add missing dependency on 'LWP' --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 312d2241992..0249eb04952 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3013,7 +3013,7 @@ rec { url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8"; }; - propagatedBuildInputs = [ NetOpenIDCommon JSON ]; + propagatedBuildInputs = [ NetOpenIDCommon JSON LWP ]; }; PackageDeprecationManager = buildPerlPackage rec { From 34cff8b7c0719ed1a3f80961ff9b9994ae77cab4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:10:36 +0100 Subject: [PATCH 224/302] haskell-JuicyPixels: update to version 3.0 --- .../libraries/haskell/JuicyPixels/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 1f7d9067e75..c289c009256 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -1,17 +1,17 @@ -{ cabal, cereal, deepseq, mtl, primitive, transformers, vector +{ cabal, binary, deepseq, mtl, primitive, transformers, vector , zlib }: cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "2.0.2"; - sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff"; + version = "3.0"; + sha256 = "1qhhhnfs12r67nf07bx58n8a2v6wikan8cqs1wnjnaad8yk2spsg"; buildDepends = [ - cereal deepseq mtl primitive transformers vector zlib + binary deepseq mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap and gif)"; + description = "Picture loading/serialization (in png, jpeg, bitmap, radiance and gif)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 21d2c7f8a502bdc8eb32481b0d93740c02c6411f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:10:37 +0100 Subject: [PATCH 225/302] haskell-hakyll: update to version 4.1.2.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 2824234ede3..14aa9620b4f 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.1.0"; - sha256 = "0v0c2hbwnd56q3vwrf9515v85yn2k850z9jd8y8kj2i79wh7l3dz"; + version = "4.1.2.0"; + sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c"; isLibrary = true; isExecutable = true; buildDepends = [ From ddeaafc3ec68f0e0f43f3348068e7e5ebd016700 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:10:37 +0100 Subject: [PATCH 226/302] haskell-mongoDB: update to version 1.3.2 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 32187c39963..83b04869e68 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.3.1"; - sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5"; + version = "1.3.2"; + sha256 = "0gv0i2z6f797ibjfp16ax2aiqa66sclxjy8sabrwydwcyr96xb4y"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec random randomShuffle text transformersBase From c13e0777506623d1e21f2f00d465742d48865515 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:10:37 +0100 Subject: [PATCH 227/302] haskell-pandoc: update to version 1.10.0.4 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 98f4dfb0501..719eaa31961 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10"; - sha256 = "11zvyzn16zckgs1zzhl415y14nziw16zhgghg31a459d1ww7c3dg"; + version = "1.10.0.4"; + sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26"; isLibrary = true; isExecutable = true; buildDepends = [ From c08d6e1131fedda0ac9e120a97c8fb8b0fcf50bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 11:20:30 +0100 Subject: [PATCH 228/302] dropbox: cosmetic changes --- pkgs/applications/networking/dropbox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 97b7cb51097..b979598e17c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -42,7 +42,7 @@ let exec = "dropbox"; comment = "Online directories"; desktopName = "Dropbox"; - genericName = "Online storage"; + genericName = "Online storage"; categories = "Application;Internet;"; }; @@ -65,7 +65,7 @@ in stdenv.mkDerivation { installPhase = '' ensureDir "$out/${appdir}" - cp -r .dropbox-dist/* "$out/${appdir}/" + cp -r ".dropbox-dist/"* "$out/${appdir}/" ensureDir "$out/bin" ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox" @@ -78,13 +78,13 @@ in stdenv.mkDerivation { -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; ensureDir "$out/share/applications" - cp ${desktopItem}/share/applications/* $out/share/applications + cp "${desktopItem}/share/applications/"* $out/share/applications ''; buildInputs = [ patchelf ]; meta = { + homepage = "http://www.dropbox.com"; description = "Online stored folders (daemon version)"; - homepage = http://www.dropbox.com; }; } From c6b874be2f91236581c6d732b6556eab6a3cefae Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 12:11:08 +0100 Subject: [PATCH 229/302] fix offlineDistutils (#271), needs to be in a site-packages subdir --- pkgs/development/python-modules/offline-distutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix index 2ed41b08bb7..269f67bf5cd 100644 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - dst="$out/lib/${python.libPrefix}" + dst="$out/lib/${python.libPrefix}/site-packages" ensureDir $dst/distutils ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/ cat < $dst/distutils/distutils.cfg From 123149da167772411b5c6b29f1c45ba615867d58 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Jan 2013 14:22:46 +0100 Subject: [PATCH 230/302] firefox: Update to 18.0.1 --- 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 4e0b4194257..66acae13084 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"; + firefoxVersion = "18.0.1"; - xulVersion = "18.0"; # this attribute is used by other packages + xulVersion = "18.0.1"; # 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 = "3356562e69d699e5901df5a4da4e2e59dd1e7f57"; + sha1 = "26415396233450a4e66bb0e0a73a258e1cb174ef"; }; commonConfigureFlags = From edbaa80bc1d1e5ab2a008779cf2e103c4e6135c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Jan 2013 14:23:01 +0100 Subject: [PATCH 231/302] Remove Firefox 17 --- .../networking/browsers/firefox/17.0.nix | 176 ------------------ pkgs/top-level/all-packages.nix | 9 +- pkgs/top-level/release.nix | 1 - 3 files changed, 1 insertion(+), 185 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/17.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/17.0.nix b/pkgs/applications/networking/browsers/firefox/17.0.nix deleted file mode 100644 index 9b785bebacb..00000000000 --- a/pkgs/applications/networking/browsers/firefox/17.0.nix +++ /dev/null @@ -1,176 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "17.0.1"; - - xulVersion = "17.0.1"; # this attribute is used by other packages - - - src = fetchurl { - urls = [ - # It is better to use this url for official releases, to take load off Mozilla's ftp server. - "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" - # 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 = "15c09796a388f0a78996427b7bc2c80f4e0496f3"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - #"--enable-profiling" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # disabled for the moment because our Cairo is too old - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = false; - - preConfigure = - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - #installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - rm xulrunner - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip pysqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - "--disable-elf-hack" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - makeFlags = [ - "SYSTEM_LIBXUL=1" - ]; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e35aaba895b..c2a78c943ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7071,7 +7071,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox17Pkgs; + firefoxPkgs = pkgs.firefox18Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -7085,13 +7085,6 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox17Pkgs = callPackage ../applications/networking/browsers/firefox/17.0.nix { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; - - firefox17Wrapper = lowPrio (wrapFirefox { browser = firefox17Pkgs.firefox; }); - firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3a6a1ca62bc..833210e8de9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -350,7 +350,6 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox17Pkgs.firefox = linux; firefox18Pkgs.firefox = linux; gnome = { From b5e0ac75505b22b1cba59dfd45ebff4d74c9444a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 15:52:49 +0100 Subject: [PATCH 232/302] python-distribute-0.6.34, not using buildPythonPackage this is in preparation so distribute can be used in buildPythonPackage --- pkgs/top-level/python-packages.nix | 39 +++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96b338f89db..2b7c9f23856 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -604,32 +604,43 @@ pythonPackages = python.modules // rec { }; }; - distribute = buildPythonPackage (rec { - name = "distribute-0.6.26"; + distribute = stdenv.mkDerivation rec { + name = "distribute-0.6.34"; src = fetchurl { - url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz"; - md5 = "841f4262a70107f85260362f5def8206"; #"ecd75ea629fee6d59d26f88c39b2d291"; - + url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz"; + md5 = "4576ab843a6db5100fb22a72deadf56d"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ python wrapPython offlineDistutils ]; - installCommand = - '' - # ehm, YES, the --verbose flags needs to be there, otherwise it tries to patch setuptools! - easy_install --verbose --prefix=$out . - ''; + pythonPath = [ recursivePthLoader ]; - # test for 27 fails - doCheck = false; + installPhase='' + dst="$out/lib/${python.libPrefix}/site-packages" + mkdir -p $dst + PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$dst:$PYTHONPATH" + + python setup.py install --prefix="$out" + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + wrapPythonPrograms + ''; meta = { description = "Easily download, build, install, upgrade, and uninstall Python packages"; homepage = http://packages.python.org/distribute; license = "PSF or ZPL"; }; - }); + }; distutils2 = buildPythonPackage rec { From b02d8f2f5ff885ac56fe2428f67f968f3103c849 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 16:12:56 +0100 Subject: [PATCH 233/302] python-pip --- pkgs/top-level/python-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b7c9f23856..b48338a219c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1929,6 +1929,16 @@ pythonPackages = python.modules // rec { }; }; + pip = buildPythonPackage { + name = "pip-1.2.1"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz"; + md5 = "db8a6d8a4564d3dc7f337ebed67b1a85"; + }; + buildInputs = [ mock scripttest virtualenv nose ]; + # ValueError: Working directory tests not found, or not a directory + doCheck = false; + }; polib = buildPythonPackage rec { name = "polib-${version}"; From dcfdd2ef26288cd534318a374dc6fa31d831a7f6 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 21 Jan 2013 16:30:00 +0100 Subject: [PATCH 234/302] Fixed provisioning profile check => We should check for the file, not the dir --- pkgs/development/mobile/titaniumenv/build-app.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index c675116f88a..aa46517f571 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { # Ensure that the requested provisioning profile can be found - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ] + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] then mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" @@ -75,7 +75,7 @@ stdenv.mkDerivation { # Ensure that the requested provisioning profile can be found - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles" ] + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] then mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" From fb5a7e05f98ddab59ecfe41452c7545bf6e18384 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 21 Jan 2013 12:08:24 +0100 Subject: [PATCH 235/302] haskell-doctest: add version 0.9.5 --- .../libraries/haskell/doctest/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/doctest/default.nix diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix new file mode 100644 index 00000000000..df92c4a6cf5 --- /dev/null +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -0,0 +1,16 @@ +{ cabal, deepseq, filepath, ghcPaths, syb, transformers }: + +cabal.mkDerivation (self: { + pname = "doctest"; + version = "0.9.5"; + sha256 = "073q56gyhkb7r4f94b9nx341dkmgapy8gig7f668jkghv2zci5ws"; + isLibrary = true; + isExecutable = true; + buildDepends = [ deepseq filepath ghcPaths syb transformers ]; + meta = { + homepage = "https://github.com/sol/doctest-haskell#readme"; + description = "Test interactive Haskell examples"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 19df77300b6..91576707eb8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -733,6 +733,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dns = callPackage ../development/libraries/haskell/dns {}; + doctest = callPackage ../development/libraries/haskell/doctest {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; From 9397f5b25f824f881423f37252e47a2f501c1b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Jan 2013 17:49:37 +0100 Subject: [PATCH 236/302] goldendict: fix missing pkgconfig --- pkgs/applications/misc/goldendict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 881f5339bdf..f7b8a511bc6 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, qt4, libXtst, libvorbis, phonon, hunspell }: +{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }: stdenv.mkDerivation rec { name = "goldendict-1.0.1"; src = fetchurl { url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2"; sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk"; }; - buildInputs = [ qt4 libXtst libvorbis phonon hunspell ]; + buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ]; unpackPhase = '' mkdir ${name}-src cd ${name}-src From f5fc28837bf2af0fe628070e17fe903e1302365d Mon Sep 17 00:00:00 2001 From: Petar Bogdanovic Date: Mon, 21 Jan 2013 20:03:53 +0100 Subject: [PATCH 237/302] qiv: $(PREFIX)/man -> $(PREFIX)/share/man --- pkgs/applications/graphics/qiv/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 05eb83cee29..df18c6d1520 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation (rec { buildInputs = [ pkgconfig gtk imlib2 file ]; - preBuild=''substituteInPlace Makefile --replace /usr/local "$out"''; + preBuild='' + substituteInPlace Makefile --replace /usr/local "$out" + substituteInPlace Makefile --replace /man/ /share/man/ + ''; meta = { description = "qiv (quick image viewer)"; From b67667e074e3d071db9f1b828fd59c64f55d7815 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 21 Jan 2013 15:43:09 -0500 Subject: [PATCH 238/302] perlPackages.ClassLoad: Fix meta.description --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 328b3a99bd7..8425b12e1b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -878,7 +878,7 @@ rec { propagatedBuildInputs = [ DataOptList ModuleImplementation ModuleRuntime PackageStash TryTiny ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - description = "A working (require "Class::Name") and more"; + description = "A working (require \"Class::Name\") and more"; license = "perl5"; }; }; From 719cde0c464d10d3bb9f039648a2e814dd48d15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 21 Jan 2013 21:35:49 +0100 Subject: [PATCH 239/302] pythonPackages.zope_interface: renamed from zopeInterface to match the naming convention --- pkgs/top-level/python-packages.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b48338a219c..d792408f48c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1224,7 +1224,7 @@ pythonPackages = python.modules // rec { sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y"; }; - buildInputs = [ zopeInterface mock ]; + buildInputs = [ zope_interface mock ]; preConfigure = "cp test/secrets.py-dist test/secrets.py"; @@ -3149,7 +3149,7 @@ pythonPackages = python.modules // rec { md5 = "b7c2ff135939f605a8c54e1c13cd5d66"; }; - propagatedBuildInputs = [ zopeInterface ]; + propagatedBuildInputs = [ zope_interface ]; meta = { description = "Transaction management"; @@ -3168,7 +3168,7 @@ pythonPackages = python.modules // rec { md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; }; - propagatedBuildInputs = [ zopeInterface zope_testing ]; + propagatedBuildInputs = [ zope_interface zope_testing ]; meta = { description = "A tool which computes a dependency graph between active Python eggs"; homepage = http://thomas-lotze.de/en/software/eggdeps/; @@ -3225,7 +3225,7 @@ pythonPackages = python.modules // rec { sha256 = "110c30z622jn14yany1sxfaqj5qx20n9rc9zqacxlwma30fdcbjn"; }; - propagatedBuildInputs = [ zopeInterface ]; + propagatedBuildInputs = [ zope_interface ]; # Generate Twisted's plug-in cache. Twited users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 @@ -3586,7 +3586,7 @@ pythonPackages = python.modules // rec { md5 = "6f180c6897a1820948fee2a6290503cd"; }; - propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zopeInterface zope_event ]; + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event ]; meta = { description = "An object-oriented database for Python"; @@ -3622,7 +3622,7 @@ pythonPackages = python.modules // rec { md5 = "c95569fcb444ae541777de7ae5297492"; }; - propagatedBuildInputs = [ zopeInterface ]; + propagatedBuildInputs = [ zope_interface ]; meta = { description = "Exception interfaces and implementations"; @@ -3641,7 +3641,7 @@ pythonPackages = python.modules // rec { md5 = "2e3829841090d6adff718b8b73c87b6b"; }; - propagatedBuildInputs = [ zopeInterface zope_exceptions ]; + propagatedBuildInputs = [ zope_interface zope_exceptions ]; meta = { description = "Zope testing helpers"; @@ -3662,7 +3662,7 @@ pythonPackages = python.modules // rec { buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ subunit zopeInterface zope_exceptions zope_testing ]; + propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing ]; meta = { description = "A flexible test runner with layer support"; @@ -3672,7 +3672,7 @@ pythonPackages = python.modules // rec { }; - zopeInterface = buildPythonPackage { + zope_interface = buildPythonPackage { name = "zope-interface-3.6.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.1.tar.gz"; @@ -3815,7 +3815,7 @@ pythonPackages = python.modules // rec { sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg"; }; - buildInputs = [ txamqp zopeInterface twisted ]; + buildInputs = [ txamqp zope_interface twisted ]; propagatedBuildInputs = [ whisper ]; # error: invalid command 'test' From 46d6d437a6b6123439a2938a885ca526b9f26272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 21 Jan 2013 22:31:32 +0100 Subject: [PATCH 240/302] pythonPackages: tidy up names Use "." in the name where appropriate, e.g. zope.event, since this is the commonly used name for the package. --- pkgs/top-level/python-packages.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d792408f48c..e1532e73008 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3512,11 +3512,11 @@ pythonPackages = python.modules // rec { zc_lockfile = buildPythonPackage rec { - name = "zc_lockfile-${version}"; + name = "zc.lockfile-${version}"; version = "1.0.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz"; md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; }; @@ -3597,11 +3597,11 @@ pythonPackages = python.modules // rec { zope_event = buildPythonPackage rec { - name = "zope_event-${version}"; + name = "zope.event-${version}"; version = "4.0.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.event/zope.event-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz"; md5 = "e08dd299d428d77a1cfcbfe841b81872"; }; @@ -3614,11 +3614,11 @@ pythonPackages = python.modules // rec { zope_exceptions = buildPythonPackage rec { - name = "zopeexceptions-${version}"; + name = "zope.exceptions-${version}"; version = "4.0.5"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.exceptions/zope.exceptions-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz"; md5 = "c95569fcb444ae541777de7ae5297492"; }; @@ -3633,11 +3633,11 @@ pythonPackages = python.modules // rec { zope_testing = buildPythonPackage rec { - name = "zope_testing-${version}"; + name = "zope.testing-${version}"; version = "4.1.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/zope.testing-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; md5 = "2e3829841090d6adff718b8b73c87b6b"; }; @@ -3652,11 +3652,11 @@ pythonPackages = python.modules // rec { zope_testrunner = buildPythonPackage rec { - name = "zope_testrunner-${version}"; + name = "zope.testrunner-${version}"; version = "4.0.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testrunner/zope.testrunner-${version}.zip"; + url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip"; md5 = "cd648fc865a79aa0950e73342836dd4c"; }; @@ -3672,10 +3672,12 @@ pythonPackages = python.modules // rec { }; - zope_interface = buildPythonPackage { - name = "zope-interface-3.6.1"; + zope_interface = buildPythonPackage rec { + name = "zope.interface-${version}"; + version = "3.6.1"; + src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.1.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz"; sha256 = "294c3c0529e84169177bce78d616c768fa1c028a2fbc1854f615d32ed88dbc6c"; }; From 2a050f21376bea99f076b980f4bc53301140332e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 21 Jan 2013 22:36:59 +0100 Subject: [PATCH 241/302] pythonPackages: add myself as maintainer to some packages which I added --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1532e73008..8d9d8352356 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3507,6 +3507,7 @@ pythonPackages = python.modules // rec { description = "Structured Configuration Library"; homepage = http://pypi.python.org/pypi/ZConfig; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3524,6 +3525,7 @@ pythonPackages = python.modules // rec { description = "Inter-process locks"; homepage = http://www.python.org/pypi/zc.lockfile; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3543,6 +3545,7 @@ pythonPackages = python.modules // rec { description = "A daemon process control library and tools for Unix-based systems"; homepage = http://pypi.python.org/pypi/zdaemon; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3592,6 +3595,7 @@ pythonPackages = python.modules // rec { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB3; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3609,6 +3613,7 @@ pythonPackages = python.modules // rec { description = "An event publishing system"; homepage = http://pypi.python.org/pypi/zope.event; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3628,6 +3633,7 @@ pythonPackages = python.modules // rec { description = "Exception interfaces and implementations"; homepage = http://pypi.python.org/pypi/zope.exceptions; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3647,6 +3653,7 @@ pythonPackages = python.modules // rec { description = "Zope testing helpers"; homepage = http://pypi.python.org/pypi/zope.testing; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; @@ -3668,6 +3675,7 @@ pythonPackages = python.modules // rec { description = "A flexible test runner with layer support"; homepage = http://pypi.python.org/pypi/zope.testrunner; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; From 82f3f015269368bb399f8f438d6574a485620968 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 21 Jan 2013 18:11:49 -0500 Subject: [PATCH 242/302] pythonPackages.zopeInterface is now pythonPackages.zope_interface --- 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 c2a78c943ce..bc357e60815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5364,7 +5364,7 @@ let twisted = pythonPackages.twisted; - ZopeInterface = pythonPackages.zopeInterface; + ZopeInterface = pythonPackages.zope_interface; ### SERVERS From 5cbd865ce6f4a9d5209e066173ddce4d049a2e0a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 21 Jan 2013 18:27:34 -0500 Subject: [PATCH 243/302] Redis 2.6.9 --- pkgs/servers/nosql/redis/darwin.patch | 12 ------------ pkgs/servers/nosql/redis/default.nix | 14 ++++++-------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 pkgs/servers/nosql/redis/darwin.patch diff --git a/pkgs/servers/nosql/redis/darwin.patch b/pkgs/servers/nosql/redis/darwin.patch deleted file mode 100644 index 002f09b36f3..00000000000 --- a/pkgs/servers/nosql/redis/darwin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru redis-2.4.7/deps/hiredis/Makefile redis-2.4.7.patched/deps/hiredis/Makefile ---- redis-2.4.7/deps/hiredis/Makefile 2012-02-02 14:29:24.000000000 +0000 -+++ redis-2.4.7.patched/deps/hiredis/Makefile 2012-12-07 17:14:43.000000000 +0000 -@@ -20,7 +20,7 @@ - CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) - CCLINK?=-lm -pthread - LDFLAGS?=-L. -Wl,-rpath,. -- OBJARCH?=-arch i386 -arch x86_64 -+ #OBJARCH?=-arch i386 -arch x86_64 - DYLIBNAME?=libhiredis.dylib - DYLIB_MAKE_CMD?=libtool -dynamic -o ${DYLIBNAME} -lm ${DEBUG} - ${OBJ} - STLIBNAME?=libhiredis.a diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index aa25b49e581..abdaf204be4 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, which, tcl }: stdenv.mkDerivation rec { - pname = "redis"; - version = "2.4.7"; - name = "${pname}-${version}"; + name = "redis-2.6.9"; src = fetchurl { - url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz"; - sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1"; + url = "http://redis.googlecode.com/files/${name}.tar.gz"; + sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd"; }; makeFlags = "PREFIX=$(out)"; - # commented out until the patch is found - # patches = if stdenv.isDarwin then [ ./darwin.patch ] else []; + enableParallelBuilding = true; + meta = { homepage = http://redis.io; description = "An open source, advanced key-value store"; From 79dac66415dc1d1992f3c072de5c711d0edcc969 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 21 Jan 2013 18:30:11 -0500 Subject: [PATCH 244/302] Whoops, tcl and which aren't needed --- pkgs/servers/nosql/redis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index abdaf204be4..1992164b3d1 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, tcl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "redis-2.6.9"; From a5fe3adc10da814f27d1a463c950c456e5df9b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 22 Jan 2013 01:45:41 +0100 Subject: [PATCH 245/302] pythonPackages: upgrade zope_interface, package more plone dependencies using python2nix.py --- pkgs/top-level/python-packages.nix | 325 ++++++++++++++++++++++++++++- 1 file changed, 321 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d9d8352356..a677faba833 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3600,6 +3600,127 @@ pythonPackages = python.modules // rec { }; + 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"; + }; + + buildInputs = [ pkgs.unzip zope_interface ]; + + meta = { + maintainers = [ 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"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ zope_interface ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_component = buildPythonPackage rec { + name = "zope.component-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.0.2.tar.gz"; + md5 = "8c2fd4414ca23cbbe014dcaf911acebc"; + }; + + propagatedBuildInputs = [ + zope_configuration zope_event zope_i18nmessageid zope_interface + zope_testing + ]; + + # ignore tests because of a circular dependency on zope_security + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_configuration = buildPythonPackage rec { + name = "zope.configuration-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.2.tar.gz"; + md5 = "40b3c7ad0b748ede532d8cfe2544e44e"; + }; + + propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; + + meta = { + maintainers = [ 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"; + }; + + propagatedBuildInputs = [ + zodb3 zope_broken zope_dottedname zope_publisher + zope_filerepresentation zope_lifecycleevent zope_size + zope_traversing + ]; + + meta = { + maintainers = [ 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"; + }; + + buildInputs = [ pkgs.unzip ]; + + meta = { + maintainers = [ 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"; + }; + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + zope_event = buildPythonPackage rec { name = "zope.event-${version}"; version = "4.0.2"; @@ -3638,6 +3759,181 @@ pythonPackages = python.modules // rec { }; + 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"; + }; + + propagatedBuildInputs = [ zope_schema ]; + + meta = { + maintainers = [ 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"; + }; + + propagatedBuildInputs = [ pytz zope_component ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_i18nmessageid = buildPythonPackage rec { + name = "zope.i18nmessageid-4.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.2.tar.gz"; + md5 = "c4550f7a0b4a736186e6e0fa3b2471f7"; + }; + + meta = { + maintainers = [ 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"; + }; + + propagatedBuildInputs = [ zope_event zope_component ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_location = buildPythonPackage rec { + name = "zope.location-4.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.0.tar.gz"; + md5 = "cd0e10d5923c95e352bcde505cc11324"; + }; + + propagatedBuildInputs = [ zope_proxy ]; + + # ignore circular dependency on zope_schema + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + doCheck = false; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_proxy = buildPythonPackage rec { + name = "zope.proxy-4.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.1.tar.gz"; + md5 = "c36691f0abee7573f4ddcc378603cefd"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + meta = { + maintainers = [ 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"; + }; + + propagatedBuildInputs = [ + zope_browser zope_contenttype zope_i18n zope_security + ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + + zope_schema = buildPythonPackage rec { + name = "zope.schema-4.2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; + md5 = "e7e581af8193551831560a736a53cf58"; + }; + + propagatedBuildInputs = [ zope_event zope_interface zope_testing ]; + + # ignore circular dependency on zope_location + installCommand = '' + easy_install --no-deps --prefix="$out" . + ''; + + meta = { + maintainers = [ 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/zope.security-3.7.4.tar.gz"; + md5 = "072ab8d11adc083eace11262da08630c"; + }; + + propagatedBuildInputs = [ + zope_component zope_configuration zope_i18nmessageid zope_schema + zope_proxy + ]; + + meta = { + maintainers = [ 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"; + }; + + propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + zope_testing = buildPythonPackage rec { name = "zope.testing-${version}"; version = "4.1.1"; @@ -3647,7 +3943,7 @@ pythonPackages = python.modules // rec { md5 = "2e3829841090d6adff718b8b73c87b6b"; }; - propagatedBuildInputs = [ zope_interface zope_exceptions ]; + propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; meta = { description = "Zope testing helpers"; @@ -3680,22 +3976,43 @@ pythonPackages = python.modules // rec { }; + 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"; + }; + + buildInputs = [ pkgs.unzip ]; + + propagatedBuildInputs = [ zope_location zope_security zope_publisher ]; + + meta = { + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + zope_interface = buildPythonPackage rec { - name = "zope.interface-${version}"; - version = "3.6.1"; + name = "zope.interface-4.0.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz"; - sha256 = "294c3c0529e84169177bce78d616c768fa1c028a2fbc1854f615d32ed88dbc6c"; + md5 = "1ddd308f2c83703accd1696158c300eb"; }; + propagatedBuildInputs = [ zope_event ]; + meta = { description = "Zope.Interface"; homepage = http://zope.org/Products/ZopeInterface; license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; + # XXX: link broken # hgsvn = buildPythonPackage rec { # name = "hgsvn-0.1.8"; From 47793a9eb7136ed8cd28a3b480b69ec6e0acfc9b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Jan 2013 11:19:58 +0100 Subject: [PATCH 246/302] Fix indentation --- pkgs/top-level/perl-packages.nix | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8425b12e1b3..2968b6205a8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2519,36 +2519,36 @@ rec { }; ImageExifTool = buildPerlPackage rec { - name = "Image-ExifTool-8.41"; + name = "Image-ExifTool-8.41"; - src = fetchurl { - url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg"; - }; - - meta = { - description = "ExifTool, a tool to read, write and edit EXIF meta information"; - homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/; - - longDescription = '' - ExifTool is a platform-independent Perl library plus a command-line - application for reading, writing and editing meta information in - image, audio and video files. ExifTool supports many different types - of metadata including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC - Profile, Photoshop IRB, FlashPix, AFCP and ID3, as well as the maker - notes of many digital cameras by Canon, Casio, FujiFilm, HP, - JVC/Victor, Kodak, Leaf, Minolta/Konica-Minolta, Nikon, - Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Ricoh, Sanyo, - Sigma/Foveon and Sony. - ''; - - licenses = [ "GPLv1+" /* or */ "Artistic" ]; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.unix; - }; + src = fetchurl { + url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; + sha256 = "1fdjic0bhbai8zzl3287i9wcs88khiv8qx5slx9n3gzvbnxacvqg"; }; + meta = { + description = "ExifTool, a tool to read, write and edit EXIF meta information"; + homepage = http://www.sno.phy.queensu.ca/~phil/exiftool/; + + longDescription = '' + ExifTool is a platform-independent Perl library plus a command-line + application for reading, writing and editing meta information in + image, audio and video files. ExifTool supports many different types + of metadata including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC + Profile, Photoshop IRB, FlashPix, AFCP and ID3, as well as the maker + notes of many digital cameras by Canon, Casio, FujiFilm, HP, + JVC/Victor, Kodak, Leaf, Minolta/Konica-Minolta, Nikon, + Olympus/Epson, Panasonic/Leica, Pentax/Asahi, Ricoh, Sanyo, + Sigma/Foveon and Sony. + ''; + + licenses = [ "GPLv1+" /* or */ "Artistic" ]; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.unix; + }; + }; + Inline = buildPerlPackage rec { name = "Inline-0.45"; From e78ff09f0276cf8f87d7793c1246822c5eddbc5f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Jan 2013 11:40:24 +0100 Subject: [PATCH 247/302] Update Catalyst::Manual --- pkgs/top-level/perl-packages.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2968b6205a8..8b257467bca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -395,6 +395,7 @@ rec { homepage = http://dev.catalyst.perl.org/; description = "Catalyst Development Tools"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -416,13 +417,16 @@ rec { ]; }; - CatalystManual = buildPerlPackage rec { - name = "Catalyst-Manual-5.8000"; + CatalystManual = buildPerlPackage { + name = "Catalyst-Manual-5.9006"; src = fetchurl { - url = "mirror://cpan/authors/id/H/HK/HKCLARK/${name}.tar.gz"; - sha256 = "0ay4gcprwqw4h5vsk8g0n9ir51sq7n5i2rdahgqdlb8caj4fshz5"; + url = mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Manual-5.9006.tar.gz; + sha256 = "0cl9nqg5jrqcf2h3pgk6q8408czf5s0k0xh3ra884c9cnx84mr95"; + }; + meta = { + description = "The Catalyst developer's manual"; + license = "perl"; }; - buildInputs = [TestPod TestPodCoverage]; }; CatalystModelDBICSchema = buildPerlPackage { From f4d4c7f6a86e769d5e9e6e108db1387ae0523fc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Jan 2013 11:48:37 +0100 Subject: [PATCH 248/302] DBI: revert to 1.616 With the new version DBD::Pg fails with "DBI Connection failed: install_driver(Pg) failed: Unable to get DBI state function. DBI not loaded.". --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b257467bca..9f8a219e0cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1448,7 +1448,7 @@ rec { DBDPg = import ../development/perl-modules/DBD-Pg { inherit stdenv fetchurl buildPerlPackage DBI; - postgresql = pkgs.postgresql91; + postgresql = pkgs.postgresql92; }; DBFile = import ../development/perl-modules/DB_File { @@ -1457,10 +1457,10 @@ rec { }; DBI = buildPerlPackage { - name = "DBI-1.623"; + name = "DBI-1.616"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.623.tar.gz; - sha256 = "18g3bl4bg0ww0n3aqc0gg3ckiql7cyf7v2aqma9ga086xgwp6bci"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.616.tar.gz; + sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0"; }; meta = { homepage = http://dbi.perl.org/; From facdbf7befc18b297e79c44a56eca84dcbd228f4 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Jan 2013 12:58:18 +0100 Subject: [PATCH 249/302] weechat: upgrade to 0.4.0 --- pkgs/applications/networking/irc/weechat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index ba7953d737c..e583551bcf1 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile -, pythonPackages, makeWrapper }: +, pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - version = "0.3.9.2"; + version = "0.4.0"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "114cffqwnrqx8r4dslz7sc4i4ky4akzh863rnzaw3dnn9ky9r503"; + sha256 = "17jxknam1bbakmdfqy1b2cfc8l9ag90l3z1gcxdvwg358wasv9dc"; }; buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper + cacert cmake ]; postInstall = '' From 31bbfb77373d2e3ad7465c70266c267019c3e4e7 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Jan 2013 13:02:18 +0100 Subject: [PATCH 250/302] alot: update to latest revision --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a677faba833..bcc318fe5c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,13 +119,13 @@ pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "5b5dbecb5a03840b751219db90bcf4dcffda315e"; + rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e"; name = "alot-0.3.3_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "156q7x4wilhcgmaap7rjci3cgwm5ia85ddgx6xm6lfp5hkf5300v"; + sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4"; }; # error: invalid command 'test' From e92c868096b01bec7585851f3d8cada126eeb37f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Jan 2013 13:02:57 +0100 Subject: [PATCH 251/302] pythonPackages.flake8: upgrade to 1.7.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcc318fe5c2..e1e0bb1850c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -869,11 +869,11 @@ pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.6.2"; + name = "flake8-1.7.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "abfdbb25d37c28e9da05f1b5c3596d1a"; + md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd"; }; buildInputs = [ nose ]; From e08b79d256954f2263b4c6d6fe542d4a6f93e5e6 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 22 Jan 2013 13:03:29 +0100 Subject: [PATCH 252/302] pythonPackages.turses: upgrade to 0.2.12 (also update of its dependency tweepy). --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1e0bb1850c..00f7ae7bd5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3178,11 +3178,11 @@ pythonPackages = python.modules // rec { turses = buildPythonPackage (rec { - name = "turses-0.2.9"; + name = "turses-0.2.11"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "c0f32fa31e2c5fa42f5cc19f3dba4e73f0438bf36bf756ba137f2423c0ac4637"; + sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; @@ -3201,11 +3201,11 @@ pythonPackages = python.modules // rec { }); tweepy = buildPythonPackage (rec { - name = "tweepy-1.12"; + name = "tweepy-1.13"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; - sha256 = "66d728527ab3d5f5e4d6725654783f99169172678105f609d14353f6626c1315"; + sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5"; }; meta = { From bdcf5ba4d760a34c653eff7f8782178e340eaaed Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 08:01:44 -0500 Subject: [PATCH 253/302] linux: Don't use the aufs patches by default any more, now that they're not needed for nixos --- pkgs/top-level/all-packages.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc357e60815..129547c9b7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5859,7 +5859,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_32 + # kernelPatches.aufs2_2_6_32 kernelPatches.cifs_timeout_2_6_29 kernelPatches.no_xsave kernelPatches.dell_rfkill @@ -5871,7 +5871,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_32 + # kernelPatches.aufs2_2_6_32 kernelPatches.cifs_timeout_2_6_29 kernelPatches.no_xsave kernelPatches.dell_rfkill @@ -5883,7 +5883,7 @@ let kernelPatches = [ kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs2_2_6_35 + # kernelPatches.aufs2_2_6_35 kernelPatches.cifs_timeout_2_6_35 ] ++ lib.optional (platform.kernelArch == "arm") kernelPatches.sheevaplug_modules_2_6_35; @@ -5905,7 +5905,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_0 + # kernelPatches.aufs3_0 ]; }; @@ -5914,7 +5914,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_1 + # kernelPatches.aufs3_1 ]; }; @@ -5923,7 +5923,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_2 + # kernelPatches.aufs3_2 kernelPatches.cifs_timeout_2_6_38 ]; }; @@ -5939,7 +5939,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_3 + # kernelPatches.aufs3_3 ]; }; @@ -5948,7 +5948,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_4 + # kernelPatches.aufs3_4 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -5960,7 +5960,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_5 + # kernelPatches.aufs3_5 kernelPatches.perf3_5 kernelPatches.cifs_timeout_3_5_7 ] ++ lib.optionals (platform.kernelArch == "mips") @@ -5975,7 +5975,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_6 + # kernelPatches.aufs3_6 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -5988,7 +5988,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 - kernelPatches.aufs3_7 + # kernelPatches.aufs3_7 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From d6a18fe4aed2e479920388f09ed3b0e61e4af80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 22 Jan 2013 14:51:28 +0100 Subject: [PATCH 254/302] feh: update to 2.8 it hanged displaying a bmp i have, but this new 2.8 hangs too. --- pkgs/applications/graphics/feh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index e19d06927a2..0cd34027966 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, x11, imlib2, libjpeg, libpng, giblib , libXinerama, curl }: -stdenv.mkDerivation { - name = "feh-2.4"; +stdenv.mkDerivation rec { + name = "feh-2.8"; src = fetchurl { - url = http://feh.finalrewind.org/feh-2.4.tar.bz2; - sha256 = "00liykp0ipmmiggl26wk72iawcff6zpmbniifdr3f5yf0sfanz48"; + url = "http://feh.finalrewind.org/${name}.tar.bz2"; + sha256 = "0zmslchnzvi9ydxj2mgci4x8zpv5mdfkf7kyny3nibbpajibqmrx"; }; buildInputs = [x11 imlib2 giblib libjpeg libpng libXinerama curl ]; From 1fa2e7f9a9d874fa96f74d3b6816b3bf69a9b904 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Mon, 21 Jan 2013 20:02:57 +0100 Subject: [PATCH 255/302] python-linkme-wrapper --- .../python/python-linkme-wrapper.nix | 13 +++++++ .../python/python-linkme-wrapper.sh | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/development/interpreters/python/python-linkme-wrapper.nix create mode 100644 pkgs/development/interpreters/python/python-linkme-wrapper.sh diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.nix b/pkgs/development/interpreters/python/python-linkme-wrapper.nix new file mode 100644 index 00000000000..8d783a8c11e --- /dev/null +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.nix @@ -0,0 +1,13 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "python-linkme-wrapper-1.0"; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cat ${./python-linkme-wrapper.sh} > $out/bin/.python-linkme-wrapper + chmod +x $out/bin/.python-linkme-wrapper + ''; +} diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh new file mode 100644 index 00000000000..e6307d81ed4 --- /dev/null +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Install it into a nix profile and from there build symlink chains. +# The chain will be followed to set the PYTHONPATH +# A/bin/foo -> B/bin/bar -> NIXENV/bin/.python-linkme-wrapper.sh +# + +if test ! -L "$0"; then + echo "Link me!" + exit 1 +fi + +PROG=$(basename "$0") +SITES= + +pypath() { + BIN=$(dirname "$1") + BIN=$(realpath -s "$BIN") + ENV=$(dirname "$BIN") + SITE="$ENV/lib/python2.7/site-packages" + SITES="$SITES${SITES:+:}$SITE" + + PRG=$BIN/$(readlink "$1") + + if test -L "$PRG"; then + pypath "$PRG" + fi +} + +pypath $(realpath -s "$0") + +export PYTHONPATH="$PYTHONPATH${PYTHONPATH:+:}$SITES" + +exec $BIN/$PROG "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 129547c9b7f..54335557a94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2859,6 +2859,8 @@ let pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; + pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; From a63bb419f26f167e3d36a09e150acc66aa82fe27 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 22 Jan 2013 15:28:15 +0100 Subject: [PATCH 256/302] remove pythonhome-wrapper, python-linkme-wrapper is more flexible --- .../python/pythonhome-wrapper.nix | 21 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/interpreters/python/pythonhome-wrapper.nix diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix deleted file mode 100644 index c9cf6277b24..00000000000 --- a/pkgs/development/interpreters/python/pythonhome-wrapper.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv }: - -stdenv.mkDerivation { - name = "pythonhome-wrapper"; - - unpackPhase = "true"; - installPhase = '' - mkdir -p $out/bin - echo ' -#!/bin/sh - -BINDIR=`dirname $0` -PYTHONHOME=`dirname $BINDIR` -PYTHONHOME=`(cd $PYTHONHOME && pwd)` -export PYTHONHOME - -$BINDIR/python "$@" - ' > $out/bin/py - chmod +x $out/bin/py - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54335557a94..07cf49641ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2857,8 +2857,6 @@ let inherit (python27Packages) recursivePthLoader; }; - pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; - pythonLinkmeWrapper = callPackage ../development/interpreters/python/python-linkme-wrapper.nix { }; pyrex = pyrex095; From 15f7853a9e0ec0e1f886b5a9e30d965430d5b23f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:06:13 +0100 Subject: [PATCH 257/302] haskell-bifunctors: add version 3.0.3 --- .../libraries/haskell/bifunctors/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bifunctors/default.nix diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix new file mode 100644 index 00000000000..b4de1910465 --- /dev/null +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroupoids, semigroups }: + +cabal.mkDerivation (self: { + pname = "bifunctors"; + version = "3.0.3"; + sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4"; + buildDepends = [ semigroupoids semigroups ]; + meta = { + homepage = "http://github.com/ekmett/bifunctors/"; + description = "Haskell 98 bifunctors"; + 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 91576707eb8..2ac75689db9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -491,6 +491,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); benchpress = callPackage ../development/libraries/haskell/benchpress {}; + bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; + bimap = callPackage ../development/libraries/haskell/bimap {}; binary_hackage = callPackage ../development/libraries/haskell/binary {}; From 2ca9fc6bd7f31e8d63900c3c5d716aa683f04852 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:06:23 +0100 Subject: [PATCH 258/302] haskell-groupoids: add version 3.0.1.1 --- .../libraries/haskell/groupoids/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/groupoids/default.nix diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix new file mode 100644 index 00000000000..4c085c0ae23 --- /dev/null +++ b/pkgs/development/libraries/haskell/groupoids/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroupoids }: + +cabal.mkDerivation (self: { + pname = "groupoids"; + version = "3.0.1.1"; + sha256 = "0r4xjyq7icd52nas27bhr5k8q7li6lba8mlkcipghhsgxsyjfp63"; + buildDepends = [ semigroupoids ]; + meta = { + homepage = "http://github.com/ekmett/groupoids/"; + description = "Haskell 98 Groupoids"; + 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 2ac75689db9..2cddb75c080 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -912,6 +912,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); polyparse = self.polyparse_1_7; }; + groupoids = callPackage ../development/libraries/haskell/groupoids {}; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; From 3a034c9d8e54beb8bf681411d011bff09efeaa8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:06:36 +0100 Subject: [PATCH 259/302] haskell-profunctors: add version 3.2 --- .../libraries/haskell/profunctors/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/profunctors/default.nix diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix new file mode 100644 index 00000000000..7146359eda4 --- /dev/null +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, tagged }: + +cabal.mkDerivation (self: { + pname = "profunctors"; + version = "3.2"; + sha256 = "0c7242pk5hfz67cwjy0l7skqyz20akw9j2w7cb8iggcbbb27bgyc"; + buildDepends = [ comonad tagged ]; + meta = { + homepage = "http://github.com/ekmett/profunctors/"; + description = "Haskell 98 Profunctors"; + 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 2cddb75c080..4997b6e360e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1393,6 +1393,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive = self.primitive_0_5_0_1; + profunctors = callPackage ../development/libraries/haskell/profunctors {}; + + profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {}; + projectTemplate = callPackage ../development/libraries/haskell/project-template {}; processExtras = callPackage ../development/libraries/haskell/process-extras {}; From 8e98f257f10ec37b960ae64b7cb01d438e20db2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:06:42 +0100 Subject: [PATCH 260/302] haskell-profunctor-extras: add version 3.3 --- .../haskell/profunctor-extras/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/profunctor-extras/default.nix diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix new file mode 100644 index 00000000000..df16898ddd3 --- /dev/null +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, profunctors, semigroupoidExtras, semigroupoids +, tagged, transformers +}: + +cabal.mkDerivation (self: { + pname = "profunctor-extras"; + version = "3.3"; + sha256 = "0sdiwc1d2jx2xrzsxjsxjh8m24f4blr2m8vmh78knpi9hy0bxgvr"; + buildDepends = [ + comonad profunctors semigroupoidExtras semigroupoids tagged + transformers + ]; + meta = { + homepage = "http://github.com/ekmett/profunctor-extras/"; + description = "Profunctor extras"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) From a84de6c966147672e1d50833fedabe48aebce27e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:06:50 +0100 Subject: [PATCH 261/302] haskell-semigroupoid-extras: add version 3.0.1 --- .../haskell/semigroupoid-extras/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/semigroupoid-extras/default.nix diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix new file mode 100644 index 00000000000..263adb42f25 --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, distributive, groupoids, semigroupoids }: + +cabal.mkDerivation (self: { + pname = "semigroupoid-extras"; + version = "3.0.1"; + sha256 = "1b6ix9myjav1h4bbq3jxlan8sn2pjw8x0zhazv3anxfab5n2sxpd"; + buildDepends = [ comonad distributive groupoids semigroupoids ]; + meta = { + homepage = "http://github.com/ekmett/semigroupoid-extras"; + description = "Semigroupoids requiring Haskell extensions"; + 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 4997b6e360e..06f9ded8f2b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1514,6 +1514,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {}; + setenv = callPackage ../development/libraries/haskell/setenv {}; shelly = callPackage ../development/libraries/haskell/shelly {}; From 8eef6992de3271ff6d4e13592dd77c7652c7bf76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 22 Jan 2013 16:07:02 +0100 Subject: [PATCH 262/302] haskell-skein: update to version 0.1.0.11 --- pkgs/development/libraries/haskell/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index f57e3bd71e3..1ccedad6d11 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.10"; - sha256 = "0qyiy2yx4qmazz744hyq51v2as51zd9r623bhhk21yzsgh7rl9kc"; + version = "0.1.0.11"; + sha256 = "16iy3frzxzkiybl5cglvnmvxzziwr8361s00m7130dh82r3vc21q"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; From eb6c8aec62486817a8e4898d924ec0e580dc182d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 12:58:07 -0500 Subject: [PATCH 263/302] openjdk: Update to 7u6b24 --- .../openjdk/cppflags-include-fix.patch | 16 ++++---- .../development/compilers/openjdk/default.nix | 41 +++---------------- .../openjdk/linux-version-check-fix.patch | 12 ------ .../compilers/openjdk/printf-fix.patch | 12 ------ 4 files changed, 14 insertions(+), 67 deletions(-) delete mode 100644 pkgs/development/compilers/openjdk/linux-version-check-fix.patch delete mode 100644 pkgs/development/compilers/openjdk/printf-fix.patch diff --git a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch index 36fa9054bc6..8931c122538 100644 --- a/pkgs/development/compilers/openjdk/cppflags-include-fix.patch +++ b/pkgs/development/compilers/openjdk/cppflags-include-fix.patch @@ -1,9 +1,9 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2011-06-27 13:19:26.000000000 -0400 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2011-07-31 17:42:11.370026854 -0400 -@@ -223,12 +223,6 @@ - -I$(PLATFORM_SRC)/native/$(PKGDIR) \ - $(EVENT_MODEL) +--- openjdk-orig/jdk/make/sun/awt/mawt.gmk 2012-08-28 19:13:16.000000000 -0400 ++++ openjdk/jdk/make/sun/awt/mawt.gmk 2013-01-22 11:56:22.315418708 -0500 +@@ -234,12 +234,6 @@ + endif # !HEADLESS + endif # PLATFORM -ifeq ($(PLATFORM), linux) - # Checking for the X11/extensions headers at the additional location @@ -11,6 +11,6 @@ diff -Naur openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt. - $(wildcard /usr/include/X11/extensions)) -endif - - ifeq ($(PLATFORM), solaris) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions - endif + ifeq ($(PLATFORM), macosx)) + CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ + -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index a1cb2f7fe19..0be36379f33 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -39,37 +39,18 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - build = "147"; + update = "6"; + + build = "24"; in stdenv.mkDerivation rec { - name = "openj${if jreOnly then "re" else "dk"}-7b${build}"; + name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}"; src = fetchurl { - url = "http://www.java.net/download/openjdk/jdk7/promoted/b${build}/openjdk-7-fcs-src-b${build}-27_jun_2011.zip"; - sha256 = "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs"; - }; - - jaxws_src_name = "jdk7-jaxws2_2_4-b03-2011_05_27.zip"; - - jaxws_src = fetchurl { - url = "http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/${jaxws_src_name}"; - sha256 = "1mpzgr9lnbf2p3x45npcniy47kbzi3hyqqbd4w3j63sxnxcp5bh5"; - }; - - jaxp_src_name = "jaxp145_01.zip"; - - jaxp_src = fetchurl { - url = "http://download.java.net/jaxp/1.4.5/${jaxp_src_name}"; - sha256 = "1js8m1a6lcn95byplmjjs1lja1maisyl6lgfjy1jx3lqi1hlr4n5"; - }; - - jaf_src_name = "jdk7-jaf-2010_08_19.zip"; - - jaf_src = fetchurl { - url = "http://java.net/downloads/jax-ws/JDK7/${jaf_src_name}"; - sha256 = "17n0i5cgvfsd6ric70h3n7hr8aqnzd216gaq3603wrxlvggzxbp6"; + url = "http://www.java.net/download/openjdk/jdk7u6/promoted/b24/openjdk-7u6-fcs-src-b24-28_aug_2012.zip"; + sha256 = "1x1iq8ga0hqqh0bpcmydzzy19757hknn2yvgzib85p7b7dx0vfx9"; }; # outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ]; @@ -98,12 +79,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; postUnpack = '' - mkdir -p drops - cp ${jaxp_src} drops/${jaxp_src_name} - cp ${jaxws_src} drops/${jaxws_src_name} - cp ${jaf_src} drops/${jaf_src_name} - export DROPS_PATH=$(pwd)/drops - sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ openjdk/hotspot/make/linux/makefiles/sa.make @@ -117,8 +92,6 @@ stdenv.mkDerivation rec { patches = [ ./cppflags-include-fix.patch - ./printf-fix.patch - ./linux-version-check-fix.patch ./no-crypto-restrictions.patch ]; @@ -135,7 +108,6 @@ stdenv.mkDerivation rec { "DEVTOOLS_PATH=" "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" - "DROPS_DIR=$(DROPS_PATH)" ]; configurePhase = '' @@ -172,4 +144,3 @@ stdenv.mkDerivation rec { passthru = { inherit architecture; }; } - diff --git a/pkgs/development/compilers/openjdk/linux-version-check-fix.patch b/pkgs/development/compilers/openjdk/linux-version-check-fix.patch deleted file mode 100644 index 9d749a198e3..00000000000 --- a/pkgs/development/compilers/openjdk/linux-version-check-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile ---- openjdk-orig/hotspot/make/linux/Makefile 2011-06-27 12:10:07.000000000 -0400 -+++ openjdk/hotspot/make/linux/Makefile 2011-08-10 20:08:40.879752771 -0400 -@@ -230,7 +230,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/pkgs/development/compilers/openjdk/printf-fix.patch b/pkgs/development/compilers/openjdk/printf-fix.patch deleted file mode 100644 index 3d66962a119..00000000000 --- a/pkgs/development/compilers/openjdk/printf-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk ---- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400 -+++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400 -@@ -79,7 +79,7 @@ - # Find all build_time_* files and print their contents in a list sorted - # on the name of the sub repository. - define ReportBuildTimes --$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ -+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ - $1 \ - "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ - "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \ From 857742ea22067bdb12b71af323c327e66ba32493 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 14:33:55 -0500 Subject: [PATCH 264/302] clang/llvm: 3.2 --- .../compilers/llvm/clang-include-paths.patch | 21 --- .../compilers/llvm/clang-ld-flags.patch | 57 -------- .../compilers/llvm/clang-purity.patch | 137 ++++++++++++++++++ pkgs/development/compilers/llvm/clang.nix | 8 +- pkgs/development/compilers/llvm/default.nix | 5 +- 5 files changed, 142 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/clang-include-paths.patch delete mode 100644 pkgs/development/compilers/llvm/clang-ld-flags.patch create mode 100644 pkgs/development/compilers/llvm/clang-purity.patch diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch deleted file mode 100644 index 5e7370718ab..00000000000 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 -@@ -2146,9 +2146,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2264,6 +2261,7 @@ - return; - - // Check if libc++ has been enabled and provide its include paths if so. -+ // !!! Will need to modify this if/when nixpkgs uses libc++ - if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { - // libc++ is always installed at a fixed path on Linux currently. - addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch deleted file mode 100644 index ffa67b464ec..00000000000 --- a/pkgs/development/compilers/llvm/clang-ld-flags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 -@@ -2077,16 +2077,6 @@ - addPathIfExists(LibPath + "/../" + Multilib, Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2100,8 +2090,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 -@@ -5210,24 +5210,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) -- CmdArgs.push_back("/lib64/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/clang-purity.patch b/pkgs/development/compilers/llvm/clang-purity.patch new file mode 100644 index 00000000000..18c70b56c54 --- /dev/null +++ b/pkgs/development/compilers/llvm/clang-purity.patch @@ -0,0 +1,137 @@ +diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp +--- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 ++++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500 +@@ -2153,16 +2153,6 @@ + addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths); + } + } +- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); +- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); +- +- // Try walking via the GCC triple path in case of multiarch GCC +- // installations with strange symlinks. +- if (GCCInstallation.isValid()) +- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + +- "/../../" + Multilib, Paths); + + // Add the non-multilib suffixed paths (if potentially different). + if (GCCInstallation.isValid()) { +@@ -2176,8 +2166,6 @@ + addPathIfExists(LibPath, Paths); + } + } +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); + } + + bool Linux::HasNativeLLVMSupport() const { +@@ -2228,9 +2216,6 @@ + if (DriverArgs.hasArg(options::OPT_nostdinc)) + return; + +- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) +- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); +- + if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { + llvm::sys::Path P(D.ResourceDir); + P.appendComponent("include"); +@@ -2295,24 +2280,6 @@ + "/usr/include/powerpc64-linux-gnu" + }; + ArrayRef MultiarchIncludeDirs; +- if (getTriple().getArch() == llvm::Triple::x86_64) { +- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::x86) { +- MultiarchIncludeDirs = X86MultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::arm) { +- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; +- else +- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mips) { +- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::mipsel) { +- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc) { +- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; +- } else if (getTriple().getArch() == llvm::Triple::ppc64) { +- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; +- } + for (ArrayRef::iterator I = MultiarchIncludeDirs.begin(), + E = MultiarchIncludeDirs.end(); + I != E; ++I) { +@@ -2324,13 +2291,6 @@ + + if (getTriple().getOS() == llvm::Triple::RTEMS) + return; +- +- // Add an include of '/include' directly. This isn't provided by default by +- // system GCCs, but is often used with cross-compiling GCCs, and harmless to +- // add even when Clang is acting as-if it were a system compiler. +- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include"); +- +- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); + } + + /// \brief Helper to add the thre variant paths for a libstdc++ installation. +diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp +--- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 ++++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500 +@@ -5972,34 +5972,6 @@ + ToolChain.getArch() == llvm::Triple::thumb || + (!Args.hasArg(options::OPT_static) && + !Args.hasArg(options::OPT_shared))) { +- CmdArgs.push_back("-dynamic-linker"); +- if (isAndroid) +- CmdArgs.push_back("/system/bin/linker"); +- else if (ToolChain.getArch() == llvm::Triple::x86) +- CmdArgs.push_back("/lib/ld-linux.so.2"); +- else if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb) { +- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) +- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); +- else +- CmdArgs.push_back("/lib/ld-linux.so.3"); +- } +- else if (ToolChain.getArch() == llvm::Triple::mips || +- ToolChain.getArch() == llvm::Triple::mipsel) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::mips64 || +- ToolChain.getArch() == llvm::Triple::mips64el) { +- if (hasMipsN32ABIArg(Args)) +- CmdArgs.push_back("/lib32/ld.so.1"); +- else +- CmdArgs.push_back("/lib64/ld.so.1"); +- } +- else if (ToolChain.getArch() == llvm::Triple::ppc) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc64) +- CmdArgs.push_back("/lib64/ld64.so.1"); +- else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp +--- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400 ++++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500 +@@ -221,8 +221,6 @@ + case llvm::Triple::Bitrig: + break; + default: +- // FIXME: temporary hack: hard-coded paths. +- AddPath("/usr/local/include", System, true, false, false); + break; + } + } +@@ -330,8 +328,6 @@ + break; + } + +- if ( os != llvm::Triple::RTEMS ) +- AddPath("/usr/include", System, false, false, false); + } + + void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 48e4c4946f3..39956666a07 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, perl, groff, llvm, cmake }: -let version = "3.1"; in +let version = "3.2"; in stdenv.mkDerivation { name = "clang-${version}"; buildInputs = [ perl llvm groff cmake ]; - patches = stdenv.lib.optionals (stdenv.gcc.libc != null) - [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; + patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" @@ -22,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; + sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia"; }; passthru = { gcc = stdenv.gcc.gcc; }; @@ -35,4 +34,3 @@ stdenv.mkDerivation { platforms = with stdenv.lib.platforms; all; }; } - diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 204c080b871..4b5bbdc5258 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, groff, cmake, python }: -let version = "3.1"; in +let version = "3.2"; in stdenv.mkDerivation { name = "llvm-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; + sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; }; buildInputs = [ perl groff cmake python ]; @@ -24,4 +24,3 @@ stdenv.mkDerivation { platforms = with stdenv.lib.platforms; all; }; } - From eaa343ea667dfad4a385b15ecbdee1d36b7520f6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 15:17:09 -0500 Subject: [PATCH 265/302] llvm: fix build on darwin --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07cf49641ef..3a8edba5bef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2489,7 +2489,11 @@ let fpc = fpc; }; - llvm = callPackage ../development/compilers/llvm { }; + llvm = callPackage ../development/compilers/llvm { + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; mitscheme = callPackage ../development/compilers/mit-scheme { }; From 50b939ce54d4a7d822c28fc2a3ef94b2ae801bc1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 15:41:37 -0500 Subject: [PATCH 266/302] clang: fix build on darwin --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a8edba5bef..d9475cb86e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1879,7 +1879,11 @@ let ccl = builderDefsPackage ../development/compilers/ccl {}; - clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { }; + clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }; clang = wrapClang clangUnwrapped; From 296cd6600943d5a349cda55a36137331f8c3eec8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Jan 2013 16:29:28 -0500 Subject: [PATCH 267/302] clang requires libxlm2, on darwin at least --- pkgs/development/compilers/llvm/clang.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 39956666a07..0c578828888 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake }: +{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: let version = "3.2"; in stdenv.mkDerivation { name = "clang-${version}"; - buildInputs = [ perl llvm groff cmake ]; + buildInputs = [ perl llvm groff cmake libxml2 ]; patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; From b8b726802979a37e6582994d2c931dcacf3e770a Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Tue, 22 Jan 2013 23:14:16 +0100 Subject: [PATCH 268/302] systemd: porting patches for arm for udev. Related to our glibc version, probably fixed in newer glibcs like in stdenv-updates. --- pkgs/os-specific/linux/systemd/default.nix | 2 +- .../linux/systemd/libc-bug-accept4-arm.patch | 81 +++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 93471d497c6..e331b86872e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,7 +20,7 @@ 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 - ]; + ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch b/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch new file mode 100644 index 00000000000..7cde2260189 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch @@ -0,0 +1,81 @@ +Based on a patch for udev in +nixpkgs(upstart)/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch + +It was taken from: +https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch + +Basically, ARM implemented accept4() only in 2.6.36. Nixpkgs now uses +linux headers from 2.6.35. And the particular nixpkgs glibc version had a bug, +not checking about 2.6.36 for accept4 on arm. + +diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c +index 7b88f74..a9f7b62 100644 +--- a/src/journal/journald-stream.c ++++ b/src/journal/journald-stream.c +@@ -347,10 +347,12 @@ int stdout_stream_new(Server *s) { + int fd, r; + socklen_t len; + struct epoll_event ev; ++ int flgs; + + assert(s); + +- fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); ++ //fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); ++ fd = accept(s->stdout_fd, NULL, NULL); + if (fd < 0) { + if (errno == EAGAIN) + return 0; +@@ -359,6 +361,11 @@ int stdout_stream_new(Server *s) { + return -errno; + } + ++ // Since we don't have accept4 ++ flgs = fcntl(fd, F_GETFL, NULL); ++ if(flgs >= 0) fcntl(fd, F_SETFL, flgs | O_NONBLOCK); ++ fcntl(fd, F_SETFD, FD_CLOEXEC); ++ + if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) { + log_warning("Too many stdout streams, refusing connection."); + close_nointr_nofail(fd); +diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c +index a235912..c05e4b4 100644 +--- a/src/udev/udev-ctrl.c ++++ b/src/udev/udev-ctrl.c +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -181,6 +182,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) + struct ucred ucred; + socklen_t slen; + const int on = 1; ++ int flgs; + + conn = calloc(1, sizeof(struct udev_ctrl_connection)); + if (conn == NULL) +@@ -188,13 +190,19 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) + conn->refcount = 1; + conn->uctrl = uctrl; + +- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); ++ //conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK); ++ conn->sock = accept(uctrl->sock, NULL, NULL); + if (conn->sock < 0) { + if (errno != EINTR) + log_error("unable to receive ctrl connection: %m\n"); + goto err; + } + ++ // Since we don't have accept4 ++ flgs = fcntl(conn->sock, F_GETFL, NULL); ++ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK); ++ fcntl(conn->sock, F_SETFD, FD_CLOEXEC); ++ + /* check peer credential of connection */ + slen = sizeof(ucred); + if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) { From 4f731152886001e7e19e765304319205a9cfaa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 23 Jan 2013 00:04:47 +0100 Subject: [PATCH 269/302] vimprobable2: updating to 1.2.0 --- .../networking/browsers/vimprobable2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 2402d2a902b..46081cac3a7 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -2,10 +2,10 @@ pkgconfig, webkit }: stdenv.mkDerivation { - name = "vimprobable2-1.0.2"; + name = "vimprobable2-1.2.0"; src = fetchurl { - url = "mirror://sourceforge/vimprobable/vimprobable2_1.0.2.tar.bz2"; - sha256 = "19gwlfv0lczbns73xg3637q7ixly62y3ijccnv0m1bqaqxjl4v8x"; + url = "mirror://sourceforge/vimprobable/vimprobable2_1.2.0.tar.bz2"; + sha256 = "0fjakrmz1syjwgx01j2icpdv69jgvfl2nlxbj8zxfr8mw0h2wg1f"; }; buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ]; installPhase = '' From 999480a0e468e8006e26d9dd7b250c053d9d770a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 3 Jan 2013 18:52:01 +0100 Subject: [PATCH 270/302] nm-applet: Update to 0.9.6.4 --- pkgs/tools/networking/network-manager-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 1a9b9485749..042fd58c8f1 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -5,7 +5,7 @@ let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.4.1"; + version = "${major}.6.4"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7"; + sha256 = "0ha16wvp2jcl96849qahaagidhiyalbjzi3nxi235y7hcnqnfmmf"; }; buildInputs = [ From abf2ea216ad32fec88147b0385efba4498910d5e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Jan 2013 14:15:36 +0100 Subject: [PATCH 271/302] nix: Update to 1.4pre3048_99ed558 --- 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 4c053c9e820..61fe8295a90 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.4pre3044_536c85e"; + name = "nix-1.4pre3048_99ed558"; src = fetchurl { - url = "http://hydra.nixos.org/build/3794557/download/5/${name}.tar.xz"; - sha256 = "d0f952ff3b4c0cf7f9682b45844ffb3686ff333d02be83341380186a97834f95"; + url = "http://hydra.nixos.org/build/3851906/download/5/${name}.tar.xz"; + sha256 = "4b2a75200d8b7ac21887f061b68b4e34d1edd69616916f86072d6f5bc7260d90"; }; buildNativeInputs = [ perl pkgconfig ]; From 5ebaaeb7f3e7c3214ba75a7c02854a5c2ce1c2e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Jan 2013 17:12:20 +0100 Subject: [PATCH 272/302] procps-ng: Add This will replace procps eventually. --- pkgs/os-specific/linux/procps-ng/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/procps-ng/default.nix diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix new file mode 100644 index 00000000000..6099505f1d6 --- /dev/null +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation { + name = "procps-ng-3.3.6"; + + src = fetchurl { + url = mirror://sourceforge/procps-ng/procps-ng-3.3.6.tar.xz; + sha256 = "0k0j3ilzfpw8n3y058ymgfmafdfqqqwpqm7nh7a35xlk6zgw96nh"; + }; + + buildInputs = [ ncurses ]; + + makeFlags = "usrbin_execdir=$(out)/bin"; + + enableParallelBuilding = true; + + crossAttrs = { + CC = stdenv.cross.config + "-gcc"; + }; + + meta = { + homepage = http://sourceforge.net/projects/procps-ng/; + description = "Utilities that give information about processes using the /proc filesystem"; + priority = 10; # less than coreutils, which also provides "kill" and "uptime" + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9475cb86e8..d1dcfd13f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6262,6 +6262,8 @@ let procps = callPackage ../os-specific/linux/procps { }; + "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; + pwdutils = callPackage ../os-specific/linux/pwdutils { }; qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; From fbf42935cd3a54fe763b54168dec12d4807e8c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 23 Jan 2013 23:22:47 +0100 Subject: [PATCH 273/302] taskcoach: updating to 1.3.22 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00f7ae7bd5d..64fa96af7ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3055,11 +3055,11 @@ pythonPackages = python.modules // rec { # }; taskcoach = buildPythonPackage rec { - name = "TaskCoach-1.3.8"; + name = "TaskCoach-1.3.22"; src = fetchurl { url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; - sha256 = "0gc277cgnw6f167lrbxlf7rmgyjxwzgkmi77qz9xwvnwcj2l94xn"; + sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh"; }; propagatedBuildInputs = [ wxPython ]; From 362f37a29240048d2d9f15d603cbe7d95630fbe1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 24 Jan 2013 11:51:57 +0100 Subject: [PATCH 274/302] Update zabbix2 to 2.0.4 --- pkgs/servers/monitoring/zabbix/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 83c8b8c8c7b..6b0a22962a3 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -2,11 +2,11 @@ let - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0r7pnfdgd3s2zqi2s7zlpjx521m3a6xy3g14q7ykxbz6fsmvxzmn"; + sha256 = "0l8038j6ldsv0ywrs2j69ybjl2zv4qw42791glqvcabjj8x24m3m"; }; preConfigure = From 7db0642961e01333f60bc4d9cbb3126e9f3731ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2013 11:53:08 +0100 Subject: [PATCH 275/302] upower: Update to 0.9.19 --- pkgs/os-specific/linux/upower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 6ae4c22f48a..e406681060f 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.18"; + name = "upower-0.9.19"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1"; + sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl"; }; buildInputs = From ed0fde7eb58bc18260a2913a68a70a9070c0f911 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2013 12:49:27 +0100 Subject: [PATCH 276/302] pm-utils: Remove some powersave hooks In particular, this should unbreak nix.readOnlyStore. --- pkgs/os-specific/linux/pm-utils/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index f20cadabc53..2b1bfcca41b 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -8,8 +8,8 @@ let sbinPath = stdenv.lib.makeSearchPath "sbin" [ procps ]; - -in + +in stdenv.mkDerivation rec { name = "pm-utils-1.4.1"; @@ -30,12 +30,22 @@ stdenv.mkDerivation rec { substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH:${binPath}:${sbinPath}' substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr ' - + substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)" substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock ''; + postInstall = + '' + # Remove some hooks that have doubtful usefulness. See + # http://zinc.canonical.com/~cking/power-benchmarking/pm-utils-results/results.txt. + # In particular, journal-commit breaks things if you have + # read-only bind mounts, since it ends up remounting the + # underlying filesystem read-only. + rm $out/lib/pm-utils/power.d/{journal-commit,readahead} + ''; + meta = { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; From 337d2f43d097724dd5d6e78f1af1c844c9fe64bf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2013 12:51:21 +0100 Subject: [PATCH 277/302] pm-utils: Set meta.platforms --- pkgs/os-specific/linux/pm-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 2b1bfcca41b..e3b6168be9b 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; } From 8dba5cd41153ca2a749125033a84a9921cab0565 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2013 18:23:04 +0100 Subject: [PATCH 278/302] ec2-ami-tools: Update to 1.4.0.9 --- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 1420ab5eeeb..1905166c38e 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "ec2-ami-tools-1.4.0.7"; - + name = "ec2-ami-tools-1.4.0.9"; + buildInputs = [ unzip makeWrapper ]; - + src = fetchurl { url = "http://nixos.org/tarballs/${name}.zip"; - sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip"; + sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq"; }; # Amazon EC2 requires that disk images are writable. If they're @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --set EC2_HOME $out \ --prefix PATH : ${ruby}/bin:${openssl}/bin done - + sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb ''; # */ From d9d9723ca72cd5eb658d5621e348dd5c5eeed8c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Jan 2013 18:27:22 +0100 Subject: [PATCH 279/302] With !allowUnfree, reject unfree-redistributable packages as well --- pkgs/stdenv/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index b6836ca8d79..1a2d8ecf747 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -41,7 +41,7 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: - if !allowUnfree && attrs.meta.license or "" == "unfree" then + if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( From 90909ea936def048f39818fca98ff4ad9d0cf821 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Thu, 24 Jan 2013 23:18:11 -0430 Subject: [PATCH 280/302] system-config-printer patch The latest version of system-config-printer seems to have introduced a dependency on pycurl. The attached patch includes this, fixing the build of kde, which depended on it through kdeadmin. --- pkgs/tools/misc/system-config-printer/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 0f20a8ad954..b0da497c322 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r"; }; + propagatedBuildInputs = [ pythonPackages.pycurl ]; + buildInputs = [ intltool pkgconfig glib udev libusb1 cups xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { ]; pythonPath = - [ pythonDBus pycups pygobject ] + [ pythonDBus pycups pygobject pythonPackages.pycurl ] ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ]; configureFlags = From 495fbceef93ca347d74413cf1a716975dface96d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 25 Jan 2013 01:10:36 -0500 Subject: [PATCH 281/302] Add libspotify --- .../libraries/libspotify/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/libraries/libspotify/default.nix diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix new file mode 100644 index 00000000000..9c28a99fee8 --- /dev/null +++ b/pkgs/development/libraries/libspotify/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey }: + +let version = "12.1.51"; in + +if stdenv.system != "x86_64-linux" then throw '' + Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here +'' else stdenv.mkDerivation { + name = "libspotify-${version}"; + + src = fetchurl { + url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz"; + + sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3"; + }; + + buildPhase = "true"; + + installFlags = "prefix=$(out)"; + + postInstall = "mv -v share $out"; + + patchPhase = "sed -i 's/ldconfig//' Makefile"; + + passthru = { + samples = if apiKey == null + then throw '' + Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly + '' else stdenv.mkDerivation { + name = "libspotify-samples-${version}"; + + src = libspotify.src; + + buildInputs = [ pkgconfig libspotify alsaLib readline ]; + + postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; + + patchPhase = "cp ${apiKey} appkey.c"; + + installPhase = '' + mkdir -p $out/bin + install -m 755 jukebox/jukebox $out/bin + install -m 755 spshell/spshell $out/bin + install -m 755 localfiles/posix_stu $out/bin + ''; + + meta = libspotify.meta // { description = "Spotify API library samples"; }; + }; + + inherit apiKey; + }; + + meta = { + description = "Spotify API library"; + + homepage = https://developer.spotify.com/technologies/libspotify; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + license = stdenv.lib.licenses.proprietary; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1dcfd13f66..3bd825ee870 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7824,6 +7824,10 @@ let spotify = callPackage ../applications/audio/spotify { }; + libspotify = callPackage ../development/libraries/libspotify { + apiKey = config.libspotify.apiKey or null; + }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) { From 8319a5599dfb3bb387531c09c064313e225f0e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 Jan 2013 09:18:30 +0100 Subject: [PATCH 282/302] alsautils: Adding libsamplerate, to be able to use alsaloop --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index ebaef323491..4f848e5a87d 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, alsaLib, gettext, ncurses}: +{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { name = "alsa-utils-1.0.26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq"; }; - buildInputs = [ alsaLib ncurses ]; + buildInputs = [ alsaLib ncurses libsamplerate ]; buildNativeInputs = [ gettext ]; configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; From 46135deaa550b9ebf86e5cc6ba2fe6dad0d501fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:12:02 +0100 Subject: [PATCH 283/302] haskell-reflection: add version 1.1.6 --- .../libraries/haskell/reflection/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/reflection/default.nix diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix new file mode 100644 index 00000000000..fbcaa58d777 --- /dev/null +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -0,0 +1,14 @@ +{ cabal, tagged }: + +cabal.mkDerivation (self: { + pname = "reflection"; + version = "1.1.6"; + sha256 = "1ihyx1a8pk1czam0qm1znl851dn4y6jip6s30girgghrvvxmblkw"; + buildDepends = [ tagged ]; + meta = { + homepage = "http://github.com/ekmett/reflection"; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + 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 06f9ded8f2b..64b172c0c21 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1457,6 +1457,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; + reflection = callPackage ../development/libraries/haskell/reflection {}; + regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {}; regexBase_0_93_1 = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {}; regexBase_0_93_2 = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {}; From 1b0456c28baa06d115069fcfb149b55103a129b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:16:36 +0100 Subject: [PATCH 284/302] haskell-hspec: jailbreak to support recent versions of ansi-terminal --- pkgs/development/libraries/haskell/hspec/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 79f4696362b..bc194108d33 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; + jailbreak = true; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; From 45a0d65bced9073a1b513a1ce351cb9fdd118d32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:16:48 +0100 Subject: [PATCH 285/302] haskell-mpppc: jailbreak to support recent versions of ansi-terminal --- pkgs/development/libraries/haskell/mpppc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index 334d337ddd6..54357821171 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.3"; sha256 = "1zcilskpslpqyrbwpabwbry4p3kpcfca94wchh9dkq9g8pg8laxi"; buildDepends = [ ansiTerminal split text ]; + jailbreak = true; meta = { description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; From c941ab98a758c4ef9c5a5dc3433920047050e54c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:03 +0100 Subject: [PATCH 286/302] haskell-idris: update to version 0.9.6 --- pkgs/development/compilers/idris/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index dbd35d9e948..15b4aa00986 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,15 +1,15 @@ { cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec -, transformers +, split, transformers }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.5.1"; - sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9"; + version = "0.9.6"; + sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1"; isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal filepath haskeline mtl parsec transformers + binary Cabal filepath haskeline mtl parsec split transformers ]; buildTools = [ happy ]; meta = { From 750b5d3d659818f83fcc9ea4a5cb9463d33284bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:03 +0100 Subject: [PATCH 287/302] haskell-ansi-terminal: update to version 0.6 --- pkgs/development/libraries/haskell/ansi-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 27d9a61cf41..6d598f29ec9 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.5.5.1"; - sha256 = "146kqp49dvsskws7pn54yynpac1sb1s51pbm4nkqj86wwp04f0lc"; + version = "0.6"; + sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg"; isLibrary = true; isExecutable = true; meta = { From 06eced487aa5eb8ab6fa92608e08313619fe5a7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:03 +0100 Subject: [PATCH 288/302] haskell-ansi-wl-pprint: update to version 0.6.6 --- pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index f34fcf6559d..bfccdcffd74 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ansi-wl-pprint"; - version = "0.6.4"; - sha256 = "0zrhzkmc5ki6q9ac5l16lhnyf9z2raj78gj9n0a7530rcv4ak3k0"; + version = "0.6.6"; + sha256 = "1zkbiv5cpdgjiyn2nrrha29r84al7jg6647flqmc8riz2nn91zqy"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal ]; From ce7db4b862e8048e25793f4c3c2f813dea772ecb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:03 +0100 Subject: [PATCH 289/302] haskell-citeproc-hs: update to version 0.3.7 --- pkgs/development/libraries/haskell/citeproc-hs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 027fe75033a..b62714749e3 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "citeproc-hs"; - version = "0.3.6"; - sha256 = "0zxwca3i7gg1vhdvrxd15c8zgx1gy3y7zjj746bcvf8pwavkq5q2"; + version = "0.3.7"; + sha256 = "0ix9y7z8m8x4l10h96fgv820grywvwcp3019wxjja4y4w6irid3b"; buildDepends = [ filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String From b76905994606e5d84253263d98a5bf4919bfdcea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:03 +0100 Subject: [PATCH 290/302] haskell-digestive-functors-heist: update to version 0.6.0.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 2c2e95913b8..08a9f09be3a 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.5.1.1"; - sha256 = "0jdg35xrikqg3r0rziv71g619vnmn8fzsv63b73m72fbj5xvy881"; + version = "0.6.0.0"; + sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk"; buildDepends = [ digestiveFunctors heist mtl text xmlhtml ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From ac2cff539d37538db95ab9604af54fb35a49d646 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 291/302] haskell-digestive-functors-snap: update to version 0.6.0.0 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 2d7fdada428..f23ee6d0691 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.5.0.2"; - sha256 = "0xx5i09l8n1srdmslq0sq1h366cdq3xqxwjd3kp2ck9s6x65zyjz"; + version = "0.6.0.0"; + sha256 = "18hc0sx7in0df6kgkc8mrxag5h2rmdj2cca9zf9w1if6wimx3g88"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 529083531f629a912d0a6fbc0c68b1d12ca8f5cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 292/302] haskell-digestive-functors: update to version 0.6.0.0 --- .../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 cce033eaf29..df474e63271 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.5.0.4"; - sha256 = "0diaj1pmfmhwbyjmw49kna59f7dckwrp16cbar5xpcn9k2pf19nv"; + version = "0.6.0.0"; + sha256 = "1h56nl1rszm098gwrdhm5w63mrnfjp1brfrk5hlj238nmj0djgcd"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; From 492d811123570dbff337dac35e4b9963f6ed284a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 293/302] haskell-hakyll: update to version 4.1.2.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 14aa9620b4f..c8b2117c128 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.1.2.0"; - sha256 = "1kbilad4ry8lyfcygajaphkgragmq5js349mjmh1bjn04rhjm54c"; + version = "4.1.2.1"; + sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8"; isLibrary = true; isExecutable = true; buildDepends = [ From 46b5d58235c77edc3b5bb925ca1dcc80a5be9b81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 294/302] haskell-logict: update to version 0.6 --- pkgs/development/libraries/haskell/logict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index a603b4fe644..0a03ed45fee 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "logict"; - version = "0.5.0.2"; - sha256 = "0m0a55l061vbxdqw9h1780g893amdxs7glza4jd5jncjsv823s1z"; + version = "0.6"; + sha256 = "1np4wizvwlx458kq6mmdrh8qcp1794y1bs4mnnz951h6hay5z49f"; buildDepends = [ mtl ]; meta = { homepage = "http://code.haskell.org/~dolio/logict"; From 89bfaeb94dd2379e6aa0f383321816a92a262757 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 295/302] haskell-pandoc: update to version 1.10.0.5 --- pkgs/development/libraries/haskell/pandoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 719eaa31961..ed660062673 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.10.0.4"; - sha256 = "1zwjwzxgip3zhbs7v7i981f5ch1rrd8i04cmn1gkfxnapbxx6z26"; + version = "1.10.0.5"; + sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54"; isLibrary = true; isExecutable = true; buildDepends = [ From c99a6a35fd33538d30e8332aba233d0d142d5798 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 296/302] haskell-zlib-bindings: update to version 0.1.1.3 --- pkgs/development/libraries/haskell/zlib-bindings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index d0ffcecaaeb..d2c3a838adf 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-bindings"; - version = "0.1.1.2"; - sha256 = "0p4713craq59vbyf3rr6kzv53rrfycbnlfs57i78fjrgwv6bd1ln"; + version = "0.1.1.3"; + sha256 = "18jhav7chbapakm9mwn7bn9lgvip7qaz61dw5gwv2nyalvm96qfr"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From ce2423a6e7b0b08250e0594e2dd21724bbc2bda1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 297/302] haskell-BNFC: update to version 2.6.0.3 --- pkgs/development/tools/haskell/BNFC/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index e737a02a4ac..c6cbc4a5358 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.4.2.1"; - sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14"; - isLibrary = false; + version = "2.6.0.3"; + sha256 = "0i38rwslkvnicnlxbrxybnwkgfin04lnr4q12lcvli4ldp2ylfjq"; + isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; meta = { - homepage = "http://www.cse.chalmers.se/research/group/Language-technology/BNFC/"; + homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; license = "GPL"; platforms = self.ghc.meta.platforms; From 7aa6680ecb73e42d32ee0df4a463cbaebbff7751 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 298/302] haskell-cabal2nix: update to version 1.43 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 8ce6b62a521..e3b6378e3d9 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.42"; - sha256 = "02yg4lj2y272fvn79kgqccizs71xg5ifnjhpw4vhw5wya657a20w"; + version = "1.43"; + sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 8db11ef402ceac4b39e69c2a3d227d80527d5c44 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 299/302] haskell-hlint: update to version 1.8.42 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 5b7a925e20b..8f8e16dd260 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.41"; - sha256 = "0b585i5v81jh1j2r70x74ykabc5hcd5sbww4kspl3s5i3jwkp16q"; + version = "1.8.42"; + sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc"; isLibrary = true; isExecutable = true; buildDepends = [ From 3395d065ee73c4c9f3278963537ee411d2953b79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:52:04 +0100 Subject: [PATCH 300/302] haskell-cpphs: update to version 1.16 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index c7700ad3a23..2e419f67eb0 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.15"; - sha256 = "1p2lf9zqiyydpq1vrqf8sw7mij5kw4pyggm41qgxn0a6lp6ni346"; + version = "1.16"; + sha256 = "1fv91s3h2s76h1hadb3mmnkg0rrfakmbfsrw6q522kshvpk2wmmp"; isLibrary = true; isExecutable = true; meta = { From 1ccfaad5257fc45a17fbcea6533cac637918b5ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:54:28 +0100 Subject: [PATCH 301/302] haskell-diagrams-contrib: update to version 0.6.0.2 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index c646c5e3943..85b1360c366 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "0.6.0.1"; - sha256 = "1wrfdsfb2yj93wq2ykxjyg6g0q56bmxd2rc6r3gd0zcs8kiimaar"; + version = "0.6.0.2"; + sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; From 0d141e23a1093f359ec617384fbb032619a5031a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Jan 2013 14:54:29 +0100 Subject: [PATCH 302/302] haskell-lens: update to version 3.8.2 --- .../libraries/haskell/lens/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index ab634ea70e9..e815d654b61 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,20 +1,22 @@ -{ cabal, comonad, comonadsFd, comonadTransformers, filepath -, hashable, mtl, nats, parallel, semigroups, split, text -, transformers, transformersCompat, unorderedContainers, vector +{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers +, contravariant, distributive, filepath, genericDeriving, hashable +, MonadCatchIOTransformers, mtl, parallel, profunctorExtras +, profunctors, reflection, semigroupoids, semigroups, split, tagged +, text, transformers, transformersCompat, unorderedContainers +, vector }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.7.3"; - sha256 = "0mvwczviszfv52ylymvrz3zk6s05ngmqc2g1k4r6pym8s9cmgmzz"; + version = "3.8.2"; + sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m"; buildDepends = [ - comonad comonadsFd comonadTransformers filepath hashable mtl nats - parallel semigroups split text transformers transformersCompat - unorderedContainers vector + bifunctors comonad comonadsFd comonadTransformers contravariant + distributive filepath genericDeriving hashable + MonadCatchIOTransformers mtl parallel profunctorExtras profunctors + reflection semigroupoids semigroups split tagged text transformers + transformersCompat unorderedContainers vector ]; - patchPhase = '' - sed -i -e 's|semigroups.*,|semigroups,|' lens.cabal - ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals";