From 9322bee98823df6abcf989e6c0749711b30de56e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Nov 2012 13:01:44 +0100 Subject: [PATCH 001/221] 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 fd6941ad48b6417b7a0aa2d04fb393f53d21d9a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Dec 2012 16:17:47 +0100 Subject: [PATCH 002/221] 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 003/221] 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 004/221] 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 005/221] 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 006/221] 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 007/221] 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 d1254fa27ec31f9d96f189b444cfa684efa2ba0c Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 16 Dec 2012 23:24:31 -0800 Subject: [PATCH 008/221] add Vessel, a fluid physics puzzle game. --- pkgs/games/vessel/default.nix | 77 +++++++++++++++++++++++++++++++++ pkgs/games/vessel/isatty.c | 6 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/games/vessel/default.nix create mode 100644 pkgs/games/vessel/isatty.c diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix new file mode 100644 index 00000000000..24fc759762a --- /dev/null +++ b/pkgs/games/vessel/default.nix @@ -0,0 +1,77 @@ +{ stdenv, requireFile, SDL }: + +stdenv.mkDerivation rec { + name = "vessel-12082012"; + + goBuyItNow = '' + We cannot download the full version automatically, as you require a license. + Once you bought a license, you need to add your downloaded version to the nix store. + You can do this by using "nix-prefetch-url file://${name}-bin" in the + directory where you saved it. + ''; + + src = if (stdenv.isi686) then + requireFile { + message = goBuyItNow; + name = "${name}-bin"; + sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96"; + } else throw "unsupported platform ${stdenv.s:ystem} only i686-linux supported for now."; + + phases = "installPhase"; + ld_preload = ./isatty.c; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] + + ":" + stdenv.lib.makeLibraryPath [ SDL ] ; + + installPhase = '' + ensureDir $out/libexec/strangeloop/vessel/ + ensureDir $out/bin + + # allow scripting of the mojoinstaller + gcc -fPIC -shared -o isatty.so $ld_preload + + echo @@@ + echo @@@ this next step appears to hang for a while + echo @@@ + + # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. + LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT + n + $out/libexec/strangeloop/vessel/ + IM_A_BOT + + # use nix SDL libraries + rm $out/libexec/strangeloop/vessel/x86/libSDL* + rm $out/libexec/strangeloop/vessel/x86/libstdc++* + + # props to Ethan Lee (the Vessel porter) for understanding + # how $ORIGIN works in rpath. There is hope for humanity. + patchelf \ + --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ + $out/libexec/strangeloop/vessel/x86/vessel.x86 + + cat > $out/bin/Vessel << EOW + #!/bin/sh + cd $out/libexec/strangeloop/vessel/ + exec ./x86/vessel.x86 + EOW + + chmod +x $out/bin/Vessel + ''; + + meta = { + description = "A fluid physics based puzzle game"; + longDescription = '' + Living liquid machines have overrun this world of unstoppable progress, + and it is the role of their inventor, Arkwright, to stop the chaos they are + causing. Vessel is a game about a man with the power to bring ordinary matter + to life, and all the consequences that ensue. + ''; + homepage = http://www.strangeloopgames.com; + license = [ "unfree" ]; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + platforms = [ "i686-linux"] ; + }; + +} diff --git a/pkgs/games/vessel/isatty.c b/pkgs/games/vessel/isatty.c new file mode 100644 index 00000000000..38ee2b6ce2e --- /dev/null +++ b/pkgs/games/vessel/isatty.c @@ -0,0 +1,6 @@ +// We override isatty to help 'automate' installers. + +// Some installers (mojoinstall) have a stdio GUI that refuses to run if you +// feed it a file on stdin. This should help that. + +int isatty(int fd) { return 1; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d291708df88..03408febd93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8351,6 +8351,8 @@ let vectoroids = callPackage ../games/vectoroids { }; + vessel = callPackage_i686 ../games/vessel { }; + warmux = callPackage ../games/warmux { }; warsow = callPackage ../games/warsow { From 36e946c34fd4934da8b1a01adc9f53507f33a686 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 18 Dec 2012 00:07:24 -0800 Subject: [PATCH 009/221] Need pulseaudio or alsalibs for sound. --- pkgs/games/vessel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 24fc759762a..e1779d1a4db 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, SDL }: +{ stdenv, requireFile, SDL, pulseaudio, alsaLib }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL ] ; + + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; installPhase = '' ensureDir $out/libexec/strangeloop/vessel/ From 69b752de5739054ef42e416e3743ab1b21c33af3 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 27 Dec 2012 18:42:40 -0800 Subject: [PATCH 010/221] patchelf the libraries: they need rpath set for sound to work --- pkgs/games/vessel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index e1779d1a4db..e6f3523fa24 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ $out/libexec/strangeloop/vessel/x86/vessel.x86 + # we need to libs to find their deps + for lib in $out/libexec/strangeloop/vessel/x86/lib* ; do + patchelf \ + --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ + $lib + done + cat > $out/bin/Vessel << EOW #!/bin/sh cd $out/libexec/strangeloop/vessel/ From bafdf87367798b481fc19eb9e2397ef78c60c267 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 1 Jan 2013 17:13:33 +0100 Subject: [PATCH 011/221] 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 012/221] 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 013/221] 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 4c1e931cd4c2d2c34bf271c18186657cf7da9897 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Sat, 29 Dec 2012 15:34:34 +0100 Subject: [PATCH 014/221] Update BLCR to version 0.8.5 Beta 3. This version extends support to kernels up to version 3.7.1. According to the authors, despite the "beta" in the version name, this version should be considered "stable" on non exotic architecture. --- pkgs/os-specific/linux/blcr/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 8c77cffe177..169b020befd 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) +# BLCR 0.8.5_beta3 should works for kernel version up to 3.7.1 + assert stdenv.isLinux; -assert builtins.compareVersions "2.6.39" kernel.version == 1; +#assert builtins.compareVersions "2.6.39" kernel.version == 1; +assert builtins.compareVersions "3.7.2" kernel.version == 1; stdenv.mkDerivation { - name = "blcr-0.8.4-${kernel.version}"; + name = "blcr_${kernel.version}-0.8.5pre3"; src = fetchurl { - url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz; - sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf"; + url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.5_b3.tar.gz; + sha256 = "1xp2k140w79zqbnfnb2q7z91hv15d5a6p39zdc97f9pfxmyyc8fn"; }; buildInputs = [ perl makeWrapper ]; From 97d6292deb30ea6a4ab963efc68514442ece4594 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 9 Jan 2013 16:11:16 +0100 Subject: [PATCH 015/221] linux 3.2-3.7: enable NFS_FSCACHE and CIFS_FSCACHE NFS_FSCACHE and CIFS_FSCACHE are required to enable the local cache support for NFS and CIFS (the 'fsc' mount option). The reasoning for enabling it from 3.2 and forward is that at least Ubuntu 12.04 (linux 3.2) has it turned on. Could probably be enabled for earlier kernels too. --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.3.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.5.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.6.nix | 2 ++ pkgs/os-specific/linux/kernel/linux-3.7.nix | 2 ++ 6 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 212a86f36a3..aded11706d1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -146,8 +146,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 0db9a5c375d..b3660afaabb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -146,8 +146,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index a03e3950891..34c634f5e92 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 78f60c9906a..c5d694cfc5a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 3fb47da7be6..3447c9968e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 1a02910b5c8..57699961f7c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -148,8 +148,10 @@ let NFSD_V3 y NFSD_V3_ACL y NFSD_V4 y + NFS_FSCACHE y CIFS_XATTR y CIFS_POSIX y + CIFS_FSCACHE y # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem From 0500d1689950fd8abab9ec739b4f2fe4b7d9963b Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 12 Jan 2013 12:43:47 +0100 Subject: [PATCH 016/221] 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 ee19b41203a75aabaafa8093f3b6ef487a9febc8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Jan 2013 11:18:42 +0100 Subject: [PATCH 017/221] 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 18:14:57 +0100 Subject: [PATCH 018/221] 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 2ba4f46752cbd9e6869a4c48fbea4033486c34c4 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 17 Jan 2013 22:52:15 -0800 Subject: [PATCH 019/221] 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 cd5755845fe5a31711d223f5f7fc3f50f2f9212b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 19 Jan 2013 00:02:51 +0100 Subject: [PATCH 020/221] 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 3066f86e0dcd4629204e9643dfe6d67afb7c8269 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sat, 19 Jan 2013 11:25:43 -0800 Subject: [PATCH 021/221] 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 022/221] 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 bcc0c1dc591542bedcf39db53f7f80733aacbc5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 Jan 2013 17:25:09 +0100 Subject: [PATCH 023/221] 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 adf7a68158d2208cd0ccbfff1498d091c79f32d8 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 21 Jan 2013 04:28:23 +0100 Subject: [PATCH 024/221] 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 025/221] 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 026/221] 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 027/221] 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 028/221] 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 029/221] 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 030/221] 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 031/221] 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 032/221] 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 033/221] 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 034/221] 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 035/221] 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 036/221] 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 037/221] 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 038/221] 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 039/221] 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 040/221] 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 041/221] 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 042/221] 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 043/221] 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 044/221] 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 045/221] 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 046/221] 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 047/221] 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 048/221] 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 049/221] 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 050/221] 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 051/221] 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 052/221] 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 053/221] 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 054/221] 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 055/221] 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 056/221] 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 057/221] 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 058/221] 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 059/221] 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 060/221] 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 061/221] 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 062/221] 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 063/221] 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 064/221] 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 065/221] 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 066/221] 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 067/221] 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 068/221] 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 069/221] 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 070/221] 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 071/221] 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 072/221] 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 073/221] 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 074/221] 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 075/221] 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 076/221] 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 077/221] 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 078/221] 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 079/221] 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 080/221] 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 081/221] 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 082/221] 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 083/221] 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 084/221] 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 085/221] 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 086/221] 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 087/221] 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 088/221] 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 089/221] 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 090/221] 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 091/221] 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 092/221] 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 093/221] 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 094/221] 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 095/221] 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 096/221] 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 097/221] 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 098/221] 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 099/221] 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 100/221] 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 101/221] 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 102/221] 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 103/221] 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 104/221] 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 105/221] 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 106/221] 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"; From bff4b066401e7b61d37a4a038f7c9722f796d860 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Jan 2013 11:59:49 +0100 Subject: [PATCH 107/221] youtube-dl: enable builds by Hydra on Linux and Darwin youtube-dl is a very short script, but it depends on Pandoc to generate its documentation, and Pandoc is fairly expensive to build (or download). Offering binary packages of youtube-dl for Hydra users should remedy the need to install Pandoc. --- pkgs/tools/misc/youtube-dl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 52c8e493fdc..16d844d10d5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { meta = { homepage = "http://rg3.github.com/youtube-dl/"; description = "Command-line tool to download videos from YouTube.com and other sites"; + + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons ]; }; } From 46dd0485f5592fe80fd78a791506a875ec8ace35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 22 Jan 2013 14:56:01 +0100 Subject: [PATCH 108/221] Update ufoai to 2.4, clean dependencies and the expression. --- pkgs/games/ufoai/default.nix | 54 +++++++++++---------------------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index e642e6f9124..80f3d72c579 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,53 +1,35 @@ -{stdenv, fetchurl, SDL, mesa, SDL_image, SDL_ttf, SDL_mixer, libpng, libjpeg, zlib -, curl, libvorbis, libtheora, xvidcore, pkgconfig, gtk, glib, libxml2, gtksourceview -, gtkglext, openal, gettext, p7zip }: +{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer +, curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { - name = "ufoai-2.3"; + name = "ufoai-2.4"; src = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-source.tar.bz2; - sha256 = "1pb41q5wx180l6xv8gm1sw8b7cji42znnb6qpjaap6vpgc8k3hp9"; + url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2"; + sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5"; }; srcData = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-data.tar; - sha256 = "0952kx6cbi4y89fbz1ig32rvsmfhzqpvdf79rq4axag9d3i5qlqf"; + url = "mirror://sourceforge/ufoai/${name}-data.tar"; + sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb"; }; - srcI18n = fetchurl { - url = mirror://sourceforge/ufoai/ufoai-2.3-i18n.tar.bz2; - sha256 = "14fzv8a4xng6kfl6aw8yzz6vl2j5vryxija5b2yz75jbfpa94i09"; - }; + preConfigure = ''tar xvf "${srcData}"''; - # for the xvidcore static lib - NIX_CFLAGS_COMPILE = "-pthread -lm"; + configureFlags = [ "--enable-release" "--enable-sse" ] + ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; - # Order is important, x libs include a libpng version that fails for ufoai - buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis - libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext - p7zip ]; + buildInputs = [ + libtheora xvidcore mesa SDL SDL_ttf SDL_mixer + curl libjpeg libpng gettext cunit + ]; - enableParallelBuilding = true; - - preConfigure = '' - tar xvf $srcI18n - ''; - - configureFlags = "--enable-release"; - - postInstall = '' - pushd $out/share/ufoai - tar xvf $srcData - popd - ''; - - installTargets = "install_exec"; + NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1 meta = { - homepage = http://www.ultimatestunts.nl/; - description = "Squad-based tactical strategy game in the tradition of X-Com"; + homepage = http://ufoai.org; + description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2a78c943ce..21a5dcdd082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8411,10 +8411,7 @@ let trigger = callPackage ../games/trigger { }; - ufoai = callPackage ../games/ufoai { - inherit (gnome) gtksourceview gtkglext; - libpng = libpng12; - }; + ufoai = callPackage ../games/ufoai { }; ultimatestunts = callPackage ../games/ultimatestunts { }; From 0353c08d3869b1507e6eba4423c10dd58cfc6d1c Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 27 Jan 2013 15:27:54 +0100 Subject: [PATCH 109/221] uboot: updating the default uboot to 2012.07 This is what I use in the sheevplug, with the provided patches. The old sheevaplug uboot doesn't understand ubifs. --- pkgs/misc/uboot/default.nix | 15 +- pkgs/misc/uboot/sheevaplug-config.patch | 57 ++ pkgs/misc/uboot/sheevaplug-sdio.patch | 1091 +++++++++++++++++++++++ 3 files changed, 1160 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/uboot/sheevaplug-config.patch create mode 100644 pkgs/misc/uboot/sheevaplug-sdio.patch diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 7525c28e740..629537212bd 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation { - name = "uboot-2009.11"; + name = "uboot-2012.07"; src = fetchurl { - url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2009.11.tar.bz2"; - sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6"; + url = "ftp://ftp.denx.de/pub/u-boot/u-boot-2012.07.tar.bz2"; + sha256 = "15nli6h9a127ldizsck3g4ysy5j4m910wawspgpadz4vjyk213p0"; }; buildNativeInputs = [ unzip ]; @@ -40,6 +40,15 @@ stdenv.mkDerivation { cp tools/{envcrc,mkimage} $out/bin ''; + # They have 'errno.h' included by a "-idirafter". As the gcc + # wrappers add the glibc include as "-idirafter", the only way + # we can make the glibc take priority is to -include errno.h. + postPatch = if stdenv ? glibc && stdenv.glibc != null then '' + sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc}/include/errno.h $(HOSTCPPFLAGS),' config.mk + '' else ""; + + patches = [ ./sheevaplug-sdio.patch ./sheevaplug-config.patch ]; + configurePhase = assert platform ? uboot && platform.uboot != null; assert (platform ? ubootConfig); diff --git a/pkgs/misc/uboot/sheevaplug-config.patch b/pkgs/misc/uboot/sheevaplug-config.patch new file mode 100644 index 00000000000..487756217bf --- /dev/null +++ b/pkgs/misc/uboot/sheevaplug-config.patch @@ -0,0 +1,57 @@ +diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h +index 7c8497c..b0da1e5 100644 +--- a/include/configs/sheevaplug.h ++++ b/include/configs/sheevaplug.h +@@ -50,7 +50,6 @@ + #define CONFIG_CMD_MII + #define CONFIG_CMD_MMC + #define CONFIG_CMD_NAND +-#define CONFIG_JFFS2_NAND + #define CONFIG_CMD_PING + #define CONFIG_CMD_USB + /* +@@ -73,25 +72,36 @@ + * it has to be rounded to sector size + */ + #define CONFIG_ENV_SIZE 0x20000 /* 128k */ +-#define CONFIG_ENV_ADDR 0xa0000 +-#define CONFIG_ENV_OFFSET 0xa0000 /* env starts here */ ++#define CONFIG_ENV_ADDR 0x60000 ++#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ + + /* + * Default environment variables + */ +-#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ ++#define CONFIG_BOOTCOMMAND "${x_bootcmd_ubi0}; " \ ++ "${x_bootcmd_ubi1}; " \ ++ "${x_bootcmd_ubi2}; " \ ++ "${x_bootcmd_ubi3}; " \ + "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ +- "${x_bootcmd_usb}; bootm 0x6400000;" ++ "${x_bootcmd_usb}; bootm 0x200000 0x1100000;" + + #define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ +- "0x1ff00000@512k(rootfs) rw\0" ++ "0x1ff00000@512k(rootfs)\0" ++#define CONFIG_MTDPARTSK "orion_nand:512k(uboot)," \ ++ "0x1ff00000@512k(rootfs)rw\0" + + #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ +- "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ ++ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTSK \ ++ "mtdparts=mtdparts="CONFIG_MTDPARTS \ + "mtdids=nand0=orion_nand\0" \ +- "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ ++ "ipaddr=192.168.1.4\0" \ ++ "x_bootcmd_ubi0=ubi part nand0,1\0" \ ++ "x_bootcmd_ubi1=ubifsmount rootfs\0" \ ++ "x_bootcmd_ubi2=ubifsload 0x200000 /nixos-kernel\0" \ ++ "x_bootcmd_ubi3=ubifsload 0x1100000 /nixos-initrd\0" \ + "x_bootcmd_usb=usb start\0" \ +- "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" ++ "x_bootargs_root=ubi.mtd=rootfs root=ubi0:rootfs rw rootfstype=ubifs " \ ++ "init=/boot/nixos-init systemConfig=/boot/default/system\0" + + /* + * Ethernet Driver configuration diff --git a/pkgs/misc/uboot/sheevaplug-sdio.patch b/pkgs/misc/uboot/sheevaplug-sdio.patch new file mode 100644 index 00000000000..3a4ea2933a3 --- /dev/null +++ b/pkgs/misc/uboot/sheevaplug-sdio.patch @@ -0,0 +1,1091 @@ +diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h +index a9499b7..1294d7f 100644 +--- a/arch/arm/include/asm/arch-kirkwood/config.h ++++ b/arch/arm/include/asm/arch-kirkwood/config.h +@@ -66,6 +66,7 @@ + #define MV_SATA_BASE KW_SATA_BASE + #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET + #define MV_SATA_PORT1_OFFSET KW_SATA_PORT1_OFFSET ++#define MV_SDIO_BASE KW_SDIO_BASE + + /* + * NAND configuration +@@ -107,6 +108,14 @@ + #endif /* CONFIG_CMD_NET */ + + /* ++ * SDIO/MMC Card Configuration ++ */ ++#ifdef CONFIG_CMD_MMC ++#define CONFIG_MMC ++#define CONFIG_MV_SDIO ++#endif /* CONFIG_CMD_MMC */ ++ ++/* + * USB/EHCI + */ + #ifdef CONFIG_CMD_USB +diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h +index 47771d5..343214b 100644 +--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h ++++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h +@@ -55,6 +55,7 @@ + #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) + #define KW_EGIGA1_BASE (KW_REGISTER(0x76000)) + #define KW_SATA_BASE (KW_REGISTER(0x80000)) ++#define KW_SDIO_BASE (KW_REGISTER(0x90000)) + + /* Kirkwood Sata controller has two ports */ + #define KW_SATA_PORT0_OFFSET 0x2000 +diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile +index c567737..081d5f4 100644 +--- a/drivers/mmc/Makefile ++++ b/drivers/mmc/Makefile +@@ -34,6 +34,7 @@ COBJS-$(CONFIG_GENERIC_ATMEL_MCI) += gen_atmel_mci.o + COBJS-$(CONFIG_MMC_SPI) += mmc_spi.o + COBJS-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o + COBJS-$(CONFIG_MV_SDHCI) += mv_sdhci.o ++COBJS-$(CONFIG_MV_SDIO) += mv_sdio.o + COBJS-$(CONFIG_MXC_MMC) += mxcmmc.o + COBJS-$(CONFIG_MXS_MMC) += mxsmmc.o + COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o +diff --git a/drivers/mmc/mv_sdio.c b/drivers/mmc/mv_sdio.c +new file mode 100644 +index 0000000..35969d3 +--- /dev/null ++++ b/drivers/mmc/mv_sdio.c +@@ -0,0 +1,675 @@ ++/* ++ * (C) Copyright 2009 ++ * Marvell Semiconductor ++ * Written-by: Gérald Kerma ++ * ++ * (C) Copyright 2003 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#ifdef CONFIG_KIRKWOOD ++#include ++#endif ++#include "mv_sdio.h" ++ ++#ifdef CONFIG_MMC ++ ++#define DRIVER_NAME "mv-sdio" ++ ++#ifdef DEBUG ++#define pr_debug(fmt, args...) printf(fmt, ##args) ++#else ++#define pr_debug(...) do { } while(0) ++#endif ++ ++//static mv_sdio_t *mvsd = (mv_sdio_t *)mmc->priv; ++static mv_sdio_t *mvsd = (mv_sdio_t *)MV_SDIO_BASE; ++ ++static int is_sdhc; ++extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no); ++static block_dev_desc_t mmc_dev; ++block_dev_desc_t * mmc_get_dev(int dev) ++{ ++ return ((block_dev_desc_t *)&mmc_dev); ++} ++ ++/* ++ * FIXME needs to read cid and csd info to determine block size ++ * and other parameters ++ */ ++static uchar mmc_buf[MMC_BLOCK_SIZE]; ++static mv_mmc_csd_t mv_mmc_csd; ++static int mmc_ready = 0; ++ ++/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code ++ that expects it to be shifted. */ ++static u_int16_t rca = 0; ++ ++/* used for debug */ ++static u_int32_t mv_mmc_size(const struct mv_mmc_csd *csd) ++{ ++ u_int32_t block_len, mult, blocknr; ++ ++ block_len = csd->read_bl_len << 12; ++ mult = csd->c_size_mult1 << 8; ++ blocknr = (csd->c_size+1) * mult; ++ ++ return blocknr * block_len; ++} ++ ++static int isprint (unsigned char ch) ++{ ++ if (ch >= 32 && ch < 127) ++ return (1); ++ ++ return (0); ++} ++ ++static int toprint(char *dst, char c) ++{ ++ if (isprint(c)) { ++ *dst = c; ++ return 1; ++ } ++ ++ return sprintf(dst,"\\x%02x", c); ++ ++} ++ ++static void print_mmc_cid(mv_mmc_cid_t *cid) ++{ ++ printf("MMC found. Card desciption is:\n"); ++ printf("Manufacturer ID = %02x%02x%02x\n", ++ cid->id[0], cid->id[1], cid->id[2]); ++ printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev); ++ cid->hwrev = cid->fwrev = 0; /* null terminate string */ ++ printf("Product Name = %s\n",cid->name); ++ printf("Serial Number = %02x%02x%02x\n", ++ cid->sn[0], cid->sn[1], cid->sn[2]); ++ printf("Month = %d\n",cid->month); ++ printf("Year = %d\n",1997 + cid->year); ++} ++ ++static void print_sd_cid(mv_sd_cid_t *cid) ++{ ++ int len; ++ char tbuf[64]; ++ ++ printf("SD%s found. Card desciption is:\n", is_sdhc?"HC":""); ++ ++ len = 0; ++ len += toprint(&tbuf[len], cid->oid_0); ++ len += toprint(&tbuf[len], cid->oid_1); ++ tbuf[len] = 0; ++ ++ printf("Manufacturer: 0x%02x, OEM \"%s\"\n", ++ cid->mid, tbuf); ++ ++ len = 0; ++ len += toprint(&tbuf[len], cid->pnm_0); ++ len += toprint(&tbuf[len], cid->pnm_1); ++ len += toprint(&tbuf[len], cid->pnm_2); ++ len += toprint(&tbuf[len], cid->pnm_3); ++ len += toprint(&tbuf[len], cid->pnm_4); ++ tbuf[len] = 0; ++ ++ printf("Product name: \"%s\", revision %d.%d\n", ++ tbuf, ++ cid->prv >> 4, cid->prv & 15); ++ ++ printf("Serial number: %u\n", ++ cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 | ++ cid->psn_3); ++ printf("Manufacturing date: %d/%d\n", ++ cid->mdt_1 & 15, ++ 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4)); ++ ++ printf("CRC: 0x%02x, b0 = %d\n", ++ cid->crc >> 1, cid->crc & 1); ++} ++ ++static void mvsdio_set_clock(unsigned int clock) ++{ ++ unsigned int m; ++ ++ m = MVSDMMC_BASE_FAST_CLOCK/(2*clock) - 1; ++ ++ pr_debug("mvsdio_set_clock: dividor = 0x%x clock=%d\n", ++ m, clock); ++ ++ ++ writew(m & 0x7ff, &mvsd->CLK_DIV); ++ ++ if (isprint(1)) ++ udelay(10*1000); ++} ++ ++/****************************************************/ ++static ulong * mv_mmc_cmd(ulong cmd, ulong arg, ushort xfermode, ushort resptype, ushort waittype) ++/****************************************************/ ++{ ++ static ulong resp[4]; ++ ushort done ; ++ int err = 0 ; ++ ulong curr, start, diff, hz; ++ ushort response[8]; ++ ++ pr_debug("mv_mmc_cmd %x, arg: %x,xfer: %x,resp: %x, wait : %x\n" ++ , (unsigned int)cmd, (unsigned int)arg, xfermode, resptype, waittype); ++ ++ ++ /* clear status */ ++ writew(0xffff, &mvsd->NOR_INTR_STATUS); ++ writew(0xffff, &mvsd->ERR_INTR_STATUS); ++ ++ start = get_timer(0); ++ hz = CONFIG_SYS_HZ; ++ ++ while((readw(&mvsd->PRESENT_STATE0) & CARD_BUSY)) { ++ curr = get_timer(0); ++ diff = (long) curr - (long) start; ++ if (diff > (3*hz)) ++ { ++ /* 3 seconds timeout, card busy, can't sent cmd */ ++ printf("card too busy \n"); ++ return 0; ++ } ++ } ++ ++ writew((ushort)(arg&0xffff), &mvsd->ARG_LOW); ++ writew((ushort)(arg>>16), &mvsd->ARG_HI); ++ writew(xfermode, &mvsd->XFER_MODE); ++ if( (cmd == MMC_CMD_READ_BLOCK) || (cmd == 25) ) ++ { ++ writew(((cmd << 8) | resptype | 0x3c ) , &mvsd->CMD); ++ pr_debug("cmd reg : %x\n", readw(&mvsd->CMD)) ; ++ ++ } ++ else ++ { ++ writew(((cmd << 8) | resptype ), &mvsd->CMD); ++ } ++ ++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype; ++ start = get_timer(0); ++ ++ while( done!=waittype) ++ { ++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype; ++ ++ if( readw(&mvsd->NOR_INTR_STATUS) & 0x8000 ) ++ { ++ pr_debug("Error! cmd : %d, err : %04x\n", (unsigned int)cmd, readw(&mvsd->ERR_INTR_STATUS)) ; ++ ++ return 0 ; /* error happen */ ++ } ++ ++ curr = get_timer(0); ++ diff = (long) curr - (long) start; ++ if (diff > (3*hz)) ++ { ++ pr_debug("cmd timeout, status : %04x\n", readw(&mvsd->NOR_INTR_STATUS)); ++ pr_debug("xfer mode : %04x\n", readw(&mvsd->XFER_MODE)); ++ ++ err = 1 ; ++ break; ++ } ++ } ++ ++ response[0] = readw(&mvsd->RSP0); ++ response[1] = readw(&mvsd->RSP1); ++ response[2] = readw(&mvsd->RSP2); ++ response[3] = readw(&mvsd->RSP3); ++ response[4] = readw(&mvsd->RSP4); ++ response[5] = readw(&mvsd->RSP5); ++ response[6] = readw(&mvsd->RSP6); ++ response[7] = readw(&mvsd->RSP7); ++ ++ memset(resp, 0, sizeof(resp)); ++ ++ switch (resptype & 0x3) { ++ case SDIO_CMD_RSP_48: ++ case SDIO_CMD_RSP_48BUSY: ++ resp[0] = ((response[2] & 0x3f) << (8 - 8)) | ++ ((response[1] & 0xffff) << (14 - 8)) | ++ ((response[0] & 0x3ff) << (30 - 8)); ++ resp[1] = ((response[0] & 0xfc00) >> 10); ++ break; ++ ++ case SDIO_CMD_RSP_136: ++ resp[3] = ((response[7] & 0x3fff) << 8) | ++ ((response[6] & 0x3ff) << 22); ++ resp[2] = ((response[6] & 0xfc00) >> 10) | ++ ((response[5] & 0xffff) << 6) | ++ ((response[4] & 0x3ff) << 22); ++ resp[1] = ((response[4] & 0xfc00) >> 10) | ++ ((response[3] & 0xffff) << 6) | ++ ((response[2] & 0x3ff) << 22); ++ resp[0] = ((response[2] & 0xfc00) >> 10) | ++ ((response[1] & 0xffff) << 6) | ++ ((response[0] & 0x3ff) << 22); ++ break; ++ default: ++ return 0; ++ } ++ int i; ++ pr_debug("MMC resp :"); ++ for (i=0; i<4; ++i ) { ++ pr_debug(" %08x", (unsigned int)resp[i]); ++ } ++ pr_debug("\n"); ++ if( err ) ++ return NULL ; ++ else ++ return resp; ++} ++ ++/****************************************************/ ++static int mv_mmc_block_read(uchar *dst, ulong src, ulong len) ++/****************************************************/ ++{ ++ ulong *resp; ++ ++ if (len == 0) { ++ return 0; ++ } ++ ++ if (is_sdhc) { ++ /* SDHC: use block address */ ++ src >>= 9; ++ } ++ ++ pr_debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, (int)len); ++ ++ /* prepare for dma transfer */ ++ writew(((ulong)(dst))&0xffff,&mvsd->SYS_ADDR_LOW); ++ writew(((ulong)(dst)>>16)&0xffff,&mvsd->SYS_ADDR_HI); ++ writew(len,&mvsd->BLK_SIZE); ++ writew(1,&mvsd->BLK_COUNT); ++ ++ /* send read command */ ++ resp = mv_mmc_cmd(MMC_CMD_READ_BLOCK, src, 0x10 , ++ SDIO_CMD_RSP_48, SDIO_NOR_XFER_DONE); ++ if (!resp) { ++ pr_debug("mv_mmc_block_read: mmc read block cmd fails\n"); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++/****************************************************/ ++int mv_mmc_read(ulong src, uchar *dst, int size) ++/****************************************************/ ++{ ++ ulong end, part_start, part_end, part_len, aligned_start, aligned_end; ++ ulong mmc_block_size, mmc_block_address; ++ ++ if (size == 0) { ++ return 0; ++ } ++ ++ if (!mmc_ready) { ++ printf("Please initial the MMC first\n"); ++ return -1; ++ } ++ ++ mmc_block_size = MMC_BLOCK_SIZE; ++ mmc_block_address = ~(mmc_block_size - 1); ++ ++ end = src + size; ++ part_start = ~mmc_block_address & src; ++ part_end = ~mmc_block_address & end; ++ aligned_start = mmc_block_address & src; ++ aligned_end = mmc_block_address & end; ++ ++ /* all block aligned accesses */ ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if (part_start) { ++ part_len = mmc_block_size - part_start; ++ pr_debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { ++ return -1; ++ } ++ memcpy(dst, mmc_buf+part_start, part_len); ++ dst += part_len; ++ src += part_len; ++ } ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ for (; src < aligned_end; aligned_start +=mmc_block_size, src += mmc_block_size, dst += mmc_block_size) { ++ pr_debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) { ++ printf("mmc block read error\n"); ++ return -1; ++ } ++ memcpy(dst, mmc_buf, mmc_block_size); ++ } ++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if (part_end && src < end) { ++ pr_debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n", ++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end); ++ ++ if ((mv_mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) { ++ return -1; ++ } ++ memcpy(dst, mmc_buf, part_end); ++ } ++ return 0; ++} ++ ++/****************************************************/ ++static ulong mv_mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst) ++/****************************************************/ ++{ ++ int mmc_block_size = MMC_BLOCK_SIZE; ++ ulong src = blknr * mmc_block_size; ++ ++ mv_mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size); ++ return blkcnt; ++} ++ ++/****************************************************/ ++int mmc_legacy_init(int verbose) ++/****************************************************/ ++{ ++ int retries, rc = -ENODEV; ++ ulong *resp; ++ int sd_ver20; ++ int is_sd; ++ ushort reg; ++ uchar cidbuf[64]; ++ ++ sd_ver20 = 0; ++ is_sdhc = 0; ++ is_sd = 0; ++ ++ /* Initial Host Ctrl : Timeout : max , Normal Speed mode, 4-bit data mode */ ++ /* Big Endian, SD memory Card, Push_pull CMD Line */ ++ writew( SDIO_HOST_CTRL_TMOUT(0xf) | ++ SDIO_HOST_CTRL_DATA_WIDTH_4_BITS | ++ SDIO_HOST_CTRL_BIG_ENDIAN | ++ SDIO_HOST_CTRL_PUSH_PULL_EN | ++ SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY , ++ &mvsd->HOST_CTRL); ++ ++ writew( 0, &mvsd->CLK_CTRL); ++ ++ /* enable status */ ++ writew( 0xffff, &mvsd->NOR_STATUS_EN); ++ writew( 0xffff, &mvsd->ERR_STATUS_EN); ++ ++ /* disable interrupts */ ++ writew( 0, &mvsd->NOR_INTR_EN); ++ writew( 0, &mvsd->ERR_INTR_EN); ++ ++ writew( 0x100, &mvsd->SW_RESET); ++ udelay(10000); ++ ++ mv_mmc_csd.c_size = 0; ++ ++ /* reset */ ++ retries = 10; ++ resp = mv_mmc_cmd(0, 0, 0, SDIO_CMD_RSP_NONE, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 0 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ pr_debug ("trying to detect SD card version\n"); ++ ++ resp = mv_mmc_cmd(8, 0x000001aa, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 8 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ if (resp && (resp[0] & 0x1ff)==0x1aa) { ++ pr_debug ("SD version 2.0 card detected\n"); ++ ++ sd_ver20 = 1; ++ } ++ ++ if (sd_ver20) ++ retries = 50; ++ else ++ retries = 10; ++ ++ while (retries--) { ++ resp = mv_mmc_cmd(55, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 55 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (sd_ver20) ++ resp = mv_mmc_cmd(41, 0x40300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ else ++ resp = mv_mmc_cmd(41, 0x00300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ ++ pr_debug("cmd 41 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp && (resp[0] & 0x80000000)) { ++ pr_debug ("detected SD card\n"); ++ ++ is_sd = 1; ++ break; ++ } ++ ++ udelay(100*1000); ++ } ++ ++ if (retries <= 0 && !is_sd) { ++ pr_debug ("failed to detect SD card, trying MMC\n"); ++ ++ retries = 10; ++ while (retries--) { ++ resp = mv_mmc_cmd(1, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 01 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp && (resp[0] & 0x80000000)) { ++ printf ("detected MMC card\n"); ++ reg = readw(&mvsd->HOST_CTRL); ++ reg &= ~(0x3<<1); ++ reg |= SDIO_HOST_CTRL_CARD_TYPE_IO_MMC; ++ writew( reg, &mvsd->HOST_CTRL); ++ break; ++ } ++ ++ udelay(100*1000); ++ } ++ } ++ ++ if (retries <= 0) { ++ pr_debug ("detect fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ /* try to get card id */ ++ resp = mv_mmc_cmd(2, 0, 0, SDIO_CMD_RSP_136, SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 2 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (resp == NULL) { ++ pr_debug ("read cid fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ if (is_sd) { ++ mv_sd_cid_t *cid = (mv_sd_cid_t *) resp; ++ ++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t)); ++ ++ sprintf((char *) mmc_dev.vendor, ++ "Man %02x OEM %c%c \"%c%c%c%c%c\"", ++ cid->mid, cid->oid_0, cid->oid_1, ++ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4); ++ ++ sprintf((char *) mmc_dev.product, "%d", ++ (cid->psn_0 << 24) | (cid->psn_1 <<16) | (cid->psn_2 << 8) | (cid->psn_3 << 8)); ++ ++ sprintf((char *) mmc_dev.revision, "%d.%d", cid->prv>>4, cid->prv & 0xff); ++ ++ } else { ++ /* TODO configure mmc driver depending on card attributes */ ++ mv_mmc_cid_t *cid = (mv_mmc_cid_t *) resp; ++ ++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t)); ++ ++ ++ sprintf((char *) mmc_dev.vendor, ++ "Man %02x%02x%02x Snr %02x%02x%02x", ++ cid->id[0], cid->id[1], cid->id[2], ++ cid->sn[0], cid->sn[1], cid->sn[2]); ++ sprintf((char *) mmc_dev.product, "%s", cid->name); ++ sprintf((char *) mmc_dev.revision, "%x %x", cid->hwrev, cid->fwrev); ++ } ++ ++ /* fill in device description */ ++ mmc_dev.if_type = IF_TYPE_MMC; ++ mmc_dev.part_type = PART_TYPE_DOS; ++ mmc_dev.dev = 0; ++ mmc_dev.lun = 0; ++ mmc_dev.type = 0; ++ ++ /* FIXME fill in the correct size (is set to 128MByte) */ ++ mmc_dev.blksz = MMC_BLOCK_SIZE; ++ mmc_dev.lba = 0x10000; ++ ++ mmc_dev.removable = 0; ++ mmc_dev.block_read = (unsigned long) mv_mmc_bread; ++ ++ /* MMC exists, get CSD too */ ++ resp = mv_mmc_cmd(MMC_CMD_SET_RCA, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("set rca fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd3 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ if (is_sd) ++ rca = resp[0] >> 16; ++ else ++ rca = 0; ++ ++ resp = mv_mmc_cmd(MMC_CMD_SEND_CSD, rca<<16, 0, SDIO_CMD_RSP_136,SDIO_NOR_CMD_DONE ); ++ pr_debug("cmd 9 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ if (resp == NULL) { ++ pr_debug ("read csd fails\n"); ++ ++ return -ENODEV; ++ } ++ ++ memcpy(&mv_mmc_csd, (mv_mmc_csd_t *) resp, sizeof(mv_mmc_csd_t)); ++ rc = 0; ++ mmc_ready = 1; ++ ++ /* FIXME add verbose printout for csd */ ++ pr_debug ("size = %u\n", mv_mmc_size(&mv_mmc_csd)); ++ ++ ++ resp = mv_mmc_cmd(7, rca<<16, 0, SDIO_CMD_RSP_48BUSY, SDIO_NOR_CMD_DONE); ++ if (resp == NULL) { ++ pr_debug ("select card fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd 7 resp : %08x %08x %08x %08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] ); ++ ++ ++ if (is_sd) { ++ resp = mv_mmc_cmd(55, rca<<16, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("cmd55 fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd55 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ resp = mv_mmc_cmd(6, (rca<<16) | 0x2 , 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (resp == NULL) { ++ pr_debug ("cmd55 fails\n"); ++ ++ return -ENODEV; ++ } ++ pr_debug("cmd6 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ } ++ ++ resp = (ulong *) &mv_mmc_csd; ++ pr_debug("csd: 0x%08x 0x%08x 0x%08x 0x%08x\n", ++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]); ++ ++ ++ /* check SDHC */ ++ if ((resp[0]&0xf0000000)==0x40000000) ++ is_sdhc = 1; ++ ++ /* set block len */ ++ resp = mv_mmc_cmd(MMC_CMD_SET_BLOCKLEN, MMC_BLOCK_SIZE, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE ); ++ if (!resp) { ++ pr_debug("mv_mmc_block_read: set blk len fails\n"); ++ return -ENODEV; ++ } ++ ++ if (verbose) { ++ if (is_sd) ++ print_sd_cid((mv_sd_cid_t *) cidbuf); ++ else ++ print_mmc_cid((mv_mmc_cid_t *) cidbuf); ++ } ++ ++ mvsdio_set_clock(CONFIG_SYS_MMC_CLK_PP); ++ ++ fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */ ++ ++ return 0; ++} ++ ++#endif /* CONFIG_MMC */ +diff --git a/drivers/mmc/mv_sdio.h b/drivers/mmc/mv_sdio.h +new file mode 100644 +index 0000000..9707000 +--- /dev/null ++++ b/drivers/mmc/mv_sdio.h +@@ -0,0 +1,310 @@ ++/* ++ * (C) Copyright 2009 ++ * Marvell Semiconductor ++ * Written-by: Gérald Kerma ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301 USA ++ */ ++ ++#ifndef _MVSDIO_INCLUDE ++#define _MVSDIO_INCLUDE ++ ++//#define SDIO_REG(x) (MV_SDIO_BASE + (x)) ++ ++#define MVSDMMC_DMA_SIZE 65536 ++#define MVSDMMC_CMD_TIMEOUT 2 /* 100 usec*/ ++ ++/* ++ * Clock rates ++ */ ++ ++#define MVSD_CLOCKRATE_MAX 50000000 ++#define MVSD_BASE_DIV_MAX 0x7ff ++ ++#define CONFIG_SYS_MMC_CLK_PP 25000000 ++ ++/* ++ * The base MMC clock rate ++ */ ++ ++#define MVSDMMC_CLOCKRATE_MIN 100000 ++#define MVSDMMC_CLOCKRATE_MAX MVSD_CLOCKRATE_MAX ++#define MVSDMMC_BASE_FAST_CLOCK CONFIG_SYS_TCLK ++ ++ ++/* ++ * SDIO register ++ */ ++#ifndef __ASSEMBLY__ ++ ++/* ++ * Structure for struct SoC access. ++ * Names starting with '_' are fillers. ++ */ ++typedef struct mv_sdio { ++ /* reg Offset */ ++ u32 SYS_ADDR_LOW; /* 0x00 */ ++ u32 SYS_ADDR_HI; /* 0x04 */ ++ u32 BLK_SIZE; /* 0x08 */ ++ u32 BLK_COUNT; /* 0x0c */ ++ u32 ARG_LOW; /* 0x10 */ ++ u32 ARG_HI; /* 0x14 */ ++ u32 XFER_MODE; /* 0x18 */ ++ u32 CMD; /* 0x1c */ ++ u32 RSP0; /* 0x20 */ ++ u32 RSP1; /* 0x24 */ ++ u32 RSP2; /* 0x28 */ ++ u32 RSP3; /* 0x2c */ ++ u32 RSP4; /* 0x30 */ ++ u32 RSP5; /* 0x34 */ ++ u32 RSP6; /* 0x38 */ ++ u32 RSP7; /* 0x3c */ ++ u32 BUF_DATA_PORT; /* 0x40 */ ++ u32 RSVED; /* 0x44 */ ++ u32 PRESENT_STATE0; /* 0x48 */ ++ u32 PRESENT_STATE1; /* 0x4c */ ++ u32 HOST_CTRL; /* 0x50 */ ++ u32 BLK_GAP_CTRL; /* 0x54 */ ++ u32 CLK_CTRL; /* 0x58 */ ++ u32 SW_RESET; /* 0x5c */ ++ u32 NOR_INTR_STATUS; /* 0x60 */ ++ u32 ERR_INTR_STATUS; /* 0x64 */ ++ u32 NOR_STATUS_EN; /* 0x68 */ ++ u32 ERR_STATUS_EN; /* 0x6c */ ++ u32 NOR_INTR_EN; /* 0x70 */ ++ u32 ERR_INTR_EN; /* 0x74 */ ++ u32 AUTOCMD12_ERR_STATUS; /* 0x78 */ ++ u32 CURR_BYTE_LEFT; /* 0x7c */ ++ u32 CURR_BLK_LEFT; /* 0x80 */ ++ u32 AUTOCMD12_ARG_LOW; /* 0x84 */ ++ u32 AUTOCMD12_ARG_HI; /* 0x88 */ ++ u32 AUTOCMD12_INDEX; /* 0x8c */ ++ u32 AUTO_RSP0; /* 0x90 */ ++ u32 AUTO_RSP1; /* 0x94 */ ++ u32 AUTO_RSP2; /* 0x98 */ ++ u32 _9c; /* 0x9c */ ++ u32 _a0[0x78]; /* 0xa0 */ ++ u32 CLK_DIV; /* 0x128 */ ++ ++} mv_sdio_t; ++ ++#endif /* __ASSEMBLY__ */ ++ ++/* ++ * SDIO_PRESENT_STATE ++ */ ++ ++#define CARD_BUSY (1 << 1) ++#define CMD_INHIBIT (1 << 0) ++#define CMD_TXACTIVE (1 << 8) ++#define CMD_RXACTIVE (1 << 9) ++#define CMD_AUTOCMD12ACTIVE (1 << 14) ++ ++#define CMD_BUS_BUSY (CMD_AUTOCMD12ACTIVE| \ ++ CMD_RXACTIVE| \ ++ CMD_TXACTIVE| \ ++ CMD_INHIBIT| \ ++ CARD_BUSY) ++ ++/* ++ * SDIO_CMD ++ */ ++ ++#define SDIO_CMD_RSP_NONE (0 << 0) ++#define SDIO_CMD_RSP_136 (1 << 0) ++#define SDIO_CMD_RSP_48 (2 << 0) ++#define SDIO_CMD_RSP_48BUSY (3 << 0) ++ ++#define SDIO_CMD_CHECK_DATACRC16 (1 << 2) ++#define SDIO_CMD_CHECK_CMDCRC (1 << 3) ++#define SDIO_CMD_INDX_CHECK (1 << 4) ++#define SDIO_CMD_DATA_PRESENT (1 << 5) ++#define SDIO_UNEXPECTED_RESP (1 << 7) ++ ++ ++/* ++ * SDIO_XFER_MODE ++ */ ++ ++#define SDIO_XFER_MODE_STOP_CLK (1 << 5) ++#define SDIO_XFER_MODE_HW_WR_DATA_EN (1 << 1) ++#define SDIO_XFER_MODE_AUTO_CMD12 (1 << 2) ++#define SDIO_XFER_MODE_INT_CHK_EN (1 << 3) ++#define SDIO_XFER_MODE_TO_HOST (1 << 4) ++ ++ ++/* ++ * SDIO_HOST_CTRL ++ */ ++ ++#define SDIO_HOST_CTRL_PUSH_PULL_EN (1 << 0) ++ ++#define SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY (0 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_ONLY (1 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MEM_COMBO (2 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MMC (3 << 1) ++#define SDIO_HOST_CTRL_CARD_TYPE_MASK (3 << 1) ++ ++#define SDIO_HOST_CTRL_BIG_ENDIAN (1 << 3) ++#define SDIO_HOST_CTRL_LSB_FIRST (1 << 4) ++#define SDIO_HOST_CTRL_ID_MODE_LOW_FREQ (1 << 5) ++#define SDIO_HOST_CTRL_HALF_SPEED (1 << 6) ++#define SDIO_HOST_CTRL_DATA_WIDTH_4_BITS (1 << 9) ++#define SDIO_HOST_CTRL_HI_SPEED_EN (1 << 10) ++ ++ ++#define SDIO_HOST_CTRL_TMOUT_MASK (0xf << 11) ++#define SDIO_HOST_CTRL_TMOUT_MAX (0xf << 11) ++#define SDIO_HOST_CTRL_TMOUT(x) ((x) << 11) ++#define SDIO_HOST_CTRL_TMOUT_EN (1 << 15) ++ ++#define SDIO_HOST_CTRL_DFAULT_OPEN_DRAIN \ ++ (SDIO_HOST_CTRL_TMOUT(x)(0xf)) ++#define SDIO_HOST_CTRL_DFAULT_PUSH_PULL \ ++ (SDIO_HOST_CTRL_TMOUT(x)(0xf) | SDIO_HOST_CTRL_PUSH_PULL_EN) ++ ++ ++/* ++ * NOR status bits ++ */ ++ ++#define SDIO_NOR_ERROR (1 << 15) ++#define SDIO_NOR_UNEXP_RSP (1 << 14) ++#define SDIO_NOR_AUTOCMD12_DONE (1 << 13) ++#define SDIO_NOR_SUSPEND_ON (1 << 12) ++#define SDIO_NOR_LMB_FF_8W_AVAIL (1 << 11) ++#define SDIO_NOR_LMB_FF_8W_FILLED (1 << 10) ++#define SDIO_NOR_READ_WAIT_ON (1 << 9) ++#define SDIO_NOR_CARD_INT (1 << 8) ++#define SDIO_NOR_READ_READY (1 << 5) ++#define SDIO_NOR_WRITE_READY (1 << 4) ++#define SDIO_NOR_DMA_INI (1 << 3) ++#define SDIO_NOR_BLK_GAP_EVT (1 << 2) ++#define SDIO_NOR_XFER_DONE (1 << 1) ++#define SDIO_NOR_CMD_DONE (1 << 0) ++ ++ ++/* ++ * ERR status bits ++ */ ++ ++#define SDIO_ERR_CRC_STATUS (1 << 14) ++#define SDIO_ERR_CRC_STARTBIT (1 << 13) ++#define SDIO_ERR_CRC_ENDBIT (1 << 12) ++#define SDIO_ERR_RESP_TBIT (1 << 11) ++#define SDIO_ERR_SIZE (1 << 10) ++#define SDIO_ERR_CMD_STARTBIT (1 << 9) ++#define SDIO_ERR_AUTOCMD12 (1 << 8) ++#define SDIO_ERR_DATA_ENDBIT (1 << 6) ++#define SDIO_ERR_DATA_CRC (1 << 5) ++#define SDIO_ERR_DATA_TIMEOUT (1 << 4) ++#define SDIO_ERR_CMD_INDEX (1 << 3) ++#define SDIO_ERR_CMD_ENDBIT (1 << 2) ++#define SDIO_ERR_CMD_CRC (1 << 1) ++#define SDIO_ERR_CMD_TIMEOUT (1 << 0) ++ ++#define SDIO_ERR_INTR_MASK 0xFFFF ++ ++ ++#define MMC_BLOCK_SIZE 512 ++#define MMC_CMD_RESET 0 ++#define MMC_CMD_SEND_OP_COND 1 ++#define MMC_CMD_ALL_SEND_CID 2 ++#define MMC_CMD_SET_RCA 3 ++#define MMC_CMD_SELECT_CARD 7 ++#define MMC_CMD_SEND_CSD 9 ++#define MMC_CMD_SEND_CID 10 ++#define MMC_CMD_SEND_STATUS 13 ++#define MMC_CMD_SET_BLOCKLEN 16 ++#define MMC_CMD_READ_BLOCK 17 ++#define MMC_CMD_RD_BLK_MULTI 18 ++#define MMC_CMD_WRITE_BLOCK 24 ++#define MMC_MAX_BLOCK_SIZE 512 ++ ++typedef struct mv_mmc_cid ++{ ++ /* FIXME: BYTE_ORDER */ ++ uchar year:4, ++ month:4; ++ uchar sn[3]; ++ uchar fwrev:4, ++ hwrev:4; ++ uchar name[6]; ++ uchar id[3]; ++} mv_mmc_cid_t; ++ ++typedef struct mv_mmc_csd ++{ ++ uchar ecc:2, ++ file_format:2, ++ tmp_write_protect:1, ++ perm_write_protect:1, ++ copy:1, ++ file_format_grp:1; ++ uint64_t content_prot_app:1, ++ rsvd3:4, ++ write_bl_partial:1, ++ write_bl_len:4, ++ r2w_factor:3, ++ default_ecc:2, ++ wp_grp_enable:1, ++ wp_grp_size:5, ++ erase_grp_mult:5, ++ erase_grp_size:5, ++ c_size_mult1:3, ++ vdd_w_curr_max:3, ++ vdd_w_curr_min:3, ++ vdd_r_curr_max:3, ++ vdd_r_curr_min:3, ++ c_size:12, ++ rsvd2:2, ++ dsr_imp:1, ++ read_blk_misalign:1, ++ write_blk_misalign:1, ++ read_bl_partial:1; ++ ushort read_bl_len:4, ++ ccc:12; ++ uchar tran_speed; ++ uchar nsac; ++ uchar taac; ++ uchar rsvd1:2, ++ spec_vers:4, ++ csd_structure:2; ++} mv_mmc_csd_t; ++ ++typedef struct { ++ char pnm_0; /* product name */ ++ char oid_1; /* OEM/application ID */ ++ char oid_0; ++ uint8_t mid; /* manufacturer ID */ ++ char pnm_4; ++ char pnm_3; ++ char pnm_2; ++ char pnm_1; ++ uint8_t psn_2; /* product serial number */ ++ uint8_t psn_1; ++ uint8_t psn_0; /* MSB */ ++ uint8_t prv; /* product revision */ ++ uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */ ++ uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */ ++ uint8_t mdt_0; /* MSB */ ++ uint8_t psn_3; /* LSB */ ++} mv_sd_cid_t; ++ ++#endif /* _MVSDIO_INCLUDE */ +diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h +index 83dd8ff..7c8497c 100644 +--- a/include/configs/sheevaplug.h ++++ b/include/configs/sheevaplug.h +@@ -1,3 +1,4 @@ ++ + /* + * (C) Copyright 2009 + * Marvell Semiconductor +@@ -47,7 +48,9 @@ + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_ENV + #define CONFIG_CMD_MII ++#define CONFIG_CMD_MMC + #define CONFIG_CMD_NAND ++#define CONFIG_JFFS2_NAND + #define CONFIG_CMD_PING + #define CONFIG_CMD_USB + /* +@@ -70,8 +73,8 @@ + * it has to be rounded to sector size + */ + #define CONFIG_ENV_SIZE 0x20000 /* 128k */ +-#define CONFIG_ENV_ADDR 0x60000 +-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ ++#define CONFIG_ENV_ADDR 0xa0000 ++#define CONFIG_ENV_OFFSET 0xa0000 /* env starts here */ + + /* + * Default environment variables +@@ -81,10 +84,11 @@ + "${x_bootcmd_usb}; bootm 0x6400000;" + + #define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ +- "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" ++ "0x1ff00000@512k(rootfs) rw\0" + + #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ + "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ ++ "mtdids=nand0=orion_nand\0" \ + "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ + "x_bootcmd_usb=usb start\0" \ + "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" From dd3c83a5ffd18b38a504dbb008da6a34091f2e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 27 Jan 2013 15:37:44 +0100 Subject: [PATCH 110/221] Updating perl packages NetSSLeay and IOSocketSSL. Upstream removed the old versions --- 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 9f8a219e0cb..954521472a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2460,10 +2460,10 @@ rec { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-1.77"; + name = "IO-Socket-SSL-1.81"; src = fetchurl { url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "2a090167a0d13cdefdac7fb25ca49decd5fd925f37d032bca98c73c4856570a9"; + sha256 = "1vg7jpn7vz3a2j3fxjjkaxiiqg7azqmy7afrpghiqkjcr8b6zs9y"; }; propagatedBuildInputs = [ URI NetSSLeay ]; }; @@ -3524,10 +3524,10 @@ rec { }; NetSSLeay = buildPerlPackage rec { - name = "Net-SSLeay-1.42"; + name = "Net-SSLeay-1.52"; src = fetchurl { url = "mirror://cpan/modules/by-module/Net/${name}.tar.gz"; - sha256 = "17gxf0d1l0qlxn0d6gqz1dlzl6cdqv0jg47k0h1fcs45rlcpgjmn"; + sha256 = "1fkpdlpg99rdq2vlm6bgmqc8iazhcrfzvbpwxnn20k0viwpy7v28"; }; buildInputs = [ pkgs.openssl ]; OPENSSL_PREFIX = pkgs.openssl; From 8ade26c373f3308dea9accf589f3c6216e67ee0e Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 27 Jan 2013 20:21:49 +0100 Subject: [PATCH 111/221] pull screenrc configuration from /etc/screenrc --- pkgs/tools/misc/screen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 930cd67bb13..2a525676192 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; From 9ac6c53cbf5b146f0e89fceb649cef1cb13b97f5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 27 Jan 2013 18:36:54 -0500 Subject: [PATCH 112/221] lib.licenses.proprietary is definitely unfree --- 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 1a2d8ecf747..3106beed1c5 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 && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then + if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable" || l == lib.licenses.proprietary) then throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" else (derivation ( From 6ce14a6729ab8a7191fedb0a184613220b600e54 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 27 Jan 2013 20:38:32 -0500 Subject: [PATCH 113/221] leiningen: Update to 2.0.0. Patch thanks to Patrick Lee. --- .../tools/build-managers/leiningen/builder.sh | 2 +- .../build-managers/leiningen/default.nix | 21 ++++----- .../leiningen/lein-rlwrap.patch | 45 ------------------- .../tools/build-managers/leiningen/lein.patch | 35 --------------- .../build-managers/leiningen/lein_2.0.0.patch | 4 ++ 5 files changed, 13 insertions(+), 94 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch delete mode 100644 pkgs/development/tools/build-managers/leiningen/lein.patch create mode 100644 pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index df7ace8e4f3..c4b7002a718 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -10,7 +10,7 @@ out_bin=$out/bin/lein cp -v $src $out_bin cp -v $jarsrc $out/lib -cp -v $clojuresrc $out/lib +cp -v $clojure/lib/java/* $out/lib for p in $patches; do diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index e5a20b46046..35c340ae0f9 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,34 +1,29 @@ -{stdenv, fetchurl, makeWrapper, openjdk, rlwrap}: +{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }: stdenv.mkDerivation rec { pname = "leiningen"; - version = "1.7.1"; + version = "2.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "7684b899edd6004abafd8e26d2b43d5691217f1aaca535fb94bde1594c8129a5"; + sha256 = "0malymlswxwgh8amkw37qjb8n34ylw3chgbdxgxkq34rkvhv60hb"; }; jarsrc = fetchurl { - url = "https://github.com/downloads/technomancy/leiningen/leiningen-${version}-standalone.jar"; - sha256 = "5d167b7572b9652d44c2b58a13829704842d976fd2236530ef552194e6c12150"; + url = "https://leiningen.s3.amazonaws.com/downloads/leiningen-2.0.0-standalone.jar"; + sha256 = "10jvk19mr5dcl5a9kzna9zslh77v3ixi8awhrhxi30dn1yj3r7ck"; }; - clojuresrc = fetchurl { - url = "http://build.clojure.org/releases/org/clojure/clojure/1.2.1/clojure-1.2.1.jar"; - sha256 = "b38853254a2df9138b2e2c12be0dca3600fa7e2a951fed05fc3ba2d9141a3fb0"; - }; + patches = ./lein_2.0.0.patch; - patches = [ ./lein-rlwrap.patch ./lein.patch ]; - - inherit rlwrap; + inherit rlwrap clojure; builder = ./builder.sh; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ openjdk ]; + propagatedBuildInputs = [ openjdk clojure ]; meta = { homepage = https://github.com/technomancy/leiningen; diff --git a/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch b/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch deleted file mode 100644 index 208199f355d..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein-rlwrap.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f14307932a316952fae8517c0fcb0962cd204e9a Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Fri, 4 May 2012 10:56:38 +0700 -Subject: [PATCH] lein-pkg: require rlwrap unconditionally, unless run inside - Emacs or a dumb terminal; chmod to 755 as this is an - executable script - ---- - bin/lein-pkg | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - mode change 100644 => 100755 bin/lein-pkg - -diff --git a/bin/lein-pkg b/bin/lein-pkg -old mode 100644 -new mode 100755 -index 8563da6..1b90ebe ---- lein-pkg.orig -+++ lein-pkg -@@ -3,6 +3,11 @@ - # This variant of the lein script is meant for downstream packagers. - # It has all the cross-platform stuff stripped out as well as the - # logic for running from checkouts and self-upgrading. -+# -+# Note to packagers: -+# rlwrap is now required unless running inside Emacs or in a dumb -+# terminal (this is to improve the 'lein repl' experience). -+# Make sure that your packaging pulls in rlwrap as a dependency - - export LEIN_VERSION="1.7.1" - -@@ -103,10 +108,7 @@ fi - - # Use rlwrap if appropriate - if ([ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]); then -- which rlwrap > /dev/null -- if [ $? -eq 0 ]; then -- RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars -- fi -+ RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars - RLWRAP_CLJ_WORDS_FILE=${RLWRAP_CLJ_WORDS_FILE:-"${HOME}/.clj_completions"} - RLWRAP_CLJ_WORDS_OPTION="" - if [ -r "${RLWRAP_CLJ_WORDS_FILE}" ]; then --- -1.7.9.5 - diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch deleted file mode 100644 index b62701e2519..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- lein-pkg 2012-05-04 11:02:41.524912828 +0700 -+++ lein-pkg-nix 2012-05-04 11:03:11.062543558 +0700 -@@ -76,30 +76,14 @@ - LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)" - LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)" - CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/" --CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar" -+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar" - - # apply context specific CLASSPATH entries - if [ -f .lein-classpath ]; then - CLASSPATH="`cat .lein-classpath`:$CLASSPATH" - fi - --SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \ --lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \ --maven-error-diagnostics maven-model maven-settings maven-project maven-profile \ --maven-repository-metadata plexus-container-default-alpha plexus-interpolation \ --plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \ --xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \ --backport-util-concurrent" # NFI why that last one is necessary --for JAR in $SHARE_JARS; do -- CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar" --done -- --# Do not use installed leiningen jar during self-compilation --if ! { [ "$1" = "compile" ] && -- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \ -- project.clj ;}; then -- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar --fi -+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*" - - if [ $DEBUG ]; then - echo $CLASSPATH diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch new file mode 100644 index 00000000000..23f6b624776 --- /dev/null +++ b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch @@ -0,0 +1,4 @@ +46c47 +< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar +--- +> LEIN_JAR=$(find $(dirname $0)/../lib -name *-standalone.jar | head -n 1) From 3b34b3610ef3d811cd03f937de366685160f68d5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 27 Jan 2013 20:43:38 -0500 Subject: [PATCH 114/221] Add clojureUnstable (clojure 1.5.0-RC1). Patch thanks to Patrick Lee. --- pkgs/development/interpreters/clojure/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6c20ca71406..dbbe4a9dcc3 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,17 +1,22 @@ -{stdenv, fetchurl, unzip, ant}: +{stdenv, fetchurl, unzip, ant, version ? "1.4.0" }: -stdenv.mkDerivation rec { - version = "1.4.0"; +let + src_hashes = { + "1.4.0" = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; + "1.5.0-RC1" = "111jm0nxkvqr1vrwcpvr70v5paasp8msrj5h8zm1c144c8zc1vln"; + }; +in +stdenv.mkDerivation { name = "clojure-${version}"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171"; + sha256 = (builtins.getAttr version src_hashes); }; buildInputs = [ unzip ant ]; - buildPhase = "ant"; + buildPhase = "ant jar"; installPhase = " mkdir -p $out/lib/java diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b7610f0313..4fda63dc035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2762,6 +2762,8 @@ let clojure = callPackage ../development/interpreters/clojure { }; + clojureUnstable = callPackage ../development/interpreters/clojure { version = "1.5.0-RC1"; }; + clojure_binary = callPackage ../development/interpreters/clojure/binary.nix { }; clojure_wrapper = callPackage ../development/interpreters/clojure/wrapper.nix { From 4534699938f3bf84c90acd8d94e823c6799dcec0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 28 Jan 2013 02:48:57 +0100 Subject: [PATCH 115/221] add alsa oss emulation --- pkgs/os-specific/linux/alsa-oss/default.nix | 33 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-oss/default.nix diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix new file mode 100644 index 00000000000..c76ee8d9298 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: + +stdenv.mkDerivation rec { + name = "alsa-oss-1.0.25"; + + src = fetchurl { + url = "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"; + # url = "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"; + sha256 = "ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3"; + }; + + buildInputs = [ alsaLib ncurses libsamplerate ]; + buildNativeInputs = [ gettext ]; + + configureFlags = "--disable-xmlto"; + + installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + + preConfigure = + '' + ''; + + meta = { + description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + homepage = http://www.alsa-project.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fda63dc035..744ea8a353b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5666,6 +5666,7 @@ let alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; alsaUtils = callPackage ../os-specific/linux/alsa-utils { }; + alsaOss = callPackage ../os-specific/linux/alsa-oss { }; microcode2ucode = callPackage ../os-specific/linux/microcode/converter.nix { }; From d596180cf8a7be4f208d746a253abfc598b218ea Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 28 Jan 2013 02:58:47 +0100 Subject: [PATCH 116/221] use alsa-oss layer for minecraft --- 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 a72223543aa..1f80998da92 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm -, mesa, openal}: +, mesa, openal, alsaOss }: stdenv.mkDerivation { name = "minecraft-1.4.7"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { # wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ - ${jre}/bin/java -jar $out/minecraft.jar + ${alsaOss}/bin/aoss ${jre}/bin/java -jar $out/minecraft.jar EOF chmod +x $out/bin/minecraft From 9f7cc1bfb31942eec200d4a3c4bcea58bac735af Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Mon, 28 Jan 2013 11:35:03 +0800 Subject: [PATCH 117/221] add fcitx-4.2.7 --- pkgs/tools/inputmethods/fcitx/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/inputmethods/fcitx/default.nix diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix new file mode 100644 index 00000000000..ac60cd6134f --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext +, libxml2, enchant, isocodes, icu, libpthreadstubs +, pango, cairo, libxkbfile, xorg +}: + +stdenv.mkDerivation rec { + name = "fcitx-4.2.7"; + src = fetchurl { + url = "https://fcitx.googlecode.com/files/${name}_dict.tar.xz"; + sha256 = "1dfvr77j9vnlg76155clrjxnm59r5fzv0d3n6c6yn10zb0bjd40c"; + }; + + buildInputs = [ + cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile + intltool cairo icu libpthreadstubs xorg.libXau xorg.libXdmcp + ]; + + cmakeFlags = '' + -DENABLE_DBUS=OFF + -DENABLE_QT=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_OPENCC=OFF + -DENABLE_PRESAGE=OFF + -DENABLE_XDGAUTOSTART=OFF + ''; + + meta = { + homepage = "https://code.google.com/p/fcitx/"; + description = "A Flexible Input Method Framework"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 744ea8a353b..eb75a5f10b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -724,6 +724,8 @@ let fakeroot = callPackage ../tools/system/fakeroot { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; + fcron = callPackage ../tools/system/fcron { }; fdisk = callPackage ../tools/system/fdisk { }; From 4bf80b462df88bd738c7e5ea1e5189b1a2ba595e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 28 Jan 2013 00:12:24 -0500 Subject: [PATCH 118/221] Linux 3.4.28 --- 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 33648c3d035..6046e3b65fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -241,7 +241,7 @@ in import ./generic.nix ( rec { - version = "3.4.26"; + version = "3.4.28"; testing = false; preConfigure = '' @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1zmv1g90fgqrabc0qb5ip551mh12ps1zin3hbygysc89j684rbk1"; + sha256 = "11b8nip1szm2c4wnpz2plv9icny33i377wd8jk9qbib08wwcf87i"; }; config = configWithPlatform stdenv.platform; From 2afdaf0e826488b9373255cbdeca4d84449729a5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 28 Jan 2013 00:12:35 -0500 Subject: [PATCH 119/221] Linux 3.7.5 --- 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 41926fd181a..86c2223b77c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -247,7 +247,7 @@ in import ./generic.nix ( rec { - version = "3.7.3"; + version = "3.7.5"; testing = false; preConfigure = '' @@ -256,7 +256,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "05421g78kx01ia0pq3d3y3gkrzqb5grfhhy7vy1ixlq8a23kc6b7"; + sha256 = "1x8wpc33h3xib3c98icpw8b652lqdqcw0sal0fky4wrb7v22kshd"; }; config = configWithPlatform stdenv.platform; From 19665a7483eb96c518f766604632d49b785cc13a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 11:59:28 +0100 Subject: [PATCH 120/221] Add meta attributes --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 954521472a5..0523b998f84 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2466,6 +2466,10 @@ rec { sha256 = "1vg7jpn7vz3a2j3fxjjkaxiiqg7azqmy7afrpghiqkjcr8b6zs9y"; }; propagatedBuildInputs = [ URI NetSSLeay ]; + meta = { + description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; + license = "perl"; + }; }; IOString = buildPerlPackage rec { @@ -3532,6 +3536,10 @@ rec { buildInputs = [ pkgs.openssl ]; OPENSSL_PREFIX = pkgs.openssl; doCheck = false; # Test performs network access. + meta = { + description = "Perl extension for using OpenSSL"; + license = "SSLeay"; + }; }; NetTwitterLite = buildPerlPackage { From 201f64b20a8c786ea280817b4a3ef4c0e235eaa7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 11:59:49 +0100 Subject: [PATCH 121/221] Remove dots at end of meta.description --- 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 0523b998f84..7e80f23a19f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1479,7 +1479,7 @@ rec { 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."; + description = "Extensible and flexible object <-> relational mapper"; license = "perl"; }; }; @@ -2643,7 +2643,7 @@ rec { }; buildInputs = [ JSON ]; meta = { - description = "Wrapper Class for the various JSON classes."; + description = "Wrapper Class for the various JSON classes"; license = "perl"; }; }; @@ -2655,7 +2655,7 @@ rec { sha256 = "1lv9riws9f72gya2fsp5jvbd1fbzyi8423x38a491ryy9cai2ph3"; }; meta = { - description = "JSON::XS compatible pure-Perl module."; + description = "JSON::XS compatible pure-Perl module"; license = "perl"; }; }; @@ -2720,7 +2720,7 @@ rec { }; propagatedBuildInputs = [ HTMLParser HTMLTagset LinguaStem /* MemoizeExpireLRU */ ]; meta = { - description = "Part-of-speech tagger for English natural language processing."; + description = "Part-of-speech tagger for English natural language processing"; license = "gpl_3"; }; }; From 427b8cacf3280ac2651839a0aa031792fd85aa03 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 12:11:32 +0100 Subject: [PATCH 122/221] Add very hacky script to generate Perl packages Given the name of Perl module, this script will download the package containing the module from CPAN, determine its dependencies, and print a Nix expression suitable for inclusion in perl-packages.nix on stdout. Example: $ ./maintainers/scripts/generate-cpan-package DBIx::Class DBIxClass = buildPerlPackage { name = "DBIx-Class-0.08205"; src = fetchurl { url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-0.08205.tar.gz; sha256 = "16iyrfvwf4y94wxpwlla131grdf10z4xx9q9s6jsi39ycaxdaj6l"; }; buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract SubName TryTiny ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper."; license = "perl"; }; }; --- maintainers/scripts/generate-cpan-package | 122 ++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100755 maintainers/scripts/generate-cpan-package diff --git a/maintainers/scripts/generate-cpan-package b/maintainers/scripts/generate-cpan-package new file mode 100755 index 00000000000..f091625b6ce --- /dev/null +++ b/maintainers/scripts/generate-cpan-package @@ -0,0 +1,122 @@ +#! /bin/sh -e + +export PERL5LIB=/nix/var/nix/profiles/per-user/eelco/cpan-generator/lib/perl5/site_perl + +name="$1" +[ -n "$name" ] || { echo "no name"; exit 1; } + +cpan -D "$name" > cpan-info + +url="$(echo $(cat cpan-info | sed '6!d'))" +[ -n "$url" ] || { echo "no URL"; exit 1; } +url="mirror://cpan/authors/id/$url" +echo "URL = $url" >&2 + +version=$(cat cpan-info | grep 'CPAN: ' | awk '{ print $2 }') +echo "VERSION = $version" + +declare -a xs=($(PRINT_PATH=1 nix-prefetch-url "$url")) +hash=${xs[0]} +path=${xs[1]} +echo "HASH = $hash" >&2 + +namedash="$(echo $name | sed s/::/-/g)-$version" + +attr=$(echo $name | sed s/:://g) + +rm -rf cpan_tmp +mkdir cpan_tmp +tar xf "$path" -C cpan_tmp + +shopt -s nullglob +meta=$(echo cpan_tmp/*/META.json) +if [ -z "$meta" ]; then + yaml=$(echo cpan_tmp/*/META.yml) + [ -n "$yaml" ] || { echo "no meta file"; exit 1; } + meta=$(echo $yaml | sed s/\.yml$/.json/) + perl -e ' + use YAML; + use JSON; + local $/; + $x = YAML::Load(<>); + print encode_json $x; + ' < $yaml > $meta +fi + +description="$(json abstract < $meta | perl -e '$x = <>; print uc(substr($x, 0, 1)), substr($x, 1);')" +homepage="$(json resources.homepage < $meta)" +if [ -z "$homepage" ]; then + #homepage="$(json meta-spec.url < $meta)" + true +fi + +license="$(json license < $meta | json -a 2> /dev/null || true)" +if [ -z "$license" ]; then + license="$(json -a license < $meta)" +fi +license="$(echo $license | sed s/perl_5/perl5/)" + +f() { + local type="$1" + perl -e ' + use JSON; + local $/; + $x = decode_json <>; + if (defined $x->{prereqs}) { + $x2 = $x->{prereqs}->{'$type'}->{requires}; + } elsif ("'$type'" eq "runtime") { + $x2 = $x->{requires}; + } elsif ("'$type'" eq "configure") { + $x2 = $x->{configure_requires}; + } elsif ("'$type'" eq "build") { + $x2 = $x->{build_requires}; + } + foreach my $y (keys %{$x2}) { + next if $y eq "perl"; + eval "use $y;"; + if (!$@) { + print STDERR "skipping Perl-builtin module $y\n"; + next; + } + print $y, "\n"; + }; + ' < $meta | sed s/:://g +} + +confdeps=$(f configure) +builddeps=$(f build) +testdeps=$(f test) +runtimedeps=$(f runtime) + +buildInputs=$(echo $(for i in $confdeps $builddeps $testdeps; do echo $i; done | sort | uniq)) +propagatedBuildInputs=$(echo $(for i in $runtimedeps; do echo $i; done | sort | uniq)) + +echo "===" >&2 + +cat < Date: Mon, 28 Jan 2013 15:07:35 +0100 Subject: [PATCH 123/221] skype: Enable PulseAudio by default I didn't see any 100% CPU problem. --- 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 eb75a5f10b0..0bcab8055f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7798,7 +7798,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug) + usePulseAudio = config.pulseaudio or true; }; st = callPackage ../applications/misc/st { }; From d8f37cdf9a1abe2ff099a6a5d5dd11ba4db8ab9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 15:47:22 +0100 Subject: [PATCH 124/221] gdb: Update to 7.5.1 --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 08fde14eb53..43ec8dec9f5 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.5"; + basename = "gdb-7.5.1"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - md5 = "24a6779a9fe0260667710de1b082ef61"; + sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7"; }; # I think python is not a native input, but I leave it From ecee1be7f12a48bccdd2c6b362371be16ea56384 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 16:31:23 +0100 Subject: [PATCH 125/221] RealPlayer: Remove This package hasn't built in ages, is unfree, and is not needed anymore. --- pkgs/applications/video/RealPlayer/builder.sh | 20 ------------------- .../applications/video/RealPlayer/default.nix | 19 ------------------ pkgs/top-level/all-packages.nix | 6 ------ pkgs/top-level/release-python.nix | 1 - 4 files changed, 46 deletions(-) delete mode 100644 pkgs/applications/video/RealPlayer/builder.sh delete mode 100644 pkgs/applications/video/RealPlayer/default.nix diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh deleted file mode 100644 index 9929634921c..00000000000 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source $stdenv/setup -source $makeWrapper - -mkdir -p $out/real - -skip=143273 # Look for "BZh91" in the executable. - -(dd bs=1 count=$skip of=/dev/null && dd) < $src | (cd $out/real && tar xvfj -) - -rm -rf $out/real/Bin $out/real/postinst - -patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin - -mkdir -p $out/bin -makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ - --set HELIX_LIBS "$out/real" \ - --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" - -#echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path # !!! must be updated, use patchelf --rpath -echo "$out/bin" > $out/real/mozilla/extra-bin-path diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix deleted file mode 100644 index 968846f1dcb..00000000000 --- a/pkgs/applications/video/RealPlayer/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}: - -# Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4. - -assert stdenv.system == "i686-linux"; - -(stdenv.mkDerivation { - name = "RealPlayer-10.0.8.805-GOLD"; - - builder = ./builder.sh; - src = fetchurl { - url = http://software-dl.real.com/25ae61d70a6855a52c14/unix/RealPlayer10GOLD.bin; - md5 = "d28b31261059231a3e93c7466f8153e6"; - }; - - inherit libstdcpp5 makeWrapper; - libPath = [libstdcpp5 glib pango atk gtk libX11]; - -}) // {mozillaPlugin = "/real/mozilla";} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bcab8055f2..f78b3d8669e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7753,10 +7753,6 @@ let rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - RealPlayer = callPackage_i686 ../applications/video/RealPlayer { - libstdcpp5 = gcc33.gcc; - }; - recode = callPackage ../tools/text/recode { }; retroshare = callPackage ../applications/networking/p2p/retroshare { @@ -8080,8 +8076,6 @@ let ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer - # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && cfg.enableRealPlayer or false) RealPlayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index e21b4fa5964..e683a5c5c3a 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1525,7 +1525,6 @@ in 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; }; From bb7a5a1a9e5355028efa4ed80204d028be6281ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 18:00:11 +0100 Subject: [PATCH 126/221] ledger-2.6.3: update location of the source code tarball The source code tarball we used to rely on has disappeared. --- pkgs/applications/office/ledger/2.6.3.nix | 40 ++++++++--------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index c1cd4b42a02..603c9ea473e 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -1,40 +1,26 @@ -# Patchelf fails to hard-code the library paths to ledger's -# libamounts.so and libledger-2.6.3 shared objects: -# -# $ ldd ~/.nix-profile/bin/ledger -# linux-vdso.so.1 => (0x00007fff513ff000) -# libamounts.so.0 => not found -# libledger-2.6.3.so => not found -# libstdc++.so.6 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libstdc++.so.6 (0x00007f1f0feee000) -# libpcre.so.0 => /nix/store/kfhy189arpj3wrfzpgw8p9ac4g4hfgca-pcre-8.10/lib/libpcre.so.0 (0x00007f1f0fcd3000) -# libgmp.so.3 => /nix/store/ji6py9m9w2ray1bmpkmgig9llj1i2ggf-gmp-4.3.2/lib/libgmp.so.3 (0x00007f1f0fa7f000) -# libm.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libm.so.6 (0x00007f1f0f7fd000) -# libgcc_s.so.1 => /nix/store/3r8kfi33y3lbrsvlx8vzwm74h8178y35-gcc-4.5.1/lib/../lib64/libgcc_s.so.1 (0x00007f1f0f5e8000) -# libc.so.6 => /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/libc.so.6 (0x00007f1f0f27d000) -# /nix/store/vxycd107wjbhcj720hzkw2px7s7kr724-glibc-2.12.2/lib/ld-linux-x86-64.so.2 (0x00007f1f101ef000) -# -# Fortunately, libtools builds the program with proper paths hard-coded -# alread, so we don't need patchelf. Phew! +{ stdenv, fetchurl, emacs, gmp, pcre, expat, autoconf, automake, libtool, texinfo }: -{stdenv, fetchurl, emacs, gmp, pcre, expat}: - -let - name = "ledger-2.6.3"; -in stdenv.mkDerivation { - inherit name; + name = "ledger-2.6.3"; src = fetchurl { - url = "https://github.com/downloads/jwiegley/ledger/${name}.tar.gz"; - sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; + url = "https://github.com/jwiegley/ledger/archive/v2.6.3.tar.gz"; + sha256 = "0fmawai1fakhvdmjrydxp2pl67vk1c1ff54z28xl2k057ws49hnm"; }; - buildInputs = [ emacs gmp pcre expat ]; + buildInputs = [ emacs gmp pcre expat autoconf automake libtool texinfo ]; + + preConfigure = "autoreconf -vi"; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; - dontPatchELF = true; + doCheck = true; + # Patchelf breaks the hard-coded rpath to ledger's libamounts.so and + # libledger-2.6.3. Fortunately, libtool chooses proper rpaths to begin + # with, so we can just disable patchelf to avoid the issue. + dontPatchELF = true; + meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; From b5ce83d38d3641058ba147c7067839134da60a3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 18:05:54 +0100 Subject: [PATCH 127/221] ledger-2.6.3: update the location of the source code tarball some more I found the original tarball at a different URL. This one doesn't require Autoconf et al to compile. --- pkgs/applications/office/ledger/2.6.3.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 603c9ea473e..ca71ceeca66 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, emacs, gmp, pcre, expat, autoconf, automake, libtool, texinfo }: +{ stdenv, fetchurl, emacs, gmp, pcre, expat }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ledger-2.6.3"; src = fetchurl { - url = "https://github.com/jwiegley/ledger/archive/v2.6.3.tar.gz"; - sha256 = "0fmawai1fakhvdmjrydxp2pl67vk1c1ff54z28xl2k057ws49hnm"; + url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz"; + sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k"; }; - buildInputs = [ emacs gmp pcre expat autoconf automake libtool texinfo ]; - - preConfigure = "autoreconf -vi"; + buildInputs = [ emacs gmp pcre expat ]; configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; doCheck = true; - # Patchelf breaks the hard-coded rpath to ledger's libamounts.so and - # libledger-2.6.3. Fortunately, libtool chooses proper rpaths to begin - # with, so we can just disable patchelf to avoid the issue. + # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and + # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to + # begin with, so we can just disable patchelf to avoid the issue. dontPatchELF = true; meta = { From 6930efd1e592c9cc2915863f0a7122da8362f083 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:04:52 +0100 Subject: [PATCH 128/221] openjade: Use default gcc --- pkgs/tools/text/sgml/openjade/default.nix | 15 ++++++--------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 77532fd216c..fc7ee9f6f06 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,22 +1,19 @@ -{stdenv, fetchurl, opensp, perl}: +{ stdenv, fetchurl, opensp, perl }: -stdenv.mkDerivation { - # OpenJade-1.3.2 requires gcc 3.3 to build. - # The next release is likely to be compatible with newer gccs. - # If so the overrideGCC in top-level/all-packages should be removed. - name = "OpenJade-1.3.2"; +stdenv.mkDerivation rec { + name = "openjade-1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz"; + url = "mirror://sourceforge/openjade/${name}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; - buildInputs = [opensp perl]; + buildInputs = [ opensp perl ]; configureFlags = [ "--enable-spincludedir=${opensp}/include/OpenSP" "--enable-splibdir=${opensp}/lib" - ]; + ]; meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f78b3d8669e..38df8c28fbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1242,10 +1242,7 @@ let opendkim = callPackage ../development/libraries/opendkim { }; - openjade = callPackage ../tools/text/sgml/openjade { - stdenv = overrideGCC stdenv gcc33; - opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; }; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; From f7cc884de4437612e1658aaabd3de2cb4a00ca54 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:19:42 +0100 Subject: [PATCH 129/221] gwt: Remove obsolete version --- pkgs/development/compilers/gwt/2.4.0.nix | 14 +++++---- pkgs/development/compilers/gwt/builder.sh | 31 ------------------- pkgs/development/compilers/gwt/default.nix | 14 --------- .../development/compilers/opencxx/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 -- pkgs/top-level/release-python.nix | 1 - 6 files changed, 9 insertions(+), 56 deletions(-) delete mode 100644 pkgs/development/compilers/gwt/builder.sh delete mode 100644 pkgs/development/compilers/gwt/default.nix diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 000b57946f6..c5c7841d72a 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "gwt-java-2.4.0"; - src = fetchurl { - url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; - sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; + + src = fetchurl { + url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip; + sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88"; }; - buildInputs = [unzip]; + + buildInputs = [ unzip ]; installPhase = '' ensureDir $out @@ -18,4 +20,4 @@ stdenv.mkDerivation { homepage = http://code.google.com/webtoolkit/; description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications."; }; - } +} diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh deleted file mode 100644 index b14a0432ea5..00000000000 --- a/pkgs/development/compilers/gwt/builder.sh +++ /dev/null @@ -1,31 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -mkdir -p $out -cp -av $name $out - -# Create wrapper scripts so that the GWT compiler/host work - -libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" - -mkdir -p $out/bin - -cat > $out/bin/gwt-compile < $out/bin/gwt-shell < Date: Mon, 28 Jan 2013 18:21:16 +0100 Subject: [PATCH 130/221] modutils: Remove This package is long obsolete. --- pkgs/os-specific/linux/modutils/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 14 deletions(-) delete mode 100644 pkgs/os-specific/linux/modutils/default.nix diff --git a/pkgs/os-specific/linux/modutils/default.nix b/pkgs/os-specific/linux/modutils/default.nix deleted file mode 100644 index 3a063408a2f..00000000000 --- a/pkgs/os-specific/linux/modutils/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation { - name = "modutils-2.4.27"; - src = fetchurl { - url = mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2; - md5 = "bac989c74ed10f3bf86177fc5b4b89b6"; - }; - buildInputs = [bison flex]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f617914c404..ea7173d692a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6200,10 +6200,6 @@ let inherit stdenv module_init_tools modules buildEnv; }; - modutils = callPackage ../os-specific/linux/modutils { - stdenv = overrideGCC stdenv gcc34; - }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; nettools = callPackage ../os-specific/linux/net-tools { }; From 424d695cd8755fe358cb2029f51c57109a3dacc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:25:10 +0100 Subject: [PATCH 131/221] xfig: Use the default gcc --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea7173d692a..fec9eab34a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8114,9 +8114,7 @@ let xfe = callPackage ../applications/misc/xfe { }; - xfig = callPackage ../applications/graphics/xfig { - stdenv = overrideGCC stdenv gcc34; - }; + xfig = callPackage ../applications/graphics/xfig { }; xineUI = callPackage ../applications/video/xine-ui { }; From 8cc94dc6525983a0f670417e93425066c2123c5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 18:27:49 +0100 Subject: [PATCH 132/221] ov511: Remove This is very obsolete (last updated for Linux 2.6.0-test4). --- pkgs/os-specific/linux/ov511/default.nix | 1 - .../linux/ov511/ov511-2.30-builder.sh | 18 --------- .../linux/ov511/ov511-2.30-default.nix | 13 ------- .../linux/ov511/ov511-2.32-kdir.patch | 20 ---------- .../linux/ov511/ov511-kernel.patch | 39 ------------------- pkgs/top-level/all-packages.nix | 4 -- pkgs/top-level/release-python.nix | 1 - 7 files changed, 96 deletions(-) delete mode 100644 pkgs/os-specific/linux/ov511/default.nix delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.30-default.nix delete mode 100644 pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch delete mode 100644 pkgs/os-specific/linux/ov511/ov511-kernel.patch diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix deleted file mode 100644 index 628261e6c5f..00000000000 --- a/pkgs/os-specific/linux/ov511/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./ov511-2.30-default.nix diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh deleted file mode 100644 index 21a2ac725ca..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -source $stdenv/setup - -hashname=$(basename $kernel) -echo $hashname -if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then - hashname=$(echo "$hashname" | cut -c -32) -fi - -stripHash $kernel -version=$(echo $strippedName | cut -c 7-)-$hashname - -echo "version $version" - -export version - -mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ - -genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix deleted file mode 100644 index ec9cda0e4d1..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, kernel}: - -stdenv.mkDerivation { - name = "ov511-2.30-${kernel.version}"; - builder = ./ov511-2.30-builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/ov511-2.30.tar.bz2; - md5 = "9eacf9e54f2f54a59ddbf14221a53f2a"; - }; - patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch]; - inherit kernel; - NIX_GLIBC_FLAGS_SET=1; -} diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch deleted file mode 100644 index e0a1175a7ff..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile -*** ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200 ---- ov511-2.32.new/Makefile 2006-07-17 09:46:17.000000000 +0200 -*************** -*** 114,120 **** - - else # We were called from command line - -! KDIR := /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - - default: ---- 114,120 ---- - - else # We were called from command line - -! KDIR := $(kernel)/lib/modules/$(version)/build - PWD := $(shell pwd) - - default: diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch deleted file mode 100644 index eca39e90fce..00000000000 --- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh -*** ov511-2.32/do_install.sh 2003-11-12 09:24:29.000000000 +0100 ---- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200 -*************** -*** 8,15 **** - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/ -! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - ---- 8,15 ---- - - UNAME=`uname -r` - -! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/ -! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/ - - MAJMIN=`echo $UNAME | cut -d . -f 1-2` - -*************** -*** 35,41 **** - install $MODULE $INSTALL_PATH - done - -! echo Finding module dependencies -! /sbin/depmod -ae - - echo All done! ---- 35,41 ---- - install $MODULE $INSTALL_PATH - done - -! #echo Finding module dependencies -! #/sbin/depmod -ae - - echo All done! diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fec9eab34a0..8b676f49909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6087,10 +6087,6 @@ let */ ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - ov511 = callPackage ../os-specific/linux/ov511 { - stdenv = overrideGCC stdenv gcc34; - }; - perf = callPackage ../os-specific/linux/kernel/perf.nix { }; spl = callPackage ../os-specific/linux/spl/default.nix { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d4cc54d367c..ce7b70e3c94 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1106,7 +1106,6 @@ in 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; }; From e460a3f37c6720e608fabb96357ae48d91f247ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:30:32 +0100 Subject: [PATCH 133/221] pkgs/build-support/native-darwin-x11-and-opengl: lift native X11 and OpenGL implementation from Darwin into the Nix store --- .../native-darwin-x11-and-opengl/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/build-support/native-darwin-x11-and-opengl/default.nix diff --git a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix b/pkgs/build-support/native-darwin-x11-and-opengl/default.nix new file mode 100644 index 00000000000..cee03741dce --- /dev/null +++ b/pkgs/build-support/native-darwin-x11-and-opengl/default.nix @@ -0,0 +1,12 @@ +{ stdenv, writeScript }: + +assert stdenv.isDarwin; + +stdenv.mkDerivation rec { + name = "darwin-native-x11-and-opengl"; + + builder = writeScript "${name}-builder.sh" '' + /bin/mkdir -p $out + /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/ + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b676f49909..199bb58371e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4587,6 +4587,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; + mesa = callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { From 4a3904f82cb2b5cbd815755576cb66c4ba962ce2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:31:50 +0100 Subject: [PATCH 134/221] all-packages: redirect 'x11' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199bb58371e..41e1e1d262b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,8 +161,7 @@ let ### Symbolic names. - - x11 = xlibsWrapper; + x11 = if stdenv.isDarwin then darwinX11AndOpenGL else xlibsWrapper; # `xlibs' is the set of X library components. This used to be the # old modular X llibraries project (called `xlibs') but now it's just From 07cdc02266e3854d914c966d0746fb29dcae8ba7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:32:29 +0100 Subject: [PATCH 135/221] all-packages: redirect 'mesa' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e1e1d262b..5b1a81a3b94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4588,7 +4588,8 @@ let darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; - mesa = callPackage ../development/libraries/mesa { }; + mesa = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; From c924e051b69778d4f94c44195cec0fec5c9bf62c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:32:47 +0100 Subject: [PATCH 136/221] all-packages: redirect 'freeglut' attribute on Darwin to the native implementation --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b1a81a3b94..f9cf2896dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3654,7 +3654,8 @@ let freealut = callPackage ../development/libraries/freealut { }; - freeglut = callPackage ../development/libraries/freeglut { }; + freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else + callPackage ../development/libraries/freeglut { }; freetype = callPackage ../development/libraries/freetype { }; From 6950cf3bc4c9868dc92d6aeda226860256d38c01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:40:02 +0100 Subject: [PATCH 137/221] xfig: update download location of the Debian patch files --- pkgs/applications/graphics/xfig/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index e4ab5798918..c5f147ed032 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -20,20 +20,20 @@ stdenv.mkDerivation { patches = let - debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-2"; + debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3"; in [ (fetchurl { - url = "${debPrefix}/35_CVE-2010-4262.dpatch"; - sha256 = "18741b3dbipgr55fyp5x0296za3336ylln639jw8yjcyd1call22"; + url = "${debPrefix}/35_CVE-2010-4262.patch"; + sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5"; }) (fetchurl { - url = "${debPrefix}/13_remove_extra_libs.dpatch"; - sha256 = "0v3k30ib7xq5wfhd3yacnal4gbih7nqw0z0aycvc0hafffl97i46"; + url = "${debPrefix}/13_remove_extra_libs.patch"; + sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av"; }) (fetchurl { - url = "${debPrefix}/36_libpng15.dpatch"; - sha256 = "0ssmvlcpjn3iqj3l38db8j8qpqbzixlwpczq01m49r5w9l3viy8k"; + url = "${debPrefix}/36_libpng15.patch"; + sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn"; }) ]; From 8a9ba8c382339ef8db5b6267375009323000454b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 28 Jan 2013 21:24:04 +0100 Subject: [PATCH 138/221] git: adding an option not to build the manual asciidoc+xsltproc take hours to run --- .../version-management/git-and-tools/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index db3833f1855..87fa119252c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -3,6 +3,7 @@ , libxslt, tcl, tk, makeWrapper , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport +, withManual ? true , pythonSupport ? true , sendEmailSupport }: @@ -26,8 +27,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] - ++ # documentation tools - [ asciidoc texinfo xmlto docbook2x + ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; @@ -91,7 +91,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email "reinstall with config git = { sendEmailSupport = true } set" '') - + ''# Install man pages and Info manual + + stdenv.lib.optionalString withManual ''# Install man pages and Info manual make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' From 615b1d42a782b32895a7d535d3ef6cf5ebf1e6da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Jan 2013 23:13:03 +0100 Subject: [PATCH 139/221] JSON::Any: Pull in JSON --- 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 7e80f23a19f..a51abf44ff2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2641,7 +2641,7 @@ rec { url = mirror://cpan/authors/id/P/PE/PERIGRIN/JSON-Any-1.29.tar.gz; sha256 = "15v2j9dh58r7r4s7rnnmgnzzbyz61bhyxwpx1z7r811ixs9bkks2"; }; - buildInputs = [ JSON ]; + propagatedBuildInputs = [ JSON ]; meta = { description = "Wrapper Class for the various JSON classes"; license = "perl"; From 111b2034671b091ba324deb4aa246672e3c52dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 00:26:20 +0100 Subject: [PATCH 140/221] Updates related to VAAPI/VDPAU Making ffmpeg link to libva. Add the vdpau driver for vaapi. --- pkgs/development/libraries/ffmpeg/1.1.nix | 3 +++ pkgs/development/libraries/libva/default.nix | 11 +++++---- .../libraries/vaapi-vdpau/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/vaapi-vdpau/default.nix diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index 6651f1783f8..a40b40d68be 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -7,6 +7,7 @@ , x264Support ? true, x264 ? null , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null , x11grabSupport ? false, libXext ? null, libXfixes ? null @@ -19,6 +20,7 @@ assert vpxSupport -> libvpx != null; assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; assert faacSupport -> faac != null; assert x11grabSupport -> libXext != null && libXfixes != null; @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional dc1394Support libdc1394 ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 9b2eb19bab4..cf030eda777 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, intelgen4asm }: +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa +, libdrm, libXfixes, intelgen4asm, which }: stdenv.mkDerivation rec { - name = "libva-1.0.12"; + name = "libva-1.1.0"; src = fetchurl { url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "1xg8zvmh75w63sc8ykagzrbzswph6g9jardy8v83glkqzilaw2p8"; + sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; }; buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm ]; + libXfixes intelgen4asm which ]; - configureFlags = [ "--enable-i965-driver" "--enable-glx" ]; + configureFlags = [ "--enable-glx" ]; preConfigure = "sh autogen.sh"; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix new file mode 100644 index 00000000000..58ebc103275 --- /dev/null +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: + +stdenv.mkDerivation rec { + name = "vdpau-driver-0.7.4"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; + sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + }; + + buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; + license = "GPLv2+"; + description = "VDPAU driver for the VAAPI library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9cf2896dfd..9cd5943b937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5057,6 +5057,8 @@ let ucommon = callPackage ../development/libraries/ucommon { }; + vdpauDriver = callPackage ../development/libraries/vaapi-vdpau { }; + vamp = callPackage ../development/libraries/audio/vamp { }; vcdimager = callPackage ../development/libraries/vcdimager { }; From c73655fa9251bae3b9316d3ee9c7d55838f1f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 00:31:35 +0100 Subject: [PATCH 141/221] Adding the vaapi Intel driver. I also renamed the vdpau driver to 'vaapiDriver' in all-packages. I think it's a better name. --- .../libraries/vaapi-intel/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/vaapi-intel/default.nix diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix new file mode 100644 index 00000000000..432daa88a33 --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig }: + +stdenv.mkDerivation rec { + name = "intel-driver-1.0.19"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/intel-driver/snapshot/${name}.tar.bz2"; + sha256 = "1ns6y1hdqvqd92mc0d6axyh17rgyzp73xnbf97mnnzi9fc47x6p1"; + }; + + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 ]; + + preConfigure = '' + sh autogen.sh + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = { + homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; + license = "MIT"; + description = "Intel driver for the VAAPI library"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd5943b937..7b17379aedc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5057,7 +5057,9 @@ let ucommon = callPackage ../development/libraries/ucommon { }; - vdpauDriver = callPackage ../development/libraries/vaapi-vdpau { }; + vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vamp = callPackage ../development/libraries/audio/vamp { }; From 5d6da38d33ca927af337d91d6bd436aa6095b3e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:16:40 +0100 Subject: [PATCH 142/221] cups: Don't build on Darwin --- pkgs/misc/cups/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f19298e7ccd..6cc13aa3013 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "A standards-based printing system for UNIX"; license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux; }; } From 8317cd1f1481092103d2d9b18dae24fa6ed8d677 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:23:34 +0100 Subject: [PATCH 143/221] kde-3: Remove KDE 3 hasn't built in a long time. Also remove six, the only package with a dependency on KDE 3. --- .../applications/misc/taskjuggler/default.nix | 5 +- pkgs/desktops/kde-3/kdelibs/default.nix | 51 ----- pkgs/desktops/kde-3/kdelibs/inotify.patch | 30 --- .../kdelibs-3.5.10-openssl_1.0.0.patch | 180 ------------------ pkgs/development/libraries/arts/default.nix | 31 --- pkgs/games/six/default.nix | 35 ---- pkgs/games/six/gcc43-includes.patch | 38 ---- pkgs/top-level/all-packages.nix | 22 +-- 8 files changed, 2 insertions(+), 390 deletions(-) delete mode 100644 pkgs/desktops/kde-3/kdelibs/default.nix delete mode 100644 pkgs/desktops/kde-3/kdelibs/inotify.patch delete mode 100644 pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch delete mode 100644 pkgs/development/libraries/arts/default.nix delete mode 100644 pkgs/games/six/default.nix delete mode 100644 pkgs/games/six/gcc43-includes.patch diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 652450e510b..b8edd93455d 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchurl, zlib, libpng, libjpeg, perl, expat, qt3, libX11, libXext, libSM, libICE, -withKde, kdelibs, kdebase }: stdenv.mkDerivation rec { @@ -13,7 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ++ (if withKde then [kdelibs] else []) ; patches = [ ./timezone-glibc.patch ]; @@ -51,7 +49,6 @@ stdenv.mkDerivation rec { --x-includes=${libX11}/include --x-libraries=${libX11}/lib --with-qt-dir=${qt3} - --with-kde-support=${if withKde then "yes" else "no"} --with-ical-support=${if withKde then "yes" else "no"} "; preInstall = '' @@ -61,7 +58,7 @@ stdenv.mkDerivation rec { installFlags = # kde_locale is not defined when installing without kde. - if withKde then "" else "kde_locale=\${out}/share/locale"; + "kde_locale=\${out}/share/locale"; meta = { homepage = "http://www.taskjuggler.org"; diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix deleted file mode 100644 index 2c9e8e3563a..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre -, pkgconfig, libtiff, libxml2, libxslt, libtool, expat -, freetype, bzip2, cups, attr, acl -}: - -let version = "3.5.10"; in - -stdenv.mkDerivation { - name = "kdelibs-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2"; - sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1"; - }; - - patches = [ - # We're not supposed to use linux/inotify.h, use sys/inotify.h instead. - # Adapted from Gentoo. - ./inotify.patch - - # Fixes compilation issues with openssl-1.0.0 - ./kdelibs-3.5.10-openssl_1.0.0.patch - ]; - - buildInputs = [ - zlib perl qt3 openssl pcre pkgconfig libtiff libxml2 - libxslt expat libtool freetype bzip2 cups - xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft - ]; - - propagatedBuildInputs = [attr acl]; - - # Prevent configure from looking for pkg-config and freetype-config - # in the wrong location (it looks in /usr/bin etc. *before* looking - # in $PATH). - preConfigure = '' - substituteInPlace configure \ - --replace /usr/bin /no-such-path \ - --replace /usr/local/bin /no-such-path \ - --replace /opt/local/bin /no-such-path - ''; - - configureFlags = '' - --without-arts - --with-ssl-dir=${openssl} - --x-includes=${xlibs.libX11}/include - --x-libraries=${xlibs.libX11}/lib - ''; - - meta.platforms = stdenv.lib.platforms.linux; -} diff --git a/pkgs/desktops/kde-3/kdelibs/inotify.patch b/pkgs/desktops/kde-3/kdelibs/inotify.patch deleted file mode 100644 index 3d0b470811a..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/inotify.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp -*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 ---- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200 -*************** -*** 64,74 **** - // debug - #include - -! #ifdef HAVE_INOTIFY - #include - #include - #include -- #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include ---- 64,76 ---- - // debug - #include - -! #if 1 -! #include -! #include -! #elif HAVE_INOTIFY - #include - #include - #include - // Linux kernel headers are documented to not compile - #define _S390_BITOPS_H - #include diff --git a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch deleted file mode 100644 index 7a3a96e972f..00000000000 --- a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -96,9 +96,14 @@ - static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, - const EVP_CIPHER *,unsigned char *,int , - pem_password_cb *, void *) = 0L; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; -+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; -+#else - static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; - static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; - static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; -+#endif - static int (*K_X509_print_fp) (FILE *, X509*) = 0L; - static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; - static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; -@@ -404,9 +409,14 @@ - K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); - K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); - K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); -+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); -+#else - K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); - K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); - K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); -+#endif - K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); - K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); - K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); -@@ -568,7 +578,7 @@ - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); - #endif - - -@@ -956,7 +966,13 @@ - else return -1; - } - -- -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { -+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) -+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); -+ else return -1; -+} -+#else - ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { - if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); - else return 0L; -@@ -968,7 +984,7 @@ - return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x); - else return -1; - } -- -+#endif - - int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) { - if (K_X509_print_fp) return (K_X509_print_fp)(fp, x); -diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h ---- kdelibs-3.5.10-old/kio/kssl/kopenssl.h 2006-07-22 01:16:39.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h 2010-03-31 09:35:20.000000000 -0700 -@@ -48,6 +48,9 @@ - #include - #include - #undef crypt -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK _STACK -+#endif - #endif - - #include -@@ -446,12 +449,12 @@ - */ - int PEM_write_bio_X509(BIO *bp, X509 *x); - -- -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * X509_asn1_meth - used for netscape output - */ - ASN1_METHOD *X509_asn1_meth(); -- -+#endif - - /* - * ASN1_i2d_fp - used for netscape output -@@ -531,6 +534,9 @@ - */ - void sk_free(STACK *s); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ void sk_free(void *s) { return sk_free(reinterpret_cast(s)); } -+#endif - - /* - * Number of elements in the stack -@@ -543,6 +549,9 @@ - */ - char *sk_value(STACK *s, int n); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast(s), n); } -+#endif - - /* - * Create a new stack -@@ -555,6 +564,9 @@ - */ - int sk_push(STACK *s, char *d); - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast(s), reinterpret_cast(d)); } -+#endif - - /* - * Duplicate the stack -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc ---- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc 2005-10-10 08:05:44.000000000 -0700 -+++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -87,7 +87,7 @@ - - - STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList &certs) { -- STACK_OF(X509) *x509 = sk_new(NULL); -+ STACK_OF(X509) *x509 = reinterpret_cast(sk_new(NULL)); - KSSLCertificate *cert = certs.first(); - while(cert) { - sk_X509_push(x509, cert->getCert()); -diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc ---- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc 2006-01-19 09:06:12.000000000 -0800 -+++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc 2010-03-31 09:34:38.000000000 -0700 -@@ -1003,17 +1003,31 @@ - QByteArray KSSLCertificate::toNetscape() { - QByteArray qba; - #ifdef KSSL_HAVE_SSL --ASN1_HEADER ah; --ASN1_OCTET_STRING os; --KTempFile ktf; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ NETSCAPE_X509 nx; -+ ASN1_OCTET_STRING hdr; -+#else -+ ASN1_HEADER ah; -+ ASN1_OCTET_STRING os; -+#endif -+ KTempFile ktf; - -- os.data = (unsigned char *)NETSCAPE_CERT_HDR; -- os.length = strlen(NETSCAPE_CERT_HDR); -- ah.header = &os; -- ah.data = (char *)getCert(); -- ah.meth = d->kossl->X509_asn1_meth(); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ hdr.length = strlen(NETSCAPE_CERT_HDR); -+ nx.header = &hdr; -+ nx.cert = getCert(); -+ -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx); -+#else -+ os.data = (unsigned char *)NETSCAPE_CERT_HDR; -+ os.length = strlen(NETSCAPE_CERT_HDR); -+ ah.header = &os; -+ ah.data = (char *)getCert(); -+ ah.meth = d->kossl->X509_asn1_meth(); - -- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah); -+#endif - - ktf.close(); - diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix deleted file mode 100644 index 50c270f534e..00000000000 --- a/pkgs/development/libraries/arts/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg -, libpng, perl, qt3}: - -stdenv.mkDerivation { - name = "arts-1.5.10"; - - src = fetchurl { - url = mirror://kde/stable/3.5.10/src/arts-1.5.10.tar.bz2; - sha256 = "0ffcm24lkgg3sm89q4zsj8za5h5d9j1195pmbjhx4hj0xcwkiqlj"; - }; - - KDEDIR = kdelibs; - - configureFlags = '' - --with-extra-includes=${libjpeg}/include - --with-extra-libs=${libjpeg}/lib - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib - --disable-dependency-tracking - --enable-final - ''; - - buildNativeInputs = [ pkgconfig perl ]; - - buildInputs = - [glib kdelibs libX11 libXext zlib libjpeg libpng qt3]; - - meta = { - homepage = http://www.arts-project.org/; - }; -} diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix deleted file mode 100644 index a95ed6c50c6..00000000000 --- a/pkgs/games/six/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: - -let - - versionNumber = "0.5.3"; - -in - -stdenv.mkDerivation { - - name = "six-${versionNumber}"; - - src = fetchurl { - url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; - sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; - }; - - meta = { - description = "Six - A Hex playing program for KDE"; - homepage = http://six.retes.hu/; - license = "GPLv2"; - platforms = stdenv.lib.platforms.linux; - }; - - buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; - - # Supress some warnings which are less useful to us when making packages. - NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; - - # Without "--x-libraries=", we get the error - # "impure path `/usr/lib' used in link". - configureFlags = "--x-libraries="; - - patches = [ ./gcc43-includes.patch ]; -} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch deleted file mode 100644 index 83096bb0da2..00000000000 --- a/pkgs/games/six/gcc43-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch makes six compile with gcc 4.3 by including more header files. It -is based on the advice at . - ---- a/six/carrier.h -+++ b/six/carrier.h -@@ -2,6 +2,7 @@ - #ifndef CARRIER_H - #define CARRIER_H - -+#include - #include - #include - -diff --git a/six/hexgame.cpp b/six/hexgame.cpp -index 720e977..5d0dafe 100644 ---- a/six/hexgame.cpp -+++ b/six/hexgame.cpp -@@ -3,6 +3,7 @@ - #include - #include - #include -+#include - - #include - -diff --git a/six/main.cpp b/six/main.cpp -index 7fb5c21..b925a0c 100644 ---- a/six/main.cpp -+++ b/six/main.cpp -@@ -4,6 +4,8 @@ - #include "carrier.h" - #include "misc.h" - -+#include -+ - #include - #include - #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b17379aedc..7391ca21d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7887,11 +7887,7 @@ let teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; - taskjuggler = callPackage ../applications/misc/taskjuggler { - # KDE support is not working yet. - inherit (kde3) kdelibs kdebase; - withKde = config.taskJuggler.kde or false; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -8367,10 +8363,6 @@ let simutrans = callPackage ../games/simutrans { }; - six = callPackage ../games/six { - inherit (kde3) arts kdelibs; - }; - soi = callPackage ../games/soi {}; # You still can override by passing more arguments. @@ -8495,18 +8487,6 @@ let gnome = recurseIntoAttrs gnome2; - kde3 = recurseIntoAttrs { - - kdelibs = callPackage ../desktops/kde-3/kdelibs { - stdenv = overrideGCC stdenv gcc43; - }; - - arts = callPackage ../development/libraries/arts { - inherit (pkgs.kde3) kdelibs; - }; - - }; - kde4 = recurseIntoAttrs pkgs.kde47; kde47 = kdePackagesFor (pkgs.kde47 // { From 97c5ab3a6d474a36b5ffb309857cd230d55d344e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:29:51 +0100 Subject: [PATCH 144/221] linux-2.6.32-xen: Remove Hasn't built in a long time and is obsolete anyway. --- .../linux/kernel/linux-2.6.32-xen.nix | 222 ------------------ pkgs/top-level/all-packages.nix | 13 - 2 files changed, 235 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix deleted file mode 100644 index 20e14ccf5e2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix +++ /dev/null @@ -1,222 +0,0 @@ -{ stdenv, fetchurl, extraConfig ? "", ... } @ args: - -let - configWithPlatform = kernelPlatform: - '' - # Don't include any debug features. - DEBUG_KERNEL n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - IWLWIFI_LEDS? y - IWLWIFI_SPECTRUM_MEASUREMENT y - IWL3945_SPECTRUM_MEASUREMENT y - IWL4965 y # Intel Wireless WiFi 4965AGN - IWL5000 y # Intel Wireless WiFi 5000AGN - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # The intel drivers already require KMS - DRM_I915_KMS y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - OCFS2_FS_POSIX_ACL y - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_BSG n - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - CPU_FREQ_DEBUG n - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KALLSYMS_EXTRA_PASS n - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PCI_LEGACY y - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Enable Xen Dom0 support. - XEN_DOM0 y - XEN_PCI_PASSTHROUGH y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "2.6.32.24-xen-179eca5"; - localVersion = "-xen-179eca5"; - - src = fetchurl { - url = "http://nixos.org/tarballs/linux-${version}.tar.bz2"; - sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - - meta.description = "Linux kernel suitable for Xen Domain 0"; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7391ca21d10..5af580757b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5880,18 +5880,6 @@ let ]; }; - linux_2_6_32_xen = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32-xen.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ kernelPatches.fbcondecor_2_6_31 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs2_2_6_32 - kernelPatches.cifs_timeout_2_6_29 - kernelPatches.no_xsave - kernelPatches.dell_rfkill - ]; - }; - linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6123,7 +6111,6 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); - linuxPackages_2_6_32_xen = linuxPackagesFor linux_2_6_32_xen pkgs.linuxPackages_2_6_32_xen; linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); From 6dba65b51fd27c722012d1b12fcfca1ccbb031a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:34:58 +0100 Subject: [PATCH 145/221] openoffice: Remove It's superseded by LibreOffice and doesn't build anymore. --- .../applications/office/openoffice/builder.sh | 105 ------------------ .../office/openoffice/default.nix | 105 ------------------ pkgs/applications/office/openoffice/oo.patch | 72 ------------ .../office/openoffice/root-required.patch | 25 ----- .../applications/office/openoffice/xlib.patch | 22 ---- pkgs/top-level/all-packages.nix | 8 -- pkgs/top-level/release-cross.nix | 1 - pkgs/top-level/release-python.nix | 1 - pkgs/top-level/release.nix | 1 - 9 files changed, 340 deletions(-) delete mode 100644 pkgs/applications/office/openoffice/builder.sh delete mode 100644 pkgs/applications/office/openoffice/default.nix delete mode 100644 pkgs/applications/office/openoffice/oo.patch delete mode 100644 pkgs/applications/office/openoffice/root-required.patch delete mode 100644 pkgs/applications/office/openoffice/xlib.patch diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh deleted file mode 100644 index 2c6e04e049b..00000000000 --- a/pkgs/applications/office/openoffice/builder.sh +++ /dev/null @@ -1,105 +0,0 @@ -source $stdenv/setup - -export nodep=TRUE -export NO_HIDS=TRUE - -export PATH=$icu/sbin:$PATH - -postUnpack() { - tar xvjf $src_system -} - -preConfigure() { - ./configure --help - - for i in sysui/desktop/share/makefile.mk; do - substituteInPlace $i --replace /bin/bash $shell - done - - SRCDIR= - - sed -e '/CURL_NO_OLDIES/d' -i ucb/source/ucp/ftp/makefile.mk -} - -postConfigure() { - for i in LinuxX86*Env.Set; do - substituteInPlace $i --replace /usr /no-such-path - done - substituteInPlace solenv/inc/libs.mk \ - --replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \ - --replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so -} - -buildPhase() { - source LinuxX86*Env.Set.sh - ./bootstrap - # bootstrap defines the alias 'build', that mostly runs this perl script: - (cd instsetoo_native; perl ../solenv/bin/build.pl --all) # wait a few hours... add -P4 for quadcores -} - -wrapSOffice() { - local fn=$1 - local arg=$2 - - # !!! should use makeWrapper for this. - - cat > $out/bin/$fn <> $appl - done - - # Copy icons so that the menu items in KDE and GNOME will look much nicer - (cd $SRC_ROOT/sysui/desktop/icons - install -v -d $out/share/icons/{hicolor,locolor} -m 755 - cp -rv hicolor/*x* $out/share/icons/hicolor - cp -rv locolor/*x* $out/share/icons/locolor - ) - - # The desktop files expect a openoffice.org3 executable in the PATH, which is a symlink to soffice - ln -s $out/bin/soffice $out/bin/openoffice.org3 -} - -genericBuild - diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix deleted file mode 100644 index 5bc5cbf8c9b..00000000000 --- a/pkgs/applications/office/openoffice/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv, fetchurl, pam, python, tcsh, libxslt, perl, ArchiveZip -, CompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd -, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2 -}: - -let version = "3.2.1"; in - -stdenv.mkDerivation rec { - name = "openoffice.org-${version}"; - builder = ./builder.sh; - - downloadRoot = "http://openoffice.mirrorbrain.org/files/stable"; - versionDirs = true; - - src = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; - sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; - }; - - patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; - - postPatch = - /* Compiling with GCC 4.5 fails: - - Compiling: cppu/source/AffineBridge/AffineBridge.cxx - [...] - ../../inc/uno/lbnames.h:67:2: error: #error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version." - - However, we can't compile with GCC 4.4 because then we'd end up with - two different versions of libstdc++ (because the deps are compiled - with 4.5), which isn't supported (link time error.) - - Thus, force compilation with 4.5 and hope for the best. */ - '' sed -i "cppu/inc/uno/lbnames.h" \ - -e 's/#[[:blank:]]*error "Supported.*$//g' - ''; - - src_system = fetchurl { - url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; - sha256 = "0giy3sza64ij19w7b06rxcrkrb5kq2fvkz486vh3mv08s8xa8zfc"; - }; - - preConfigure = '' - PATH=$PATH:${icu}/sbin - ''; - - configureFlags = " - --with-package-format=native - --disable-epm - --disable-fontooo - --disable-gnome-vfs - --disable-gnome-vfs - --disable-mathmldtd - --disable-mozilla - --disable-odk - --disable-pasf - --with-cairo - --with-system-libs - --with-system-python - --with-system-boost - --with-system-db - --with-jdk-home=${jdk} - --with-ant-home=${ant} - --without-afms - --without-dict - --without-fonts - --without-myspell-dicts - --without-nas - --without-ppds - --without-system-agg - --without-system-beanshell - --without-system-hsqldb - --without-system-xalan - --without-system-xerces - --without-system-xml-apis - --without-system-xt - --without-system-jars - --without-system-hunspell - --without-system-altlinuxhyph - --without-system-lpsolve - --without-system-graphite - "; - - LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; - - buildInputs = [ - pam python tcsh libxslt perl ArchiveZip CompressZlib zlib - libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl - libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack - getopt file jdk cairo which icu boost libXext libX11 libXtst libXi - cups libXinerama openssl gperf GConf ORBit2 - ]; - - inherit icu fontconfig libjpeg jdk cups; - - meta = { - description = "OpenOffice.org is a multiplatform and multilingual office suite"; - homepage = http://www.openoffice.org/; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - }; -} diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch deleted file mode 100644 index e759fcdc2d4..00000000000 --- a/pkgs/applications/office/openoffice/oo.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk -index 74c64bf..fbf8d21 100644 ---- a/libtextcat/makefile.mk -+++ b/libtextcat/makefile.mk -@@ -57,7 +57,7 @@ ADDITIONAL_FILES= \ - #CONFIGURE_DIR=$(BUILD_DIR) - - #relative to CONFIGURE_DIR --CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" -+CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR) - CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - - BUILD_ACTION=make -diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk -index 0d92de9..aae3b4f 100644 ---- a/redland/raptor/makefile.mk -+++ b/redland/raptor/makefile.mk -@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure - # do not enable grddl parser (#i93768#) --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk -index fba6460..fc70419 100644 ---- a/redland/rasqal/makefile.mk -+++ b/redland/rasqal/makefile.mk -@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk -index 710d7d6..dd60f0d 100644 ---- a/redland/redland/makefile.mk -+++ b/redland/redland/makefile.mk -@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config - - CONFIGURE_DIR= - CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) - BUILD_FLAGS+= -j$(EXTMAXPROCESS) - BUILD_DIR=$(CONFIGURE_DIR) -diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch -index 37b7964..e6fd962 100644 ---- a/hunspell/hunspell-1.2.8.patch -+++ b/hunspell/hunspell-1.2.8.patch -@@ -619,3 +619,15 @@ - p++; - } - if (i > 0 && buf[i - 1] == '\n') { -+diff --git a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh b/hunspell/unxlngi6.pro/misc/build/hunspell-1.1.12/tests/test.sh -+index 90080f6..f069517 100755 -+--- a/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -++++ b/hunspell/unxlngi6.pro/misc/build/hunspell-1.2.8/tests/test.sh -+--- misc/hunspell-1.2.8/tests/test.sh Sep 4 01:25:35 2007 -++++ misc/build/hunspell-1.2.8/tests/test.sh Jun 18 11:53:11 2008 -+@@ -1,4 +1,4 @@ -+-#!/bin/bash -++#!/bin/sh -+ export LC_ALL="C" -+ -+ function check_valgrind_log () { diff --git a/pkgs/applications/office/openoffice/root-required.patch b/pkgs/applications/office/openoffice/root-required.patch deleted file mode 100644 index b93fd22b4ab..00000000000 --- a/pkgs/applications/office/openoffice/root-required.patch +++ /dev/null @@ -1,25 +0,0 @@ -As nix chroot environment does not have the 'root' as owner, we have to disable -the "owner=root" tar parameters when doing these tar files. -They are built at openoffice build time. -diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk -index 3342aca..49679b1 100644 ---- a/sysui/desktop/slackware/makefile.mk -+++ b/sysui/desktop/slackware/makefile.mk -@@ -100,7 +100,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : - - $(MISC)/$(TARGET)/empty.tar : - @$(MKDIRHIER) $(@:d)/empty -- @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . -+ @tar -C $(MISC)/$(TARGET)/empty -cf $@ . - - - # --- packaging --------------------------------------------------- -@@ -112,7 +112,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar - -$(RM) -r $(MISC)$/$(@:b) - dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh - @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp -- @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt -+ @tar -C $(MISC)/$(@:b) --exclude application.flag -rf $@.tmp install usr opt - @gzip < $@.tmp > $@ - @$(RM) $@.tmp - $(RM) -r $(MISC)$/$(@:b) diff --git a/pkgs/applications/office/openoffice/xlib.patch b/pkgs/applications/office/openoffice/xlib.patch deleted file mode 100644 index d5f0ff9aa20..00000000000 --- a/pkgs/applications/office/openoffice/xlib.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=31322 - -diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx -*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200 ---- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100 -*************** -*** 36,42 **** - class SalDisplay; - class AllSettings; - -! #ifndef _XLIB_H_ - // forwards from X - struct Display; - struct XEvent; ---- 36,42 ---- - class SalDisplay; - class AllSettings; - -! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) - // forwards from X - struct Display; - struct XEvent; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af580757b1..b35d0e8b3b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7613,14 +7613,6 @@ let openjump = callPackage ../applications/misc/openjump { }; - openoffice = callPackage ../applications/office/openoffice { - inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2; - neon = neon029; - libwpd = libwpd_08; - zip = zip.override { enableNLS = false; }; - }; - openscad = callPackage ../applications/graphics/openscad {}; opera = callPackage ../applications/networking/browsers/opera { diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 63fffd7d316..d5a57337f4f 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -10,7 +10,6 @@ let coreutils.hostDrv = nativePlatforms; dropbear.hostDrv = nativePlatforms; tigervnc.hostDrv = nativePlatforms; - #openoffice.hostDrv = nativePlatforms; wxGTK.hostDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ce7b70e3c94..f5fc2f3a7f6 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1362,7 +1362,6 @@ in 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; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 833210e8de9..b3b58f43e1b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -210,7 +210,6 @@ with (import ./release-lib.nix); ntp = linux; ocaml = linux; octave = linux; - openoffice = linux; openssh = linux; openssl = all; pam_console = linux; From be412fc7890cec480161c9d6d3ecbf844a09688d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 12:36:01 +0100 Subject: [PATCH 146/221] Rename openoffice directory to libreoffice --- .../{openoffice/libreoffice.nix => libreoffice/default.nix} | 0 .../{openoffice => libreoffice}/generate-libreoffice-srcs.sh | 0 .../office/{openoffice => libreoffice}/libreoffice-srcs.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/office/{openoffice/libreoffice.nix => libreoffice/default.nix} (100%) rename pkgs/applications/office/{openoffice => libreoffice}/generate-libreoffice-srcs.sh (100%) rename pkgs/applications/office/{openoffice => libreoffice}/libreoffice-srcs.nix (100%) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/libreoffice/default.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice.nix rename to pkgs/applications/office/libreoffice/default.nix diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh similarity index 100% rename from pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh rename to pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix similarity index 100% rename from pkgs/applications/office/openoffice/libreoffice-srcs.nix rename to pkgs/applications/office/libreoffice/libreoffice-srcs.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35d0e8b3b4..18f106e5a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7402,7 +7402,7 @@ let librecad2 = callPackage ../applications/misc/librecad/2.0.nix { }; - libreoffice = callPackage ../applications/office/openoffice/libreoffice.nix { + libreoffice = callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; From 3f49d8dd5070776317e759d5f7a7497bf72533d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2013 13:23:42 +0100 Subject: [PATCH 147/221] libspectre: minor update, patches no longer needed --- ...-documents-containing-an-invalid-Pag.patch | 29 -------------- ...llocate-at-least-1-page-in-doc-pages.patch | 38 ------------------- .../libraries/libspectre/default.nix | 10 ++--- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch delete mode 100644 pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch diff --git a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch deleted file mode 100644 index 3e232ee5ac5..00000000000 --- a/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7500e4d1ae85ecf9f61b1446e07ebb887118757c Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Sat, 30 Oct 2010 15:55:18 +0200 -Subject: [PATCH 1/2] Fix a crash with documents containing an invalid - %%Pages: comment - -When failed to allocate memory for pages because of invalid %%Pages: -comment, set maxpages to 0 to ignore the comment. Problem spotted -by Marek Kasik. Fixes bug #30867. ---- - libspectre/ps.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 6c7cfce..4578cec 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -597,6 +597,8 @@ psscan(const char *filename, int scanstyle) - if (maxpages > 0) { - doc->pages = (struct page *) PS_calloc(maxpages, - sizeof(struct page)); -+ if (!doc->pages) -+ maxpages = 0; - CHECK_MALLOCED(doc->pages); - } - } --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch deleted file mode 100644 index 09ab9e11c16..00000000000 --- a/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8ffd9185f81cb8337cece4c8e3672d0e6a97e935 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Wed, 24 Nov 2010 15:54:14 +0100 -Subject: [PATCH 2/2] Allocate at least 1 page in doc->pages - -Allocate at least 1 page if there are no %%Pages: or %%Page: comments -in the PS file (#31512). ---- - libspectre/ps.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libspectre/ps.c b/libspectre/ps.c -index 4578cec..0130fb4 100644 ---- a/libspectre/ps.c -+++ b/libspectre/ps.c -@@ -1004,14 +1004,14 @@ psscan(const char *filename, int scanstyle) - section_len += line_len; - } - -+ if (maxpages == 0) { -+ maxpages = 1; -+ doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -+ CHECK_MALLOCED(doc->pages); -+ } - - newpage: - while (DSCcomment(line) && iscomment(line+2, "Page:")) { -- if (maxpages == 0) { -- maxpages = 1; -- doc->pages = (struct page *) PS_calloc(maxpages, sizeof(struct page)); -- CHECK_MALLOCED(doc->pages); -- } - label = ps_gettext(line+length("%%Page:"), &next_char); - if (sscanf(next_char, "%u", &thispage) != 1) thispage = 0; - if (nextpage == 1) { --- -1.7.11 - diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 379727aec5c..a819e0cef6f 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,20 +1,18 @@ -{ fetchurl, stdenv, ghostscript }: +{ fetchurl, stdenv, pkgconfig, ghostscript, cairo }: stdenv.mkDerivation rec { - name = "libspectre-0.2.6"; + name = "libspectre-0.2.7"; src = fetchurl { url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1lqdmi7vx497pbigpp77064a4463lmihzh44898l101c69i7qqrg"; + sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; buildInputs = [ # Need `libgs.so'. - ghostscript + pkgconfig ghostscript cairo /*for tests*/ ]; - patches = [ ./0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch ./0002-Allocate-at-least-1-page-in-doc-pages.patch ]; - doCheck = true; meta = { From 0072c442557b4d57fe128bf75775b2912f94b313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 29 Jan 2013 17:37:06 +0100 Subject: [PATCH 148/221] wpa_supplicant: refactor settings, readline support (on by default) --- .../linux/wpa_supplicant/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index b1bc15ff083..c74fc8d634f 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: +{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl +, readlineSupport ? true, readline +}: +assert readlineSupport -> readline!=null; stdenv.mkDerivation rec { version = "1.1"; @@ -9,20 +12,26 @@ stdenv.mkDerivation rec { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; + extraConfig = lib.concatStringsSep "\n" ( + [ "CONFIG_DEBUG_SYSLOG=y" + "CONFIG_CTRL_IFACE_DBUS=y" + "CONFIG_CTRL_IFACE_DBUS_NEW=y" + "CONFIG_CTRL_IFACE_DBUS_INTRO=y" + "CONFIG_DRIVER_NL80211=y" + "CONFIG_LIBNL32=y" + ] ++ lib.optional readlineSupport "CONFIG_READLINE=y" + ); preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo CONFIG_DEBUG_SYSLOG=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config - echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config - echo CONFIG_DRIVER_NL80211=y | tee -a .config + echo ${extraConfig} | tee -a .config echo CONFIG_LIBNL32=y | tee -a .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl ]; + buildInputs = [ openssl dbus_libs libnl ] + ++ lib.optional readlineSupport readline; buildNativeInputs = [ pkgconfig ]; From 675679f450ff1f1e6b11a011ac59e5ac6d50730d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 29 Jan 2013 11:56:12 +0100 Subject: [PATCH 149/221] Fixes on VAAPI src packages. The github 'snapshots' weren't stable on hashes, I think (at least as I saw today trying to build vaapiVdpau in another computer). Using released tarballs, pointer by vcunat. --- pkgs/development/libraries/libva/default.nix | 12 ++++-------- pkgs/development/libraries/vaapi-intel/default.nix | 11 ++++++----- pkgs/development/libraries/vaapi-vdpau/default.nix | 11 +++++------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index cf030eda777..5caea5ba610 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,21 +1,17 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, pkgconfig, libXext, mesa -, libdrm, libXfixes, intelgen4asm, which }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { name = "libva-1.1.0"; src = fetchurl { - url = "http://cgit.freedesktop.org/libva/snapshot/${name}.tar.bz2"; - sha256 = "0lqkharln67p60jlyz9y662gjgqk2iy2nrj84j1jr1nzgw7j01a5"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + sha256 = "1a7g7i96ww8hmim2pq2a3xc89073lzacxn1xh9526bzhlqjdqsnv"; }; - buildInputs = [ autoconf automake libtool libX11 libXext pkgconfig mesa libdrm - libXfixes intelgen4asm which ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; configureFlags = [ "--enable-glx" ]; - preConfigure = "sh autogen.sh"; - meta = { homepage = http://www.freedesktop.org/wiki/Software/vaapi; license = "MIT"; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 432daa88a33..548aeb8a2de 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig }: +{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig +, intelgen4asm }: stdenv.mkDerivation rec { - name = "intel-driver-1.0.19"; + name = "libva-intel-driver-1.0.19"; src = fetchurl { - url = "http://cgit.freedesktop.org/intel-driver/snapshot/${name}.tar.bz2"; - sha256 = "1ns6y1hdqvqd92mc0d6axyh17rgyzp73xnbf97mnnzi9fc47x6p1"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; + sha256 = "14m7krah3ajkwj190q431lqqa84hdljcdmrcrqkbgaffyjlqvdid"; }; - buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 ]; + buildInputs = [ autoconf automake libtool mesa libva pkgconfig libdrm libX11 intelgen4asm ]; preConfigure = '' sh autogen.sh diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 58ebc103275..a3d51217ead 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: stdenv.mkDerivation rec { - name = "vdpau-driver-0.7.4"; + name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://cgit.freedesktop.org/vdpau-driver/snapshot/${name}.tar.bz2"; - sha256 = "1kvhpqwzw01bfamvxhnl4yhmb7pwkkfaii3w7bidd4vj1gsrx5l4"; + url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; - buildInputs = [ autoconf automake libtool libvdpau mesa libva pkgconfig ]; + buildInputs = [ libvdpau mesa libva pkgconfig ]; preConfigure = '' - sh autogen.sh sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; From 3a68505c6e03a526d4ee020c2608c18d6f7438f3 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 29 Jan 2013 20:40:53 +0100 Subject: [PATCH 150/221] GHC 7.6.2 --- pkgs/development/compilers/ghc/7.6.2.nix | 59 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/haskell-defaults.nix | 6 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.6.2.nix diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix new file mode 100644 index 00000000000..a62f2468a61 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.2"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + # The comments below applied to GHC 7.6.1, left for if somebody experiences + # similar problems. If so, I argue we should selectively disable parallel + # building JUST for that platform. ~aristidb + # + ## My attempts to compile GHC with parallel build support enabled, failed + ## 4 consecutive times with the following error: + ## + ## building rts/dist/build/AutoApply.debug_o + ## building rts/dist/build/AutoApply.thr_o + ## rts_dist_HC rts/dist/build/AutoApply.debug_o + ## /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o + ## collect2: ld returned 1 exit status + ## make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1 + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + platforms = ghc.meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f106e5a26..b732c671689 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2404,6 +2404,7 @@ let haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 69c99db89a2..a03f0a6fe46 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -277,6 +277,12 @@ prefFun = ghcHEADPrefs; }; + packages_ghc762 = + packages { ghcPath = ../development/compilers/ghc/7.6.2.nix; + ghcBinary = ghc704Binary; + prefFun = ghcHEADPrefs; + }; + # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; From 792f47020b62870666bc8ecc3e6d77813cff1402 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 10:58:23 +0100 Subject: [PATCH 151/221] haskell-string-qq: add version 0.0.2 --- .../libraries/haskell/string-qq/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/string-qq/default.nix diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix new file mode 100644 index 00000000000..78fe1c3930f --- /dev/null +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "string-qq"; + version = "0.0.2"; + sha256 = "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp"; + meta = { + description = "QuasiQuoter for non-interpolated strings, texts and bytestrings"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 64b172c0c21..c45f949342c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1558,6 +1558,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; + stringQq = callPackage ../development/libraries/haskell/string-qq {}; + stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; strptime = callPackage ../development/libraries/haskell/strptime {}; From 89ee4bd883d0cbdbded7f5697137a8fa90ecad62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:12:10 +0100 Subject: [PATCH 152/221] haskell-split: update to 0.2.1.2 --- .../development/libraries/haskell/split/0.2.1.2.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/split/0.2.1.2.nix diff --git a/pkgs/development/libraries/haskell/split/0.2.1.2.nix b/pkgs/development/libraries/haskell/split/0.2.1.2.nix new file mode 100644 index 00000000000..e88f478f976 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.2.1.2.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.2.1.2"; + sha256 = "0wjw4j9wgk66h7filzfh0py9b0wwmaynvwqvd6kinxgms86fpvyi"; + meta = { + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c45f949342c..70a0f0acb3a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -138,7 +138,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.6 ok regexCompat = self.regexCompat_0_95_1; # 7.6 ok regexPosix = self.regexPosix_0_95_2; # 7.6 ok - split = self.split_0_2_1_1; # 7.6 ok + split = self.split_0_2_1_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok @@ -1608,7 +1608,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; - split = self.split_0_2_1_1; + split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {}; + split = self.split_0_2_1_2; stbImage = callPackage ../development/libraries/haskell/stb-image {}; From 1e0055679518c9f771e818c7efda1b1366547567 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:14:16 +0100 Subject: [PATCH 153/221] haskell-HTTP: update to 4000.2.7 --- .../libraries/haskell/HTTP/{4000.2.6.nix => 4000.2.7.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.6.nix => 4000.2.7.nix} (81%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.6.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.7.nix index 2c85ec7cd9e..0711e47b005 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.7.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.6"; - sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; + version = "4000.2.7"; + sha256 = "0a5zjhrbdp8hwmkc709i2qwnxx4lafrp6wssdms6g5l97a52bdc2"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 70a0f0acb3a..290124dee1a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_6; # 7.6 ok + HTTP = self.HTTP_4000_2_7; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_1_0; # 7.6 ok @@ -967,8 +967,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {}; HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; - HTTP = self.HTTP_4000_2_6; + HTTP_4000_2_7 = callPackage ../development/libraries/haskell/HTTP/4000.2.7.nix {}; + HTTP = self.HTTP_4000_2_7; httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; From b569cf34291f2ba582ae903dbda8796a8fc9b3ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 154/221] haskell-authenticate: update to version 1.3.2.1 --- pkgs/development/libraries/haskell/authenticate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index b336a632b9d..835cdce2e91 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2"; - sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m"; + version = "1.3.2.1"; + sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From 38ab8fda135adc5a32832dcf4a3418b77bf257b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 155/221] haskell-bifunctors: update to version 3.2 --- pkgs/development/libraries/haskell/bifunctors/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index b4de1910465..09287600323 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,10 +1,10 @@ -{ cabal, semigroupoids, semigroups }: +{ cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { pname = "bifunctors"; - version = "3.0.3"; - sha256 = "1nmrwc9n9qkj9w9c38ja0had32isr6v35j1v19fhqdwk5ddbpxp4"; - buildDepends = [ semigroupoids semigroups ]; + version = "3.2"; + sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a"; + buildDepends = [ semigroupoids semigroups tagged ]; meta = { homepage = "http://github.com/ekmett/bifunctors/"; description = "Haskell 98 bifunctors"; From 3fd2c151449592d3ae0fc7f32df7a9ae8ce090dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 156/221] haskell-case-insensitive: update to version 1.0 --- .../libraries/haskell/case-insensitive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 7f972dfd655..58e0ebbbe00 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -1,10 +1,10 @@ -{ cabal, hashable, text }: +{ cabal, deepseq, hashable, text }: cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.4"; - sha256 = "1xzpri688vbd6fvvxczqx8bv53009ygzws7vbjmj2q97wcm8nmwd"; - buildDepends = [ hashable text ]; + version = "1.0"; + sha256 = "1x437b5yyh930a5dr642lvfdgpx12w4ms70whiw1ffjjhssb88zk"; + buildDepends = [ deepseq hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; From a7d99b7d4d9931c05fa81112141f936c60841cd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 157/221] haskell-classy-prelude-conduit: update to version 0.4.4 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index c167f191d4d..66a5b51b189 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.4.3"; - sha256 = "0ny4si6z6i6g6khcg9d3m9wks42sqh8i8kpgghhdwd37v32l3f34"; + version = "0.4.4"; + sha256 = "1xsqdifqm68mlrmpmj04nqd5r83psq5ffis2pm8k8vwl1n1jv8kn"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit From 17842f4e8fa80cb79e68b3c2ab6660624555d085 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 158/221] haskell-classy-prelude: update to version 0.4.4 --- .../libraries/haskell/classy-prelude/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 9f8893bf72f..4514e587051 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,13 +1,13 @@ -{ cabal, basicPrelude, hashable, systemFilepath, text, transformers -, unorderedContainers, vector +{ cabal, basicPrelude, hashable, liftedBase, systemFilepath, text +, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.4.3"; - sha256 = "1k2iszja03s8azypl8lpkdjvvqsgzg73cl1wp4jl2fqp1psqv36q"; + version = "0.4.4"; + sha256 = "0f49b07r5isz57wjmgpfvq4hg9m5q59ad918rk1v24xdvn4y3all"; buildDepends = [ - basicPrelude hashable systemFilepath text transformers + basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector ]; meta = { From fe5b58759ef0ae773e879fbeaca8922866ef7eb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 159/221] haskell-diagrams-contrib: update to version 0.6.0.3 --- 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 85b1360c366..a25603453a7 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.2"; - sha256 = "1lj99a46r12zjwmpkn7vj04wapfgdlmw05jwb5lnhy9hxqgcsgng"; + version = "0.6.0.3"; + sha256 = "0j0wmf2nksqh3rqmzyw468bp25zikc5icif5f3rfi1v06ghsk0i5"; buildDepends = [ colour dataDefault diagramsLib forceLayout lens mtl vectorSpace ]; From 6cee3f32f1c6eebb74404aaaf47f659b6dabdc46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 160/221] haskell-digestive-functors-heist: update to version 0.6.0.0 --- .../libraries/haskell/digestive-functors-heist/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 08a9f09be3a..0b7eb1e88de 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.0"; sha256 = "17qndqsk09fvnvyhhw3xbbjjhfyyp4sivc898vqllyyky0wqmrdk"; buildDepends = [ digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; From 1401f654cb3b419d04a3e611a1b99e989b449d8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 161/221] haskell-distributed-process-simplelocalnet: update to version 0.2.0.9 --- .../haskell/distributed-process-simplelocalnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index 86fa7122195..aaca850c0d7 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.8"; - sha256 = "01kzqfbrkl9zzknw0gbdh1c1lss911lphagn2sw6nzl9xpnhjqk0"; + version = "0.2.0.9"; + sha256 = "0bkb26bfpmyhh26hgznnw073kvk78ws6lqi86pxrgnnm9sx5mi21"; isLibrary = true; isExecutable = true; buildDepends = [ From cf71ba454df96382daafe3d215c40a4c361fb9bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:39 +0100 Subject: [PATCH 162/221] haskell-distributed-process: update to version 0.4.2 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 6ecd5d57883..1e83cbaa8d9 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.1"; - sha256 = "1ysm2rq7ldxb5w6m04vf5q3zrgvg99z7kszjqj17r17ps61v898f"; + version = "0.4.2"; + sha256 = "16w8jp66903vn089ysqdn534v0744cr2m6wkqd77zri6a0caaa6c"; isLibrary = true; isExecutable = true; buildDepends = [ From cb7607499ba00dcec8f3bb4eba974fe9cd046d70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 163/221] haskell-edit-distance: update to version 0.2.1.2 --- pkgs/development/libraries/haskell/edit-distance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index b6d0b4668f8..22f5953b7e0 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "edit-distance"; - version = "0.2.1.1"; - sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn"; + version = "0.2.1.2"; + sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44"; isLibrary = true; isExecutable = true; buildDepends = [ random ]; From eb2adf9acd2c7e2b5178156e4756d527b0a81451 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 164/221] haskell-either: update to version 3.1 --- .../libraries/haskell/either/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index cbfa53b6d00..91b24e56378 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,13 +1,16 @@ -{ cabal, semigroupoids, semigroups, transformers }: +{ cabal, MonadRandom, mtl, semigroupoids, semigroups, transformers +}: cabal.mkDerivation (self: { pname = "either"; - version = "3.0.3"; - sha256 = "02kpb8xd19n00ll61haqr6k3hy8qmbdf73gr4zs59q9xh0739qxc"; - buildDepends = [ semigroupoids semigroups transformers ]; + version = "3.1"; + sha256 = "1paglfhd2xjr32sh5npl3kvamv4nps9fpy0wk9ya0l26w4c3bdsm"; + buildDepends = [ + MonadRandom mtl semigroupoids semigroups transformers + ]; meta = { homepage = "http://github.com/ekmett/either/"; - description = "Haskell 98 either monad transformer"; + description = "An either monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 35295065efbd10caddca36200f4303a12a5928c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 165/221] haskell-hakyll: update to version 4.1.4.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index c8b2117c128..68b79bdcc3b 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.1"; - sha256 = "1d9bbqy1dix60w72zc3g4y7454avngfyl2i8gj99bdqin2wwcgp8"; + version = "4.1.4.0"; + sha256 = "0nhr7ai03hx2qjxlqml0js43iwxhcbpdqkwdvw8pqs396yrjwxdj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { filepath httpConduit httpTypes lrucache mtl pandoc parsec random regexBase regexTdfa snapCore snapServer tagsoup text time ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 2ae771ab7b04faefaa2484cb202dc2997be42816 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 166/221] haskell-hamlet: update to version 1.1.4 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 906a8e2759a..0250e6c6bcd 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.3.1"; - sha256 = "04qqsjrn0fh9y4z7gjf3g60w69gqxhzq7dqkraq97p3w45fijm1i"; + version = "1.1.4"; + sha256 = "10hb3a6c56bmwbbrbnczvlangzz24ghl4vm8nq4z0plj1nglnlqx"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From a1c17bf9242f3c29fefc07b9a8b94a2f1bd5cab5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 167/221] haskell-heist: update to version 0.11.0 --- pkgs/development/libraries/haskell/heist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index a2251f69673..7547fcff410 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.10.2.1"; - sha256 = "14lp27vlzv6qqv325x2vqqvphw5ads5ywjqpjramv3hhd275fn3d"; + version = "0.11.0"; + sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time From 3af9c0d6eb4db84e57318df8283e2fbe2e99a843 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 168/221] haskell-hoogle: update to version 4.2.15 --- pkgs/development/libraries/haskell/hoogle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 8ebc698892f..153cee7db75 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.14"; - sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj"; + version = "4.2.15"; + sha256 = "0mhxdbbzq7hl5zxz3dhxyrs5q08y8hxwsm19ba0gx47qvg3znzki"; isLibrary = true; isExecutable = true; buildDepends = [ From 79553f7ea8dee493ae0836d8cad1f830dba39b18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 169/221] haskell-hspec: update to version 1.4.4 --- pkgs/development/libraries/haskell/hspec/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index bc194108d33..4c897f20ef7 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.4.3"; - sha256 = "0i963fxamyyi3afac67rkw4340i3xqs1q3lvcy69mq0czbdvgjmc"; + version = "1.4.4"; + sha256 = "09wrvdlqzpa3vjcnirnzpj8nsvqnn5xbilnxaqmjm2agbl8xfj5r"; isLibrary = true; isExecutable = true; buildDepends = [ ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv silently time transformers ]; - jailbreak = true; meta = { homepage = "http://hspec.github.com/"; description = "Behavior-Driven Development for Haskell"; From 6384ff2e1fa12a82ac51ee66a7c7becab7d6f2e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 170/221] haskell-http-conduit: update to version 1.8.7.1 --- 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 b9f47b44006..544f6c0d674 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7"; - sha256 = "12v5rxp4dx6glyijygpp7r7b5b6mscclgfp2cbii78m3hgld097i"; + version = "1.8.7.1"; + sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From b2277d0afd846aca4e894a141aa1ed210cdf3890 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:40 +0100 Subject: [PATCH 171/221] haskell-http-types: update to version 0.8.0 --- pkgs/development/libraries/haskell/http-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 242f73e9b21..d0837d21bff 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-types"; - version = "0.7.3.0.1"; - sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; + version = "0.8.0"; + sha256 = "14d1gzgwhinkwx3lmc6hvqj6ivjrvy4m6fm2walnyk1zv24zli75"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From ce9c8a235d91526041345f95cafabb6387f2d2d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 172/221] haskell-language-haskell-extract: update to version 0.2.4 --- .../haskell/language-haskell-extract/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index 461c790c88b..a77040a5578 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, regexPosix }: +{ cabal, regexPosix }: cabal.mkDerivation (self: { pname = "language-haskell-extract"; - version = "0.2.3"; - sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr"; - buildDepends = [ haskellSrcExts regexPosix ]; + version = "0.2.4"; + sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + buildDepends = [ regexPosix ]; meta = { homepage = "http://github.com/finnsson/template-helper"; description = "Module to automatically extract functions from the local code"; From ba9c06dedb36eb8620f4bd3cca406cf28b50d860 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 173/221] haskell-lens: update to version 3.8.5 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e815d654b61..e7e40312af3 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.2"; - sha256 = "1spz4nyv1f7kf4bnw8qgqaks5kc4m0slzw0czj1wh1232w2sz15m"; + version = "3.8.5"; + sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable From c59690d29a8b280d859be05c2bbb963bba1c61a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 174/221] haskell-mime-types: update to version 0.1.0.3 --- 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 1bde4861b3a..5dd5f65c9e7 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.2"; - sha256 = "1pkhr8k23386qwa1wmlrcilz75di2l8n5kc4n8pnia05p49akfcs"; + version = "0.1.0.3"; + sha256 = "0mzhkqcjlnrs9mwn2crsr1m2mf6pgygs1s3ks8akz1618v6jm6y1"; buildDepends = [ text ]; meta = { homepage = "https://github.com/yesodweb/wai"; From d9bb07210a80d7733e9f4d7b0d8420b90e7a08ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 175/221] haskell-pandoc: update to version 1.10.1 --- 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 ed660062673..d53ddf7ad30 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.5"; - sha256 = "05mjgvxk3wxfssf4aviigdm6jb73a6bp8lwz86aabdgkgh2i6n54"; + version = "1.10.1"; + sha256 = "127pxs1w99nr6hdancaajm20w3vgmch4xlj0v7221y7i9qcr1y1y"; isLibrary = true; isExecutable = true; buildDepends = [ From 870bfea44069f2be3076550776191e9878350935 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 176/221] haskell-postgresql-libpq: update to version 0.8.2.2 --- .../libraries/haskell/postgresql-libpq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 040c931d1f6..90a92019f0e 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.1"; - sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; + version = "0.8.2.2"; + sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From 55343d26c36374ad822b0469090eb354adfcd67b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 177/221] haskell-shakespeare-js: update to version 1.1.2 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index a7238ba52eb..01bf73fd501 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.1"; - sha256 = "1xzhb3ipax2489311hmiaxp9i44099bsbclcj3ds0rhdfa62xarg"; + version = "1.1.2"; + sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n"; buildDepends = [ aeson shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 67a128958f27ae130c61238dba3600f397fe2773 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 178/221] haskell-shakespeare: update to version 1.0.3 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 11a03eaa9b2..14a70b44c4f 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.2"; - sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; + version = "1.0.3"; + sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 736e9958b43530aee24c8780c86a7959f503f759 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:41 +0100 Subject: [PATCH 179/221] haskell-snap-core: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 16df3f34756..8174c897a8c 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { MonadCatchIOTransformers mtl random regexPosix text time unixCompat unorderedContainers vector zlibEnum ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; From 7d41cdf238086d5cfb82b5828cf3e733932f36d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 180/221] haskell-snap-server: update to version 0.9.2.4 --- pkgs/development/libraries/haskell/snap/server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 7f8dc878024..9250666430c 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { caseInsensitive enumerator MonadCatchIOTransformers mtl network snapCore text time unixCompat ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; From 53e0d41689a7b73c0c92a3080be3a89c4581eb4c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 181/221] haskell-snap: update to version 0.11.0 --- .../libraries/haskell/snap/snap.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 30a2d34a99e..34ee639564d 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad -, configurator, directoryTree, dlist, errors, filepath, hashable -, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text -, time, transformers, unorderedContainers, vector, vectorAlgorithms -, xmlhtml +, configurator, directoryTree, dlist, either, errors, filepath +, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl +, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm +, syb, text, time, transformers, unorderedContainers, vector +, vectorAlgorithms, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.10.0.1"; - sha256 = "14j9lgcdyxh7n4yidfvn1r94nziljiqz6nsqgq114v34bnn6l2yn"; + version = "0.11.0"; + sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator - directoryTree dlist errors filepath hashable heist lens logict - MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb text time transformers + directoryTree dlist either errors filepath hashable heist lens + logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast + regexPosix snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; From a9660e65da5f7967420801923144258974eb3eba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 182/221] haskell-texmath: update to version 0.6.1.3 --- pkgs/development/libraries/haskell/texmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 78ec99da8db..581cede2e87 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "texmath"; - version = "0.6.1.2"; - sha256 = "1izsjy30saz2il16dwx8sh2s30b1pfgcpq6023v135w1bdrzrnmq"; + version = "0.6.1.3"; + sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From a46a0ee8ef535fd31c8db9ae73263ed49bac50ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 183/221] haskell-tls: update to version 1.1.2 --- pkgs/development/libraries/haskell/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 29b6b11d791..af7b4c57bb7 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.1"; - sha256 = "0ji83b5z3v6f6a6rgyj5xkjh9vvsqckr7ymzjnhb4zqf0mgymypq"; + version = "1.1.2"; + sha256 = "1vg1mnz6cxxgs48pbpjp4hwyvsysxyzvjfy4p1vd23lwc32cdjqg"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandomApi mtl network From 8a50c3d9ff3f7d3ef55c5b5a1c42518a44f89ebe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 184/221] haskell-wai-extra: update to version 1.3.2.1 --- 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 1f08f3f1fd4..9cebbde0009 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2"; - sha256 = "1089sfb4jyi17rw6nivpy96gbc90nyawr35jzwlzl41gzxxmv503"; + version = "1.3.2.1"; + sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network From c2e68b4019c352bacf205be3b2809e780c041088 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 185/221] haskell-wai-test: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 0c9b8eb2eb8..cff2cb31850 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0"; - sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + version = "1.3.0.1"; + sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai From 23140d9411ad33902ec37e66a541c3e2ada7c3bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:42 +0100 Subject: [PATCH 186/221] haskell-wai: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 56421b213d5..ee6eb288565 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.1"; - sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl"; + version = "1.3.0.2"; + sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 2603bc59b1b1b29e315f687a24ec475a8e03de81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 187/221] haskell-warp: update to version 1.3.7.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a36e873ca6..dd6bf66b676 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.1"; - sha256 = "0kabcxzjc686iayhxln2cmnxm3vk3h0685n4d4ybprv5h1nc6ghl"; + version = "1.3.7.2"; + sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile From ec34d4c497c1488e911c895cc28898a401a99a57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 188/221] haskell-yesod-auth: update to version 1.1.4 --- .../libraries/haskell/yesod-auth/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index dfa96bf2b13..67a43687092 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,5 +1,5 @@ { cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, liftedBase, mimeMail, network, persistent +, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent , persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.3"; - sha256 = "0rlp56jsb0cwm1z303b7l9iy5hbip18vlm7fisna4agbf4rj2k0z"; + version = "1.1.4"; + sha256 = "060548zbjsvf6zvixiyic729fd9862z3qwz349ric60jfa20cdpx"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - liftedBase mimeMail network persistent persistentTemplate pureMD5 - pwstoreFast random SHA shakespeareCss shakespeareJs text + httpTypes liftedBase mimeMail network persistent persistentTemplate + pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text transformers unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; From dfd6a80c772f4889217adce5c858f2c5ab9d624a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 189/221] haskell-yesod-core: update to version 1.1.8 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 65b24a4534c..bf13f7da174 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.7.1"; - sha256 = "07rh6yy8hz660hxz60gvminm166cb5was8qb1l24lrmzchigbf3r"; + version = "1.1.8"; + sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From f20eff4609eeca9358267746b8caaee32684b75e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:43 +0100 Subject: [PATCH 190/221] haskell-yesod-form: update to version 1.2.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 2d0a099002c..ae36c5180c3 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.0.2"; - sha256 = "0a3172rgvma420l98hkgvl17ks2a2jkys3rh4qd2bbm9p7qknv3y"; + version = "1.2.1"; + sha256 = "10xjpky7dglqbhc6i49q9ckkhq23wyyqd7karlp0byhprmspnifq"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From 3c7b8578a7c6b422da177a9b15484b7eec11266b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 191/221] haskell-yesod-routes: update to version 1.1.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index ec09a68e32c..c1dd27e377d 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.1.1"; - sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m"; + version = "1.1.2"; + sha256 = "17yv2z7k1s958xyn552wpk0cwpivsnkvia8477yhgbp4n2d1i5jv"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; From eb6c71ad5511acd529876d0dc1143a7178477af6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 192/221] haskell-yesod-static: update to version 1.1.2 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7923b6e9e8e..a47cc59ecc5 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.1.2"; - sha256 = "0x3vrzqqddi4fmbivmy5pi66jmnc5fh68j5fjfxn5nyhp4n6z0sw"; + version = "1.1.2"; + sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai From bd8ae3c5234d1dd1b10d0d3fe6514e108448640b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 193/221] haskell-yesod-test: update to version 0.3.3.1 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index b03274902e6..2d7496b3c1c 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3"; - sha256 = "1jb410r905wd26swh2rk59nbyy389gcfz261adhb69awmsyql5x3"; + version = "0.3.3.1"; + sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network From 4d11098bddace11d630e9bd17c9ff8d7c3663019 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 194/221] haskell-yesod: update to version 1.1.8 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 50365296270..c4f865d3e85 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.7.2"; - sha256 = "0mxxzcmp63sdn7g30ilp40dsj2iccajc9gpxycnqxqabdzhqkbm0"; + version = "1.1.8"; + sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; isLibrary = true; isExecutable = true; buildDepends = [ From e816889ccccfcac0a23693377bfda6224cd41066 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 11:29:44 +0100 Subject: [PATCH 195/221] haskell-hlint: update to version 1.8.43 --- 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 8f8e16dd260..c914e9c8225 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.42"; - sha256 = "03myq4wagx5d9g6v8znw4l67f1irami0fnlw48rxlqhfn33y5mgc"; + version = "1.8.43"; + sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6"; isLibrary = true; isExecutable = true; buildDepends = [ From 07fb82aef3f0514d3d6ceead42061777f8aa60fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 12:25:11 +0100 Subject: [PATCH 196/221] bash-completion: update to current git HEAD at 2.0-95-gd08b9f2 The 2.0 release is 7+ months old, and there has been lots of activity since. --- pkgs/shells/bash-completion/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 7e4c0f23015..217489f4dc0 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoconf, automake }: -let - version = "2.0"; -in stdenv.mkDerivation { - name = "bash-completion-${version}"; + name = "bash-completion-2.0-95-gd08b9f2"; - src = fetchurl { - url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2"; - sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; + src = fetchgit { + url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git"; + rev = "d08b9f233559b3dced20050ba312b08fe0de53b4"; + sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn"; }; + buildInputs = [ autoconf automake ]; + + preConfigure = "autoreconf -i"; + doCheck = true; meta = { @@ -18,6 +20,7 @@ stdenv.mkDerivation { description = "Programmable completion for the bash shell"; license = "GPL"; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } From 75fcdfbb9e3eb1a179833be886348157c1e17f50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 12:25:38 +0100 Subject: [PATCH 197/221] ghc-head: update to snapshot version 7.7.20121213 --- pkgs/development/compilers/ghc/head.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 67f2b4f5c7e..376033fe239 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20121106"; + version = "7.7.20121213"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; + sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p"; }; buildInputs = [ ghc perl gmp ncurses ]; From 80056ddc012dc545969515e97ddd88653c6fcbf0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Jan 2013 19:07:09 +0100 Subject: [PATCH 198/221] Add cowsay to the channel --- pkgs/tools/misc/cowsay/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 59978e2865c..a9bdf1b2b92 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -2,17 +2,22 @@ stdenv.mkDerivation { name = "cowsay-3.03"; + src = fetchurl { url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1bxj802na2si2bk5zh7n0b7c33mg8a5n2wnvh0vihl9bmjkp51hb"; + sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; }; - buildInputs = [perl]; + + buildInputs = [ perl ]; + installPhase = '' bash ./install.sh $out ''; meta = { - description = "cowsay is a program which generates ASCII pictures of a cow with a message."; + description = "A program which generates ASCII pictures of a cow with a message"; homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.rob ]; }; } From d330f6ff85194735d1f1710af547d4607bd7326d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 12:51:29 +0100 Subject: [PATCH 199/221] Nixpkgs channel: Use XZ compression for nixexprs.tar --- pkgs/top-level/make-tarball.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index e8d775a9a30..cd70773869d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -77,8 +77,7 @@ releaseTools.sourceTarball { mkdir ../$releaseName cp -prd . ../$releaseName echo nixpkgs > ../$releaseName/channel-name - (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false - (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false + (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false mkdir -p $out/release-notes cp doc/NEWS.html $out/release-notes/index.html From 8c0179bdde74422a4e2edcd930d7f7b558dc025f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 13:48:45 +0100 Subject: [PATCH 200/221] Make Stratego packages visible to nix-env --- 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 b732c671689..60252da5473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2650,7 +2650,7 @@ let stalin = callPackage ../development/compilers/stalin { }; - strategoPackages = strategoPackages018; + strategoPackages = recurseIntoAttrs strategoPackages018; strategoPackages016 = callPackage ../development/compilers/strategoxt/0.16.nix { stdenv = overrideInStdenv stdenv [gnumake380]; From 72cc82d49a2fe5cfba75f3ebed6772008889a115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 30 Jan 2013 14:36:50 +0100 Subject: [PATCH 201/221] Add PODIFF, a tool to diff PO files --- pkgs/tools/text/podiff/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/text/podiff/default.nix diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix new file mode 100644 index 00000000000..fc9e3785cf3 --- /dev/null +++ b/pkgs/tools/text/podiff/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "podiff-${version}"; + version = "1.1"; + + src = fetchurl { + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; + sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + }; + + patchPhase = '' + sed "s#PREFIX=/usr#PREFIX=$out#g" -i Makefile + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Finds differences in translations between two PO files, or revisions"; + homepage = http://puszcza.gnu.org.ua/software/podiff; + license = licenses.gpl3Plus; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60252da5473..84b4bc48587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1359,6 +1359,8 @@ let libpng = libpng12; }; + podiff = callPackage ../tools/text/podiff { }; + polipo = callPackage ../servers/polipo { }; polkit_gnome = callPackage ../tools/security/polkit-gnome { }; From e5b51648b1ccb218f83c5310a3b6b00ed3bdc581 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 14:52:53 +0100 Subject: [PATCH 202/221] Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. --- .../darwin/native-x11-and-opengl}/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{build-support/native-darwin-x11-and-opengl => os-specific/darwin/native-x11-and-opengl}/default.nix (100%) diff --git a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix similarity index 100% rename from pkgs/build-support/native-darwin-x11-and-opengl/default.nix rename to pkgs/os-specific/darwin/native-x11-and-opengl/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84b4bc48587..2b6866e553b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4590,7 +4590,7 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; + darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; mesa = if stdenv.isDarwin then darwinX11AndOpenGL else callPackage ../development/libraries/mesa { }; From bc4064af73bde28487c634c99ce44a9b5a23ef0d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 15:16:08 +0100 Subject: [PATCH 203/221] wpa_supplicant: Fix config generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘echo ${extraConfig}’ doesn't do the right thing if extraConfig contains newlines. This broke NixOS because CONFIG_DEBUG_SYSLOG=y wasn't processed. --- .../linux/wpa_supplicant/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index c74fc8d634f..3b77c7104ff 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl , readlineSupport ? true, readline }: -assert readlineSupport -> readline!=null; + +assert readlineSupport -> readline != null; stdenv.mkDerivation rec { version = "1.1"; @@ -12,21 +13,23 @@ stdenv.mkDerivation rec { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; - extraConfig = lib.concatStringsSep "\n" ( - [ "CONFIG_DEBUG_SYSLOG=y" - "CONFIG_CTRL_IFACE_DBUS=y" - "CONFIG_CTRL_IFACE_DBUS_NEW=y" - "CONFIG_CTRL_IFACE_DBUS_INTRO=y" - "CONFIG_DRIVER_NL80211=y" - "CONFIG_LIBNL32=y" - ] ++ lib.optional readlineSupport "CONFIG_READLINE=y" - ); + + extraConfig = + '' + CONFIG_DEBUG_SYSLOG=y + CONFIG_CTRL_IFACE_DBUS=y + CONFIG_CTRL_IFACE_DBUS_NEW=y + CONFIG_CTRL_IFACE_DBUS_INTRO=y + CONFIG_DRIVER_NL80211=y + CONFIG_LIBNL32=y + ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"} + ''; preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo ${extraConfig} | tee -a .config - echo CONFIG_LIBNL32=y | tee -a .config + echo "$extraConfig" >> .config + cat .config substituteInPlace Makefile --replace /usr/local $out ''; From 06c9353270039c5edc2f6fc0c6c81d05204ce3cf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 30 Jan 2013 15:42:40 +0100 Subject: [PATCH 204/221] Add awscli 0.5.0, updated some of its dependencies. --- pkgs/top-level/python-packages.nix | 67 +++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64fa96af7ce..4b878b9272c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -251,6 +251,17 @@ pythonPackages = python.modules // rec { }; }); + awscli = buildPythonPackage rec { + name = "awscli-0.5.0"; + + src = fetchurl { + url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; + sha256 = "0smgcisl2p7p2y2i299x7g271kdmgs0hnzngw5030phvh0lq202i"; + }; + + propagatedBuildInputs = [ argparse botocore ]; + + }; logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.1"; @@ -337,6 +348,27 @@ pythonPackages = python.modules // rec { }; + botocore = buildPythonPackage rec { + name = "botocore-0.5.2"; + + src = fetchurl { + url = https://github.com/boto/botocore/archive/0.5.2.tar.gz; + sha256 = "18073mydin0mwk1d7vdlmsiz3rvhjzxkaaqrmxw440acbipnngq2"; + }; + + propagatedBuildInputs = [ dateutil requests014 ]; + + meta = { + homepage = https://github.com/boto/botocore; + + license = "bsd"; + + description = "A low-level interface to a growing number of Amazon Web Services"; + + }; + }; + + # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; # @@ -576,13 +608,15 @@ pythonPackages = python.modules // rec { dateutil = buildPythonPackage (rec { - name = "dateutil-1.5"; + name = "dateutil-2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; - sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg"; + sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; }; + propagatedBuildInputs = [ six ]; + meta = { description = "Powerful extensions to the standard datetime module"; homepage = http://pypi.python.org/pypi/python-dateutil; @@ -2639,6 +2673,35 @@ pythonPackages = python.modules // rec { }; + requests = buildPythonPackage rec { + name = "requests-1.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "a0158815af244c32041a3147ee09abf3"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + requests014 = buildPythonPackage rec { + name = "requests-0.14.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; + md5 = "3de30600072cbc7214ae342d1d08aa46"; + }; + + meta = { + description = "Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.."; + homepage = http://docs.python-requests.org/en/latest/; + }; + }; + + reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.13"; From c343e1db77970bd7dfa98cdac644743b62c242c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Jan 2013 15:55:39 +0100 Subject: [PATCH 205/221] awscli: Remove Python prefix --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b878b9272c..154feb5c9c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -253,6 +253,7 @@ pythonPackages = python.modules // rec { awscli = buildPythonPackage rec { name = "awscli-0.5.0"; + namePrefix = ""; src = fetchurl { url = https://github.com/aws/aws-cli/archive/0.5.0.tar.gz; From 78487562836179a0d61eee26d44a921f0792c61b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:30:25 +0100 Subject: [PATCH 206/221] Parallel building is enabled again in GHC 7.6.2, because we hope the issues we've had with earlier versions have been remedied. If anyone experiences build errors with this package, please file issue at Github! --- pkgs/development/compilers/ghc/7.6.2.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index a62f2468a61..e10dcf08b77 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -12,19 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - # The comments below applied to GHC 7.6.1, left for if somebody experiences - # similar problems. If so, I argue we should selectively disable parallel - # building JUST for that platform. ~aristidb - # - ## My attempts to compile GHC with parallel build support enabled, failed - ## 4 consecutive times with the following error: - ## - ## building rts/dist/build/AutoApply.debug_o - ## building rts/dist/build/AutoApply.thr_o - ## rts_dist_HC rts/dist/build/AutoApply.debug_o - ## /nix/store/1iigiim5855m8j7pmwf5xrnpf705s4dh-binutils-2.21.1a/bin/ld: cannot find libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers_o_split/gmp-wrappers__1.o - ## collect2: ld returned 1 exit status - ## make[1]: *** [libraries/integer-gmp/dist-install/build/cbits/gmp-wrappers.p_o] Error 1 enableParallelBuilding = true; buildMK = '' From f929eecfa7209638ef1d9d86cb26db188be069ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:30:51 +0100 Subject: [PATCH 207/221] ghc-7.6.2: cosmetic, no functional change --- pkgs/development/compilers/ghc/7.6.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index e10dcf08b77..fd678d090a2 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure ''; - configureFlags=[ + configureFlags = [ "--with-gcc=${stdenv.gcc}/bin/gcc" ]; From abdd5bc538a7972ac393e422ea6029926ef54e04 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:47:45 +0100 Subject: [PATCH 208/221] Hide package sets for GHC 6.10.4, 6.12.3, 7.0.4, 7.4.1, and 7.6.1 from nix-env (and from Hydra). It is still possible to install any of those packages by referring to them by attribute: | $ nix-env -iA haskellPackages_ghc6104.hopenssl --dry-run | (dry run; not doing anything) | installing `haskell-hopenssl-ghc6.10.4-1.6.1' | these paths will be fetched (50.61 MiB download, 450.34 MiB unpacked): | /nix/store/rjsgga1fdqin47n2rkfn9l7v9ncsfh9l-haskell-hopenssl-ghc6.10.4-1.6.1 | /nix/store/y567qhqbjxbkldg3kq2clzn52a56cmdn-haskell-mtl-ghc6.10.4-1.1.0.2 | /nix/store/zbn24z1443fbrx6ch1nn2vnss9bdw1g0-ghc-6.10.4 It's no longer possible to install those by name anymore, though: | $ nix-env -i haskell-hopenssl-ghc6.10.4 | error: selector `haskell-hopenssl-ghc6.10.4' matches no derivations That style works only for active GHC versions 7.4.2 and 7.6.2: | $ nix-env -qaP \* | grep haskell-hopenssl | haskellPackages.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1 | haskellPackages_ghc742_no_profiling.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1 | haskellPackages_ghc742_profiling.hopenssl haskell-hopenssl-ghc7.4.2-1.6.1-profiling | haskellPackages_ghc762.hopenssl haskell-hopenssl-ghc7.6.2-1.6.1 These changes intend to ease the load on Hydra. If you desperately need pre-build binaries of any of those old versions, please post a short note on the nix-dev mailing list. --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b6866e553b..2fbe33cf145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2387,25 +2387,25 @@ let # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; - haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); + haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6121 = haskell.packages_ghc6121; haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = recurseIntoAttrs (haskell.packages_ghc6123); + haskellPackages_ghc6123 = haskell.packages_ghc6123; haskellPackages_ghc701 = haskell.packages_ghc701; haskellPackages_ghc702 = haskell.packages_ghc702; haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = recurseIntoAttrs (haskell.packages_ghc704); + haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc721 = haskell.packages_ghc721; haskellPackages_ghc722 = haskell.packages_ghc722; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc741 = haskell.packages_ghc741; haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); - haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); + haskellPackages_ghc761 = haskell.packages_ghc761; haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; From 23e7008a71bf606af38c480567866831d2b6251a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 30 Jan 2013 17:50:07 +0100 Subject: [PATCH 209/221] all-packages.nix: fix typos in the haskellPackages attribute sets for GHC 7.4.2 The haskellPackages_ghc742_{no_,}profiling set accidentally referred to the GHC 7.4.1 versions. --- 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 2fbe33cf145..be32e6e5946 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2402,8 +2402,8 @@ let # profiling and non-profiling versions; the final respects the user-configured # default setting. haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc742.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = haskell.packages_ghc761; haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); From 36f6f003feba394621a7dfdbb9de23fe0468944f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:23:55 +0100 Subject: [PATCH 210/221] docutils: updating to 0.10 mplayer2 required "rst2man.py", not available in 0.5. --- pkgs/development/tools/documentation/docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index 1630b0f4072..f6edcf54463 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.5" a; + version = a.lib.attrByPath ["version"] "0.10" a; buildInputs = with a; [ python pil makeWrapper ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l"; + sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip"; }; inherit buildInputs; From 10e12b76a5484a2168a2038bdc38a0b710e3d5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:24:24 +0100 Subject: [PATCH 211/221] ffmpeg 1.1: building libavresample It's disabled by default, but mplayer2 requires it (still). --- pkgs/development/libraries/ffmpeg/1.1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/ffmpeg/1.1.nix b/pkgs/development/libraries/ffmpeg/1.1.nix index a40b40d68be..7cb83db5e8d 100644 --- a/pkgs/development/libraries/ffmpeg/1.1.nix +++ b/pkgs/development/libraries/ffmpeg/1.1.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { "--enable-swscale" "--disable-ffplay" "--enable-shared" + "--enable-avresample" "--enable-runtime-cpudetect" ] ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" From 511f3b7a613c51192996a9d191ddaf17338a1f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 00:26:30 +0100 Subject: [PATCH 212/221] Adding mplayer2, a mplayer fork. It can play files very well with "vdpau". It has a reworked vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in my computer. --- pkgs/applications/video/mplayer2/default.nix | 132 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 136 insertions(+) create mode 100644 pkgs/applications/video/mplayer2/default.nix diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix new file mode 100644 index 00000000000..52b5b9f7bd4 --- /dev/null +++ b/pkgs/applications/video/mplayer2/default.nix @@ -0,0 +1,132 @@ +{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass +, python3, docutils, which +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? true, libvdpau ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, jackaudioSupport ? false, jackaudio ? null +, pulseSupport ? true, pulseaudio ? null +# For screenshots +, libpngSupport ? true, libpng ? null +, useUnfreeCodecs ? false +}: + +assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert xineramaSupport -> (libXinerama != null && x11Support); +assert xvSupport -> (libXv != null && x11Support); +assert alsaSupport -> alsaLib != null; +assert screenSaverSupport -> libXScrnSaver != null; +assert vdpauSupport -> libvdpau != null; +assert dvdnavSupport -> libdvdnav != null; +assert bluraySupport -> libbluray != null; +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert jackaudioSupport -> jackaudio != null; +assert pulseSupport -> pulseaudio != null; +assert libpngSupport -> libpng != null; + +let + + codecs_src = + let + dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + in + if stdenv.system == "i686-linux" then fetchurl { + url = "${dir}/essential-20071007.tar.bz2"; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + } else if stdenv.system == "x86_64-linux" then fetchurl { + url = "${dir}/essential-amd64-20071007.tar.bz2"; + sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; + } else if stdenv.system == "powerpc-linux" then fetchurl { + url = "${dir}/essential-ppc-20071007.tar.bz2"; + sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; + } else null; + + codecs = if codecs_src != null then stdenv.mkDerivation { + name = "MPlayer-codecs-essential-20071007"; + + src = codecs_src; + + installPhase = '' + mkdir $out + cp -prv * $out + ''; + + meta.license = "unfree"; + } else null; + +in + +stdenv.mkDerivation rec { + name = "mplayer2-20130130"; + + src = fetchgit { + url = "git://git.mplayer2.org/mplayer2.git"; + rev = "d3c580156c0b8777ff082426ebd61bb7ffe0c225"; + sha256 = "1akf2mb2zklz609ks555vjvcs1gw8nwg5kbb9jwra8c4v1dfyhys"; + }; + + prePatch = '' + sed -i /^_install_strip/d configure + ''; + + buildInputs = with stdenv.lib; + [ freetype pkgconfig ffmpeg libass docutils which ] + ++ optionals x11Support [ libX11 libXext mesa ] + ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional xineramaSupport libXinerama + ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] + ++ optional bluraySupport libbluray + ++ optional jackaudioSupport jackaudio + ++ optional pulseSupport pulseaudio + ++ optional screenSaverSupport libXScrnSaver + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex + ++ optional libpngSupport libpng + ; + + buildNativeInputs = [ yasm python3 ]; + + postConfigure = '' + patchShebangs TOOLS + ''; + + configureFlags = with stdenv.lib; + '' + ${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"} + ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + ${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"} + ${if xvSupport then "--enable-xv" else "--disable-xv"} + ${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I{libx11}/include" + else "--disable-x11 --disable-gl"} + --disable-xvid + --disable-ossaudio + ''; + + NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; + + enableParallelBuilding = true; + + # Provide a reasonable standard font. Maybe we should symlink here. + postInstall = + '' + mkdir -p $out/share/mplayer + cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf + ''; + + meta = { + description = "A movie player that supports many video formats (MPlayer fork)"; + homepage = "http://mplayer2.org"; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be32e6e5946..fd01a717281 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7541,6 +7541,10 @@ let pulseSupport = config.pulseaudio or false; }; + mplayer2 = callPackage ../applications/video/mplayer2 { + ffmpeg = ffmpeg_1_1; + }; + MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { inherit browser; From 86839c4a6da61acbe742b134d97b10155eb50561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 31 Jan 2013 17:01:13 +0100 Subject: [PATCH 213/221] iwlwifi-2030-ucode: url change --- pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix index 162423dbc05..bc9c8efe063 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-2030-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 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; }; From ebfc26b43df80f27b3f055c4a66ad3cc59eae687 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 31 Jan 2013 14:33:02 -0500 Subject: [PATCH 214/221] Update rubygems --- .../interpreters/ruby/generated.nix | 601 +++++++++--------- 1 file changed, 309 insertions(+), 292 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index bc50a08f29a..7c0afdffda4 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,69 +3,69 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_8_1; - actionmailer = g.actionmailer_3_2_6; - actionpack = g.actionpack_3_2_6; - activemodel = g.activemodel_3_2_6; - activerecord = g.activerecord_3_2_6; - activeresource = g.activeresource_3_2_6; - activesupport = g.activesupport_3_2_6; - addressable = g.addressable_2_2_8; + ZenTest = g.ZenTest_4_8_4; + actionmailer = g.actionmailer_3_2_11; + actionpack = g.actionpack_3_2_11; + activemodel = g.activemodel_3_2_11; + activerecord = g.activerecord_3_2_11; + activeresource = g.activeresource_3_2_11; + activesupport = g.activesupport_3_2_11; arel = g.arel_3_0_2; - atoulme_Antwrap = g.atoulme_Antwrap_0_7_2; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - builder = g.builder_3_0_0; - buildr = g.buildr_1_4_7; - bundler = g.bundler_1_1_4; - childprocess = g.childprocess_0_3_3; + builder = g.builder_3_1_4; + buildr = g.buildr_1_4_9; + bundler = g.bundler_1_2_3; + childprocess = g.childprocess_0_3_7; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; fakes3 = g.fakes3_0_1_5; - ffi = g.ffi_1_0_11; + ffi = g.ffi_1_3_1; highline = g.highline_1_6_2; hike = g.hike_1_2_1; - hoe = g.hoe_2_3_3; - i18n = g.i18n_0_6_0; + hoe = g.hoe_3_1_0; + i18n = g.i18n_0_6_1; journey = g.journey_1_0_4; - json = g.json_1_7_3; - json_pure = g.json_pure_1_7_3; - libwebsocket = g.libwebsocket_0_1_3; + jruby_pageant = g.jruby_pageant_1_1_1; + json = g.json_1_7_6; + json_pure = g.json_pure_1_7_6; mail = g.mail_2_4_4; mime_types = g.mime_types_1_19; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_3_6; + multi_json = g.multi_json_1_5_0; net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_5_2; + net_ssh = g.net_ssh_2_6_3; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; - rack = g.rack_1_4_1; + rack = g.rack_1_5_1; rack_cache = g.rack_cache_1_2; - rack_ssl = g.rack_ssl_1_3_2; - rack_test = g.rack_test_0_6_1; - rails = g.rails_3_2_6; - railties = g.railties_3_2_6; - rake = g.rake_0_9_2_2; - rb_fsevent = g.rb_fsevent_0_9_1; + rack_ssl = g.rack_ssl_1_3_3; + rack_test = g.rack_test_0_6_2; + rails = g.rails_3_2_11; + railties = g.railties_3_2_11; + rake = g.rake_10_0_3; + rb_fsevent = g.rb_fsevent_0_9_3; rdoc = g.rdoc_3_12; - rjb = g.rjb_1_4_0; - rspec = g.rspec_2_9_0; - rspec_core = g.rspec_core_2_9_0; - rspec_expectations = g.rspec_expectations_2_9_1; - rspec_mocks = g.rspec_mocks_2_9_0; + rjb = g.rjb_1_4_6; + rspec = g.rspec_2_11_0; + rspec_core = g.rspec_core_2_11_1; + rspec_expectations = g.rspec_expectations_2_11_3; + rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_1_20; - selenium_webdriver = g.selenium_webdriver_2_24_0; - sprockets = g.sprockets_2_1_3; - thor = g.thor_0_15_4; + sass = g.sass_3_2_5; + selenium_webdriver = g.selenium_webdriver_2_29_0; + sprockets = g.sprockets_2_2_2; + thor = g.thor_0_17_0; tilt = g.tilt_1_3_3; - treetop = g.treetop_1_4_10; - tzinfo = g.tzinfo_0_3_33; - xml_simple = g.xml_simple_1_0_12; + treetop = g.treetop_1_4_12; + tzinfo = g.tzinfo_0_3_35; + websocket = g.websocket_1_0_7; + xml_simple = g.xml_simple_1_1_1; }; gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { - ZenTest_4_8_1 = { + ZenTest_4_8_4 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -92,89 +92,75 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.8.1''; + name = ''ZenTest-4.8.4''; requiredGems = [ ]; - sha256 = ''0jp86czz16b0wamxvzs8p7pxwagj68h2zch9yjmjk7b069xrsg3v''; + sha256 = ''074k8smn2qfyyh32r0pja0wpcxbvlb6bhsc7rqrcjrisdjkngkrr''; }; - actionmailer_3_2_6 = { + actionmailer_3_2_11 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.6''; + name = ''actionmailer-3.2.11''; requiredGems = [ g.mail_2_4_4 ]; - sha256 = ''1h9035i9rnh98pc4z073cpcjjkwcswjigg1a3a6ll0s9lb6dnk54''; + sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn''; }; - actionpack_3_2_6 = { + actionpack_3_2_11 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.6''; - requiredGems = [ g.activemodel_3_2_6 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_4 g.sprockets_2_1_3 g.erubis_2_7_0 ]; - sha256 = ''1qwy7p353sp3x3crinfsx873vfrc84bfy61hz95qhy8anq03ay34''; + name = ''actionpack-3.2.11''; + requiredGems = [ g.activemodel_3_2_11 g.rack_cache_1_2 g.rack_1_4_4 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; }; - activemodel_3_2_6 = { + activemodel_3_2_11 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.6''; - requiredGems = [ ]; - sha256 = ''18bvwpfxr6kp66b62n17qgn7bb02va6bvckips36cxrkznafsk6j''; + name = ''activemodel-3.2.11''; + requiredGems = [ g.builder_3_0_4 ]; + sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf''; }; - activerecord_3_2_6 = { + activerecord_3_2_11 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.6''; - requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ]; - sha256 = ''1xc901m3a85j28bn2f96fh9c5y4wq4xivympm32xj4zr2ib20c2m''; + name = ''activerecord-3.2.11''; + requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_35 ]; + sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw''; }; - activeresource_3_2_6 = { + activeresource_3_2_11 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.6''; + name = ''activeresource-3.2.11''; requiredGems = [ ]; - sha256 = ''1lyv64rccgrdfhzccxj9qm5dnjy212x4q1nc21mf2xf2nc4zi33a''; + sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h''; }; - activesupport_3_2_6 = { + activesupport_3_2_11 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.6''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_6 ]; - sha256 = ''00jlixc7pkifikdgkjmgxypx8rizj3jizhjcpi4v9hd72yw8m7j2''; - }; - addressable_2_2_8 = { - basename = ''addressable''; - meta = { - description = ''URI Implementation''; - homepage = ''http://addressable.rubyforge.org/''; - longDescription = ''Addressable is a replacement for the URI implementation that is part of -Ruby's standard library. It more closely conforms to the relevant RFCs and -adds support for IRIs and URI templates. -''; - }; - name = ''addressable-2.2.8''; - requiredGems = [ ]; - sha256 = ''1zrwrs5aji7ah2qh4x47f4j85s3sdsrrx4xayyhnrcykcg7s4n49''; + name = ''activesupport-3.2.11''; + requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ]; + sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s''; }; arel_3_0_2 = { basename = ''arel''; @@ -194,7 +180,7 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx''; }; - atoulme_Antwrap_0_7_2 = { + atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; meta = { description = ''A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.''; @@ -212,9 +198,9 @@ database compatibility and query generation.''; Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; - name = ''atoulme-Antwrap-0.7.2''; - requiredGems = [ ]; - sha256 = ''0r9l3cn0gjck5q00djas5h43pr64pjvafhz6f7zhki4qqkwbb6j3''; + name = ''atoulme-Antwrap-0.7.4''; + requiredGems = [ g.rjb_1_4_6 ]; + sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; }; autotest_rails_4_1_2 = { basename = ''autotest_rails''; @@ -225,21 +211,10 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_8_1 ]; + requiredGems = [ g.ZenTest_4_8_4 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - builder_2_1_2 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data simple to do. Currently the following builder objects are supported: * XML Markup * XML Events''; - }; - name = ''builder-2.1.2''; - requiredGems = [ ]; - sha256 = ''0hp5gsvp63mqqvi7dl95zwci916vj6l1slgz4crip1rijk3v2806''; - }; - builder_3_0_0 = { + builder_3_0_4 = { basename = ''builder''; meta = { description = ''Builders for MarkUp.''; @@ -251,11 +226,43 @@ simple to do. Currently the following builder objects are supported: * XML Events ''; }; - name = ''builder-3.0.0''; + name = ''builder-3.0.4''; requiredGems = [ ]; - sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; + sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1''; }; - buildr_1_4_7 = { + builder_3_1_3 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.1.3''; + requiredGems = [ ]; + sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him''; + }; + builder_3_1_4 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.1.4''; + requiredGems = [ ]; + sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p''; + }; + buildr_1_4_9 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -267,31 +274,31 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.7''; - requiredGems = [ g.rake_0_9_2_2 g.builder_2_1_2 g.net_ssh_2_3_0 g.net_sftp_2_0_5 g.rubyzip_0_9_4 g.highline_1_6_2 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_4_0 g.atoulme_Antwrap_0_7_2 g.diff_lcs_1_1_3 g.rspec_expectations_2_9_0 g.rspec_mocks_2_9_0 g.rspec_core_2_9_0 g.rspec_2_9_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; - sha256 = ''0ddb71xgdjxvkf485c16kvip8i26wy4l171pjbw04qmy3cank42h''; + name = ''buildr-1.4.9''; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 ]; + sha256 = ''1ws8cdc7ylfq0aqbcmgwj3d8jxh8lp8zgxx0w0a7ippvvjjxb7az''; }; - bundler_1_1_4 = { + bundler_1_2_3 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.1.4''; + name = ''bundler-1.2.3''; requiredGems = [ ]; - sha256 = ''13pj4kk01xrdmdvgz1mvvhnbp1vi40gq50n8wdk3lpqp5za26gr0''; + sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w''; }; - childprocess_0_3_3 = { + childprocess_0_3_7 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.3''; - requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''0yqlbxnc427lnh1xw71qyzkic1pdpmacqxp8zw0gvx7yzkw3fjr0''; + name = ''childprocess-0.3.7''; + requiredGems = [ g.ffi_1_3_1 ]; + sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84''; }; diff_lcs_1_1_3 = { basename = ''diff_lcs''; @@ -348,23 +355,19 @@ is the MIT license.''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; name = ''fakes3-0.1.5''; - requiredGems = [ g.thor_0_15_4 g.builder_3_0_0 ]; + requiredGems = [ g.thor_0_17_0 g.builder_3_1_4 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; - ffi_1_0_11 = { + ffi_1_3_1 = { basename = ''ffi''; meta = { - description = ''Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code''; + description = ''Ruby FFI''; homepage = ''http://wiki.github.com/ffi/ffi''; - longDescription = ''Ruby-FFI is a ruby extension for programmatically loading dynamic -libraries, binding functions within them, and calling those functions -from Ruby code. Moreover, a Ruby-FFI extension works without changes -on Ruby and JRuby. Discover why should you write your next extension -using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].''; + longDescription = ''Ruby FFI library''; }; - name = ''ffi-1.0.11''; + name = ''ffi-1.3.1''; requiredGems = [ ]; - sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b''; + sha256 = ''0hbrfwgaw3ilmb47lvg9gzdnnfs0q0dzp6dki7rphcvsgirhp0sb''; }; highline_1_6_2 = { basename = ''highline''; @@ -392,46 +395,36 @@ minutes of work. requiredGems = [ ]; sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b''; }; - hoe_2_3_3 = { + hoe_3_1_0 = { basename = ''hoe''; meta = { description = ''Hoe is a rake/rubygems helper for project Rakefiles''; - homepage = ''http://rubyforge.org/projects/seattlerb/''; - longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps generate -rubygems and includes a dynamic plug-in system allowing for easy -extensibility. Hoe ships with plug-ins for all your usual project -tasks including rdoc generation, testing, packaging, and deployment. + homepage = ''http://www.zenspider.com/projects/hoe.html''; + longDescription = ''Hoe is a rake/rubygems helper for project Rakefiles. It helps you +manage, maintain, and release your project and includes a dynamic +plug-in system allowing for easy extensibility. Hoe ships with +plug-ins for all your usual project tasks including rdoc generation, +testing, packaging, deployment, and announcement.. -Plug-ins Provided: +See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed +below. -* Hoe::Clean -* Hoe::Debug -* Hoe::Deps -* Hoe::Flay -* Hoe::Flog -* Hoe::Inline -* Hoe::Package -* Hoe::Publish -* Hoe::RCov -* Hoe::Signing -* Hoe::Test - -See class rdoc for help. Hint: ri Hoe''; +For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; - name = ''hoe-2.3.3''; - requiredGems = [ g.rubyforge_2_0_4 ]; - sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m''; + name = ''hoe-3.1.0''; + requiredGems = [ g.rake_0_9_6 ]; + sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp''; }; - i18n_0_6_0 = { + i18n_0_6_1 = { basename = ''i18n''; meta = { description = ''New wave Internationalization support for Ruby''; homepage = ''http://github.com/svenfuchs/i18n''; longDescription = ''New wave Internationalization support for Ruby.''; }; - name = ''i18n-0.6.0''; + name = ''i18n-0.6.1''; requiredGems = [ ]; - sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; + sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl''; }; journey_1_0_4 = { basename = ''journey''; @@ -444,49 +437,49 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l''; }; - json_1_7_3 = { + jruby_pageant_1_1_1 = { + basename = ''jruby_pageant''; + meta = { + description = ''jruby-pageant allows Pageant access on JRuby + Windows''; + homepage = ''http://github.com/arturaz/jruby-pageant''; + longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.''; + }; + name = ''jruby-pageant-1.1.1''; + requiredGems = [ ]; + sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; + }; + json_1_7_6 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.3''; + name = ''json-1.7.6''; requiredGems = [ ]; - sha256 = ''1n969j5k0zb7dqfbnjhqm5hnxpsbi05rhsp5ww3cph7d5z6ycw0h''; + sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a''; }; - json_pure_1_4_3 = { + json_pure_1_7_5 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.4.3''; + name = ''json_pure-1.7.5''; requiredGems = [ ]; - sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r''; + sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; }; - json_pure_1_7_3 = { + json_pure_1_7_6 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.3''; + name = ''json_pure-1.7.6''; requiredGems = [ ]; - sha256 = ''0m316halw0l1gd2lx811qhyfs9a98dfgxign8zij0a1wn9wsh2ci''; - }; - libwebsocket_0_1_3 = { - basename = ''libwebsocket''; - meta = { - description = ''Universal Ruby library to handle WebSocket protocol''; - homepage = ''http://github.com/imanel/libwebsocket''; - longDescription = ''Universal Ruby library to handle WebSocket protocol''; - }; - name = ''libwebsocket-0.1.3''; - requiredGems = [ g.addressable_2_2_8 ]; - sha256 = ''12i3lyjd9dqvk9wpnrz9zzj7dgb6660dz8xlc7h1nixhsny1y83n''; + sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00''; }; mail_2_4_4 = { basename = ''mail''; @@ -496,7 +489,7 @@ See class rdoc for help. Hint: ri Hoe''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_19 g.treetop_1_4_10 ]; + requiredGems = [ g.mime_types_1_19 g.treetop_1_4_12 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; mime_types_1_19 = { @@ -530,16 +523,16 @@ longer happen. requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_3_6 = { + multi_json_1_5_0 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.3.6''; + name = ''multi_json-1.5.0''; requiredGems = [ ]; - sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; + sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -549,30 +542,30 @@ longer happen. longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_5_2 ]; + requiredGems = [ g.net_ssh_2_6_3 ]; sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; - net_ssh_2_3_0 = { - basename = ''net_ssh''; - meta = { - description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; - longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - }; - name = ''net-ssh-2.3.0''; - requiredGems = [ ]; - sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv''; - }; - net_ssh_2_5_2 = { + net_ssh_2_6_0 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; homepage = ''http://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.5.2''; + name = ''net-ssh-2.6.0''; + requiredGems = [ g.jruby_pageant_1_1_1 ]; + sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; + }; + net_ssh_2_6_3 = { + basename = ''net_ssh''; + meta = { + description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; + homepage = ''http://github.com/net-ssh/net-ssh''; + longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; + }; + name = ''net-ssh-2.6.3''; requiredGems = [ ]; - sha256 = ''0kalahmwz9ypglrgg29wlvr4wx381pqwmx9fq3pk600v3j7j018l''; + sha256 = ''1gmrchx9cn7s7ca97kwhrdxvlw5vs3cxpprrvqmhmi3knmnqcp9m''; }; nix_0_1_1 = { basename = ''nix''; @@ -599,23 +592,41 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_4_1 = { + rack_1_4_4 = { basename = ''rack''; meta = { description = ''a modular Ruby webserver interface''; - homepage = ''http://rack.rubyforge.org''; + homepage = ''http://rack.github.com/''; longDescription = ''Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call. -Also see http://rack.rubyforge.org. +Also see http://rack.github.com/. ''; }; - name = ''rack-1.4.1''; + name = ''rack-1.4.4''; requiredGems = [ ]; - sha256 = ''1cx3wzg48pn4sbb6a0iq726fjh3q7y77fly81mfnprrnwp7d0190''; + sha256 = ''1h0x50ng1s2jy6h5adw4a430vz8x28nskq099x3pjlpns6q632vz''; + }; + rack_1_5_1 = { + basename = ''rack''; + meta = { + description = ''a modular Ruby webserver interface''; + homepage = ''http://rack.github.com/''; + longDescription = ''Rack provides a minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.github.com/. +''; + }; + name = ''rack-1.5.1''; + requiredGems = [ ]; + sha256 = ''113gzaha2qx74y0wl940zlzrn9357yww6zrbyva05d09l749d21r''; }; rack_cache_1_2 = { basename = ''rack_cache''; @@ -625,10 +636,10 @@ Also see http://rack.rubyforge.org. longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.''; }; name = ''rack-cache-1.2''; - requiredGems = [ g.rack_1_4_1 ]; + requiredGems = [ g.rack_1_5_1 ]; sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; }; - rack_ssl_1_3_2 = { + rack_ssl_1_3_3 = { basename = ''rack_ssl''; meta = { description = ''Force SSL/TLS in your app.''; @@ -636,11 +647,11 @@ Also see http://rack.rubyforge.org. longDescription = '' Rack middleware to force SSL/TLS. ''; }; - name = ''rack-ssl-1.3.2''; + name = ''rack-ssl-1.3.3''; requiredGems = [ ]; - sha256 = ''1h9pfn5c95qigkm1vb5nbla7fwjl86q887w57iiqp4kdvrjh9wrn''; + sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5''; }; - rack_test_0_6_1 = { + rack_test_0_6_2 = { basename = ''rack_test''; meta = { description = ''Simple testing API built on Rack''; @@ -650,31 +661,31 @@ own or as a reusable starting point for Web frameworks and testing libraries to build on. Most of its initial functionality is an extraction of Merb 1.0's request helpers feature.''; }; - name = ''rack-test-0.6.1''; + name = ''rack-test-0.6.2''; requiredGems = [ ]; - sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; + sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_3_2_6 = { + rails_3_2_11 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.6''; - requiredGems = [ g.activesupport_3_2_6 g.actionpack_3_2_6 g.activerecord_3_2_6 g.activeresource_3_2_6 g.actionmailer_3_2_6 g.railties_3_2_6 g.bundler_1_1_4 ]; - sha256 = ''184ys6yfdclv59x0wk7dxx6ss60bv5vsi89nf8n85sh4mn19sf2m''; + name = ''rails-3.2.11''; + requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ]; + sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m''; }; - railties_3_2_6 = { + railties_3_2_11 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.6''; - requiredGems = [ g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''1qyb4kcg2ld86qp411njr6cxfhv2ddw3jghk2rbr8d5f1ci7gfdh''; + name = ''railties-3.2.11''; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.rdoc_3_12 ]; + sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -687,16 +698,38 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rb_fsevent_0_9_1 = { + rake_0_9_6 = { + basename = ''rake''; + meta = { + description = ''Ruby based make-like utility.''; + homepage = ''http://rake.rubyforge.org''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + }; + name = ''rake-0.9.6''; + requiredGems = [ ]; + sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc''; + }; + rake_10_0_3 = { + basename = ''rake''; + meta = { + description = ''Ruby based make-like utility.''; + homepage = ''http://rake.rubyforge.org''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + }; + name = ''rake-10.0.3''; + requiredGems = [ ]; + sha256 = ''09vvf3ylhdkr10vz7ajl3c7ql6dsnzkh3qclpafar433bzadfbpf''; + }; + rb_fsevent_0_9_3 = { basename = ''rb_fsevent''; meta = { description = ''Very simple & usable FSEvents API''; homepage = ''http://rubygems.org/gems/rb-fsevent''; longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; }; - name = ''rb-fsevent-0.9.1''; + name = ''rb-fsevent-0.9.3''; requiredGems = [ ]; - sha256 = ''02vgavzfsvzm0p9xvy314nnjixym82f2s58pw2i6d7p81yhvhsyh''; + sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; rdoc_3_12 = { basename = ''rdoc''; @@ -710,10 +743,10 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ g.json_1_7_3 ]; + requiredGems = [ g.json_1_7_6 ]; sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; - rjb_1_4_0 = { + rjb_1_4_2 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -721,82 +754,65 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.0''; + name = ''rjb-1.4.2''; requiredGems = [ ]; - sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3''; + sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh''; }; - rspec_2_9_0 = { + rjb_1_4_6 = { + basename = ''rjb''; + meta = { + description = ''Ruby Java bridge''; + homepage = ''http://rjb.rubyforge.org/''; + longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. +''; + }; + name = ''rjb-1.4.6''; + requiredGems = [ ]; + sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20''; + }; + rspec_2_11_0 = { basename = ''rspec''; meta = { - description = ''rspec-2.9.0''; + description = ''rspec-2.11.0''; homepage = ''http://github.com/rspec''; longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.9.0''; - requiredGems = [ g.rspec_expectations_2_9_1 ]; - sha256 = ''02r1cg82xia5vls4zq2dchmgdig8rpky8rivsqbckczr5k9w0hwv''; + name = ''rspec-2.11.0''; + requiredGems = [ ]; + sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs''; }; - rspec_core_2_9_0 = { + rspec_core_2_11_1 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.9.0''; + description = ''rspec-core-2.11.1''; homepage = ''http://github.com/rspec/rspec-core''; longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.9.0''; + name = ''rspec-core-2.11.1''; requiredGems = [ ]; - sha256 = ''17wc7mqrwl0zzrx3gywf4w931vfdig1spyvl46fyqakf36shyknd''; + sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4''; }; - rspec_expectations_2_9_0 = { + rspec_expectations_2_11_3 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.9.0''; + description = ''rspec-expectations-2.11.3''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.9.0''; + name = ''rspec-expectations-2.11.3''; requiredGems = [ ]; - sha256 = ''0pdws2zdi1h7mx0dqhkx6l5sqvrnpkrvqsnxvpmxk413db7li34x''; + sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5''; }; - rspec_expectations_2_9_1 = { - basename = ''rspec_expectations''; - meta = { - description = ''rspec-expectations-2.9.1''; - homepage = ''http://github.com/rspec/rspec-expectations''; - longDescription = ''rspec expectations (should[_not] and matchers)''; - }; - name = ''rspec-expectations-2.9.1''; - requiredGems = [ ]; - sha256 = ''1vb7axdg76naml7i6zd45ry4gszs274xfqk1w617z0719mc557gc''; - }; - rspec_mocks_2_9_0 = { + rspec_mocks_2_11_3 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.9.0''; + description = ''rspec-mocks-2.11.3''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.9.0''; + name = ''rspec-mocks-2.11.3''; requiredGems = [ ]; - sha256 = ''10mp152j5l0r3mqqhxq35m3slamzdzwsm9qnf6chh0l3zx5dwifg''; - }; - rubyforge_2_0_3 = { - basename = ''rubyforge''; - meta = { - description = ''A script which automates a limited set of rubyforge operations''; - homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; - longDescription = ''A script which automates a limited set of rubyforge operations. - -* Run 'rubyforge help' for complete usage. -* Setup: For first time users AND upgrades to 0.4.0: - * rubyforge setup (deletes your username and password, so run sparingly!) - * edit ~/.rubyforge/user-config.yml - * rubyforge config -* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; - }; - name = ''rubyforge-2.0.3''; - requiredGems = [ g.json_pure_1_7_3 ]; - sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p''; + sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg''; }; rubyforge_2_0_4 = { basename = ''rubyforge''; @@ -813,19 +829,9 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.4''; - requiredGems = [ ]; + requiredGems = [ g.json_pure_1_7_6 ]; sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; }; - rubyzip_0_9_4 = { - basename = ''rubyzip''; - meta = { - description = ''rubyzip is a ruby module for reading and writing zip files''; - homepage = ''http://rubyzip.sourceforge.net/''; - }; - name = ''rubyzip-0.9.4''; - requiredGems = [ ]; - sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; - }; rubyzip_0_9_9 = { basename = ''rubyzip''; meta = { @@ -836,7 +842,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_1_20 = { + sass_3_2_5 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -847,42 +853,42 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.20''; + name = ''sass-3.2.5''; requiredGems = [ ]; - sha256 = ''1aw2n5vg82d7ajx9wpyfrx6v1ddxhk73j77dkwjgsmlgci5lab8a''; + sha256 = ''1ys7pfadw61dm09yyk28zrssi8zsyj99fyq6bdf2xmi8yp1avs6k''; }; - selenium_webdriver_2_24_0 = { + selenium_webdriver_2_29_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.24.0''; - requiredGems = [ g.rubyzip_0_9_9 g.childprocess_0_3_3 g.libwebsocket_0_1_3 ]; - sha256 = ''0iricx2gglza44s92jhk7w44g2pbvg23jr5s0g3nggq7dc5mh48f''; + name = ''selenium-webdriver-2.29.0''; + requiredGems = [ g.childprocess_0_3_7 g.websocket_1_0_7 ]; + sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; - sprockets_2_1_3 = { + sprockets_2_2_2 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.1.3''; + name = ''sprockets-2.2.2''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; - sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh''; + sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; - thor_0_15_4 = { + thor_0_17_0 = { basename = ''thor''; meta = { description = ''A scripting framework that replaces rake, sake and rubigen''; - homepage = ''http://github.com/wycats/thor''; + homepage = ''http://whatisthor.com/''; longDescription = ''A scripting framework that replaces rake, sake and rubigen''; }; - name = ''thor-0.15.4''; + name = ''thor-0.17.0''; requiredGems = [ ]; - sha256 = ''1q4y34p4v0ipr6z5wcnc6n1mwfysrgjcibc1ls7rbdfzx4sdcic8''; + sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2''; }; tilt_1_3_3 = { basename = ''tilt''; @@ -895,36 +901,47 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8''; }; - treetop_1_4_10 = { + treetop_1_4_12 = { basename = ''treetop''; meta = { description = ''A Ruby-based text parsing and interpretation DSL''; - homepage = ''http://functionalform.blogspot.com''; + homepage = ''https://github.com/cjheath/treetop''; }; - name = ''treetop-1.4.10''; + name = ''treetop-1.4.12''; requiredGems = [ g.polyglot_0_3_3 ]; - sha256 = ''01f4w7fm6phhdbkx7bp0b58hrk3x4b0a63p2vvjbxm5gi2gv9ap2''; + sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; }; - tzinfo_0_3_33 = { + tzinfo_0_3_35 = { basename = ''tzinfo''; meta = { description = ''Daylight-savings aware timezone library''; homepage = ''http://tzinfo.rubyforge.org/''; longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.33''; + name = ''tzinfo-0.3.35''; requiredGems = [ ]; - sha256 = ''0bgfbm2amclg6amf1g1pyw4bkpmavqzf2hq7w9466xz08z1zsv1p''; + sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp''; }; - xml_simple_1_0_12 = { + websocket_1_0_7 = { + basename = ''websocket''; + meta = { + description = ''Universal Ruby library to handle WebSocket protocol''; + homepage = ''http://github.com/imanel/websocket-ruby''; + longDescription = ''Universal Ruby library to handle WebSocket protocol''; + }; + name = ''websocket-1.0.7''; + requiredGems = [ ]; + sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; + }; + xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { description = ''A simple API for XML processing.''; homepage = ''http://xml-simple.rubyforge.org''; }; - name = ''xml-simple-1.0.12''; + name = ''xml-simple-1.1.1''; requiredGems = [ ]; - sha256 = ''0m7z3l8ccm3zd22gyx40fnfl0nah61jaigb4bkmplq0hdazyj60y''; + sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i''; }; }; } From 5bd9baa141d246de8967e10d45b12015cce4ebd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Jan 2013 21:10:37 +0100 Subject: [PATCH 215/221] gnufdisk: update the alpha-version, no hydra now It builds now. --- pkgs/tools/system/fdisk/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 5a34813d8d9..988989b82f7 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -1,19 +1,19 @@ -{ fetchurl, stdenv, parted, libuuid, gettext }: +{ fetchurl, stdenv, parted, libuuid, gettext, guile }: stdenv.mkDerivation rec { - name = "fdisk-1.3.0a"; + name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html src = fetchurl { - url = "mirror://gnu/fdisk/${name}.tar.bz2"; - sha256 = "1g2zvl560f7p1hd4q50d1msy6qp7949mdkagfy8ki8cayp8fp267"; + url = "mirror://gnu/fdisk/${name}.tar.gz"; + sha256 = "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"; }; - buildInputs = [ parted libuuid gettext ]; + buildInputs = [ parted libuuid gettext guile ]; doCheck = true; meta = { - description = "GNU fdisk, a command-line disk partitioning tool"; + description = "A command-line disk partitioning tool"; longDescription = '' GNU fdisk provides alternatives to util-linux fdisk and util-linux @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; + #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd01a717281..07ab2f1a7b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -727,8 +727,6 @@ let fcron = callPackage ../tools/system/fcron { }; - fdisk = callPackage ../tools/system/fdisk { }; - fdm = callPackage ../tools/networking/fdm {}; figlet = callPackage ../tools/misc/figlet { }; @@ -813,6 +811,10 @@ let inherit (xorg) libXpm; }; + gnufdisk = callPackage ../tools/system/fdisk { + guile = guile_1_8; + }; + gnugrep = # Use libiconv only on non-GNU platforms (we can't test with # `stdenv ? glibc' at this point.) From 00258a362d6d9571d1e16524c5ee17fe0ef824a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Jan 2013 22:16:31 +0100 Subject: [PATCH 216/221] liboil: update, incl. a patch from Gentoo --- pkgs/development/libraries/liboil/default.nix | 11 ++++-- .../libraries/liboil/x86_64-cpuid.patch | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/liboil/x86_64-cpuid.patch diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 05cafecff27..45f75b4f805 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, pkgconfig, glib }: +{stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec { - name = "liboil-0.3.15"; + name = "liboil-0.3.17"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3zcl54sf21cf2ckzny16ihymz8whi60ymyrhmd3m1dlw1knpmf"; + sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh"; }; - buildInputs = [pkgconfig glib]; + buildInputs = [ pkgconfig ]; + + patches = [ ./x86_64-cpuid.patch ]; meta = { homepage = http://liboil.freedesktop.org; description = "A library of simple functions that are optimized for various CPUs"; + license = "BSD-2"; }; } diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/development/libraries/liboil/x86_64-cpuid.patch new file mode 100644 index 00000000000..d86dd79c3bc --- /dev/null +++ b/pkgs/development/libraries/liboil/x86_64-cpuid.patch @@ -0,0 +1,38 @@ +From 705916007fba0a845229a02dc6474cb523eff150 Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Tue, 20 Jul 2010 21:05:26 +0000 +Subject: x86: Fix cpuid function on x86-64 + +Fixes: #28956. +--- +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index e7a1978..ef4d3f2 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); +-- +cgit v0.9.0.2-2-gbebe From da3be9c6b23ac6677821597223c142034b2b7c91 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 00:39:26 -0500 Subject: [PATCH 217/221] Add deepSeq lib function --- pkgs/lib/attrsets.nix | 3 ++- pkgs/lib/lists.nix | 4 ++++ pkgs/lib/trivial.nix | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 5e0ab620865..fcdc3c31f29 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,7 +5,7 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./lists.nix) concatMap concatLists all deepSeqList; inherit (import ./misc.nix) maybeAttr; }; @@ -314,4 +314,5 @@ rec { overrideExisting = old: new: old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old)); + deepSeqAttrs = x: y: deepSeqList (attrValues x) y; } diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index ede7018fb23..0916355568c 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,4 +1,7 @@ # General list operations. +with { + inherit (import ./trivial.nix) deepSeq; +}; rec { inherit (builtins) head tail length isList add sub lessThan; @@ -220,4 +223,5 @@ rec { ++ zipTwoLists (tail xs) (tail ys) else []; + deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; } diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix index af47a8c8841..e971dd6d80e 100644 --- a/pkgs/lib/trivial.nix +++ b/pkgs/lib/trivial.nix @@ -1,3 +1,8 @@ +with { + inherit (import ./lists.nix) deepSeqList; + inherit (import ./attrsets.nix) deepSeqAttrs; +}; + rec { # Identity function. @@ -22,4 +27,10 @@ rec { # evaluation of its first argument. seq = x: y: if x == null then y else y; + deepSeq = x: y: + if builtins.isList x + then deepSeqList x y + else if builtins.isAttrs x + then deepSeqAttrs x y + else seq x y; } From 959dd6399c64fed1e3a26c8ec35ce2f5b31e8973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 1 Feb 2013 22:16:56 +0100 Subject: [PATCH 218/221] wget: update to 1.14 The 1.13.4 took for me 2G of RAM while doing: wget -r -l 1 -k https://fosdem.org/2013/schedule/events/ --- pkgs/tools/networking/wget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 799c5e9dd85..3199c1cadb8 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.13.4"; + name = "wget-1.14"; src = fetchurl { - url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; + url = "mirror://gnu/wget/${name}.tar.xz"; + sha256 = "0yqllj3nv9p3vqbdm6j4nvpjcwf1y19rq8sd966nrbd2qvvxfq8p"; }; preConfigure = stdenv.lib.optionalString doCheck From aa703a2b44c5be8a98efd538b6bd6c7314645113 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 16:50:11 -0500 Subject: [PATCH 219/221] gnu-efi: bump to version 3.0s --- pkgs/development/libraries/gnu-efi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 731b44aa0ec..ca24db94cd0 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -2,12 +2,13 @@ , fetchurl }: -stdenv.mkDerivation { - name = "gnu-efi-3.0r"; +let version = "3.0s"; in stdenv.mkDerivation { + + name = "gnu-efi-${version}"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz"; - sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5"; + url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; + sha256 = "18bpswzkj81dadq1b7n2s9g0cz60l34ggzxlq21mb8va10j9zmhh"; }; meta = { From f5f5eff924a4bfbc0a67a4f5ac328d60605669d0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 17:42:19 -0500 Subject: [PATCH 220/221] Add gummiboot UEFI boot manager --- pkgs/tools/misc/gummiboot/default.nix | 28 ++++++++++++++++++++++++++ pkgs/tools/misc/gummiboot/no-usr.patch | 20 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/gummiboot/default.nix create mode 100644 pkgs/tools/misc/gummiboot/no-usr.patch diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix new file mode 100644 index 00000000000..d52ac309f4e --- /dev/null +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, gnu_efi }: + +stdenv.mkDerivation rec { + name = "gummiboot-16"; + + patches = [ ./no-usr.patch ]; + + buildFlags = [ + "GNU_EFI=${gnu_efi}" + ]; + + installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; + + src = fetchurl { + url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.tar.gz"; + sha256 = "1znvbxrhc7pkbhbw9bvg4zhfkp81q7fy4mq2jsw6vimccr7h29a0"; + }; + + meta = { + description = "A simple UEFI boot manager which executes configured EFI images"; + + homepage = http://freedesktop.org/wiki/Software/gummiboot; + + license = stdenv.lib.licenses.lgpl21Plus; + + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch new file mode 100644 index 00000000000..7f63e20d3e9 --- /dev/null +++ b/pkgs/tools/misc/gummiboot/no-usr.patch @@ -0,0 +1,20 @@ +diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile +--- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500 ++++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500 +@@ -1,13 +1,13 @@ + VERSION=16 + + ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//") +-LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd)) ++LIBDIR=$(GNU_EFI)/lib + LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR)) + + CPPFLAGS = \ + -I. \ +- -I/usr/include/efi \ +- -I/usr/include/efi/$(ARCH) ++ -I$(GNU_EFI)/include/efi \ ++ -I$(GNU_EFI)/include/efi/$(ARCH) + + CFLAGS = \ + -DVERSION=$(VERSION) \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07ab2f1a7b6..8860d409c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -891,6 +891,8 @@ let gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; + gummiboot = callPackage ../tools/misc/gummiboot { }; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; From 3f3ac212fb017b20ee2246639c95886f154b4816 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Feb 2013 17:50:41 -0500 Subject: [PATCH 221/221] Forgot maintainers --- pkgs/tools/misc/gummiboot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index d52ac309f4e..e087a0a5002 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -24,5 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; platforms = [ "x86_64-linux" ]; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; }; }