From 5c43b626c3b03503380b66367c7ffb15db3b772c Mon Sep 17 00:00:00 2001 From: System administrator Date: Wed, 27 Jun 2012 14:39:29 +0200 Subject: [PATCH 0001/1120] added new version --- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 8cfc26d70cc3..268cc194d73b 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wget, bash, coreutils}: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "bb832557fca3be838838a87d790cb535974ea70bd2393818201676212f0f3b5a"; + sha256 = "0niv1wpj2xhn40c3hffj1fklx5rmnl67jzd872487gm3zibjb0xv"; }; # currently zsh-autocompletion support is not installed From 55876bd4e6cb799ccb7c6f93f811397095c551e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 17:20:09 +0200 Subject: [PATCH 0002/1120] Add configuration to build a XEN-enabled variant of the Linux 3.2 kernel. --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dad382086b7..17d91c8dd97c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5632,6 +5632,12 @@ let ]; }; + linux_3_2_xen = linux_3_2.override { + extraConfig = '' + XEN_DOM0 y + ''; + }; + linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5770,6 +5776,7 @@ let linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); + linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); From af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 17:20:41 +0200 Subject: [PATCH 0003/1120] xen: update to version 4.1.2 Patch submitted by Jan Malakhovski . --- .../virtualization/xen/default.nix | 19 ++++++--- .../virtualization/xen/gcc-4.5.patch | 39 ------------------- 2 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/virtualization/xen/gcc-4.5.patch diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index ce799242e12e..d898daad2a77 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - version = "4.0.3"; + version = "4.1.2"; libDir = if stdenv.is64bit then "lib64" else "lib"; @@ -30,23 +30,24 @@ let } ]; -in + ipxeSrc = + { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz; + sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723"; + }; +in stdenv.mkDerivation { name = "xen-${version}"; src = fetchurl { url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5"; + sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d"; }; patches = [ # Xen looks for headers in /usr/include and for libraries using # ldconfig. Don't do that. ./has-header.patch - - # GCC 4.5 compatibility. - ./gcc-4.5.patch ]; buildInputs = @@ -102,12 +103,18 @@ stdenv.mkDerivation { --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ --replace /bin/ls ls + grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g' + # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' cp ${src} stubdom/${src.name} '')} + ${let src = fetchurl ipxeSrc; in '' + cp ${src} tools/firmware/etherboot/ipxe.tar.gz + ''} + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch deleted file mode 100644 index a8412d69fd3f..000000000000 --- a/pkgs/applications/virtualization/xen/gcc-4.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html - -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c ---- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100 -@@ -281,7 +281,7 @@ - /* - * Mark portion of the address space read only. - */ --extern void shared_info; -+extern char shared_info[PAGE_SIZE]; - static void set_readonly(void *text, void *etext) - { - unsigned long start_address = -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk ---- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100 -@@ -10,6 +10,7 @@ - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -+DEF_CFLAGS += -Wno-uninitialized - DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION) - - DEF_ASFLAGS += -D__ASSEMBLY__ -diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c ---- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200 -+++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100 -@@ -25,8 +25,8 @@ - - - --#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE) --#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE) -+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE) -+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE) - #define GRANT_INVALID_REF 0 - - From 77da6ba7349252a93a9bfa6f9fee278971557d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 19:44:12 +0200 Subject: [PATCH 0004/1120] enblend/enfuse: making it build again, with boost 1.49. Boost 1.50 broke its build. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dad382086b7..5796efdedcaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -654,7 +654,9 @@ let efibootmgr = callPackage ../tools/system/efibootmgr { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { + boost = boost149; + }; encfs = callPackage ../tools/filesystems/encfs { }; From e81c31cd51403a1bd29e477a77f068b03dda0e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 19:46:16 +0200 Subject: [PATCH 0005/1120] libreoffice: trying to make it build again, with boots 1.49 The error shown in hydra looks like that appearing in other packages fixed by downgrading their boost dependency from 1.50 to 1.49. Not tested. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5796efdedcaf..e40da2c94dc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6996,6 +6996,7 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; + boost = boost149; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf From 6389fcdbde81030aa51cccfa425be2930583326b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 20:10:10 +0200 Subject: [PATCH 0006/1120] rawtherapee: updating it. It fixes its build. --- .../graphics/rawtherapee/default.nix | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 4b61ac740cb9..328181790ac1 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,35 +1,23 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau, -libXdmcp, lcms, libiptcdata +{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau +, libXdmcp, lcms2, libiptcdata +, mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { - name = "rawtherapee-svn-25"; + name = "rawtherapee-4.0.9"; - src = fetchsvn { - url = "http://rawtherapee.googlecode.com/svn/trunk"; - rev = 25; - sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh"; + src = fetchurl { + url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz; + sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a"; }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms libiptcdata ]; - - # Rawtherapee died if the default setting for the icc directory pointed to a - # non existant place - patchPhase = '' - sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc - ''; + lcms2 libiptcdata mercurial ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; - installPhase = '' - mkdir -p $out/bin $out/lib - cp rtgui/rt $out/bin - # Weird kind of path reference - cp -r ../release/* $out/bin - cp rtengine/*.so $out/lib - ''; + enableParallelBuilding = true; meta = { description = "RAW converter and digital photo processing software"; From cace2729411f9dff59df6680f6b1a7986f69b05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 20:18:48 +0200 Subject: [PATCH 0007/1120] opencv 2.1: fixing the build Related to libpng versions, and the gcc change (ptrdiff_t vs std::ptrdiff_t) --- pkgs/development/libraries/opencv/2.1.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 6f422463db93..ea5b1313dc7f 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f"; }; - buildInputs = [ cmake gtk glib libjpeg libpng libtiff jasper ffmpeg pkgconfig + # The order is important; libpng should go before X libs, because they + # propagate the libpng 1.5 (and opencv wants libpng 1.2) + buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig xineLib gstreamer ]; enableParallelBuilding = true; + patchPhase = '' + sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/* + ''; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS " ''; From cfea75c381208ccfb64bdd9731f5fb1c6e4f69f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 20:38:57 +0200 Subject: [PATCH 0008/1120] speed dreams: fixing the build (libpng version) --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e40da2c94dc5..f316344a32ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7927,6 +7927,7 @@ let # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + libpng = libpng12; }; torcs = callPackage ../games/torcs { From c43a18b8ec8563a911216d66f4427b9b916f7adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 20:40:16 +0200 Subject: [PATCH 0009/1120] speed dreams: fixing build (libpng order in buildInputs) I forgot committing this in my previous commit for speed dreams. --- pkgs/games/speed-dreams/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 2a6b239608fd..e14b9b26a4f0 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { cd */ ''; - buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash - p7zip SDL enet libjpeg cmake]; + # Order important; it wants libpng12 and some x libs propagate libpng15 + buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto + libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash + p7zip SDL enet libjpeg cmake ]; installTargets = "install"; From 95072d14858d26f0b814a880c69a5db3fc2af0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 21:00:09 +0200 Subject: [PATCH 0010/1120] pyqt: Adding a new url; the old does not work anymore. --- pkgs/development/python-modules/pyqt/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 358254dd013b..9b1d74ff6168 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "PyQt-x11-gpl-4.9.1"; src = fetchurl { - url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + urls = [ + "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" + "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz/7f495dc49f71e3bfb64bf942e0d8bb3c/PyQt-x11-gpl-4.9.1.tar.gz" + ]; sha256 = "1ccvc80z8a0k0drvba9ngivsnv2k2nn5317yf86w1zwh45zmb0zj"; }; From 40b91ced4024152328e32ebbd19a849f62da993c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 21:27:18 +0200 Subject: [PATCH 0011/1120] octave: disabling parallel building The error http://hydra.nixos.org/build/2748254/log/tail-reload makes me think there are concurrency problems in the octave build. In my computer it builds fine. --- pkgs/development/interpreters/octave/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index dbbb0324d144..4293e0112991 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { doCheck = true; - enableParallelBuilding = true; + /* The build failed with a missing libranlib.la in hydra, + but worked on my computer. I think they have concurrency problems */ + enableParallelBuilding = false; configureFlags = [ "--enable-readline" "--enable-dl" ]; From bda2b3ca5a6cab6ea9a02fbcea77cb5e84c390c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 21:40:14 +0200 Subject: [PATCH 0012/1120] blackshadeselite: fix build in gcc 4.6 I simply added '-fpermissive', and it went on. --- pkgs/games/blackshadeselite/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 63139872cf9c..0f4904bfed97 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; NIX_LDFLAGS = "-lSDL_image"; + NIX_CFLAGS_COMPILE = "-fpermissive"; buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ]; From aab4bec314be1fa7e15c2d6a99d708d2f8996312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 21:53:03 +0200 Subject: [PATCH 0013/1120] ufoai: fixing the build. Building with libpng12. --- pkgs/games/ufoai/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 80f527e26e1c..85440f88901e 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { # for the xvidcore static lib NIX_CFLAGS_COMPILE = "-pthread -lm"; - buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis + # 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f316344a32ba..a18dc54cfe70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7940,6 +7940,7 @@ let ufoai = callPackage ../games/ufoai { inherit (gnome) gtksourceview gtkglext; + libpng = libpng12; }; ultimatestunts = callPackage ../games/ultimatestunts { }; From 808e50c7cfa5cb26be634cd33caa5ece85ef35f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 22:17:38 +0200 Subject: [PATCH 0014/1120] freeswitch: Updating to the latest master. This fixes the build. They say that 'master' is the best stable code to use. --- pkgs/servers/sip/freeswitch/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 770dc6d277be..5b341b7deb93 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,14 +1,21 @@ -{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg }: +{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg +, libzrtpcpp, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "freeswitch-1.0.7"; + name = "freeswitch-git-0db52e6"; - src = fetchurl { - url = http://latest.freeswitch.org/freeswitch-1.0.7.tar.gz; - sha256 = "0r7mqsc50y7aqm8arbwiq75ikwfrrfhhzdf9r070snrf3b8qkj8w"; + src = fetchgit { + url = "git://git.freeswitch.org/freeswitch.git"; + rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5"; + sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff"; }; - buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg ]; + preConfigure = '' + ./bootstrap.sh + ''; + + buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg + autoconf automake libtool libzrtpcpp ]; meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; From f0e4e770f00401a1522e03a328e7ba5f4ca00574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 22:26:38 +0200 Subject: [PATCH 0015/1120] fltk: updating, the old url didn't work. --- pkgs/development/libraries/fltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index bb835bb9c290..d51419f37540 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -4,11 +4,11 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} rec { - name = "fltk-2.0.x-alpha-r8550"; + name = "fltk-2.0.x-alpha-r9296"; src = fetchurl { url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2"; - sha256 = "0y9fazsv61j8dkg9aiinnw4nd68h7zxmvapmygrl4rq5ywqygng7"; + sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih"; }; propagatedBuildInputs = [ x11 inputproto libXi freeglut ]; From dcdea9d2b8a68b66ed3844fd9adce20d30f4f925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 22:27:18 +0200 Subject: [PATCH 0016/1120] cinepaint: updating, and making it build I wrote a little patch for the cmake files, or it didn't install. I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow. --- .../graphics/cinepaint/default.nix | 12 ++++++---- .../graphics/cinepaint/install.patch | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++- 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/graphics/cinepaint/install.patch diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 2f1af0f89dd4..bea04f6dc2c3 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } : + mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { name = "cinepaint-1.0"; @@ -12,15 +12,19 @@ stdenv.mkDerivation rec { sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; }; - buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng + buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa - libXext libXpm libXxf86vm pixman libpthreadstubs + libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; + patches = [ ./install.patch ]; + buildNativeInputs = [ cmake pkgconfig ]; - NIX_CFLAGS_COMPILE = "-I."; + NIX_LDFLAGS = "-llcms -ljpeg"; + + # NIX_CFLAGS_COMPILE = "-I."; meta = { homepage = http://www.cinepaint.org/; diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch new file mode 100644 index 000000000000..f15ff1c4414d --- /dev/null +++ b/pkgs/applications/graphics/cinepaint/install.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfb182f..5adaaa5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX}) + # Note that for MacOS this needs to be revised + # for the @OSX_ICC...@ variables + ADD_CUSTOM_COMMAND( +- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc + COMMAND sed -e s/\@platform\@//g + -e s/\@prefix\@/${ESCAPEDPREFIX}/g + -e s/\@exec_prefix\@/\${prefix}/g +@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND( + + ADD_CUSTOM_TARGET(RCFile ALL echo + "" +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install +- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install ++ ${CMAKE_CURRENT_BINARY_DIR}/gimprc + ) + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a18dc54cfe70..2bc9d10b2bcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6402,7 +6402,10 @@ let compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { }; - cinepaint = callPackage ../applications/graphics/cinepaint { }; + cinepaint = callPackage ../applications/graphics/cinepaint { + fltk = fltk13; + libpng = libpng12; + }; codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) { inherit makeWrapper; From cb0d79e60f1c9bf843f5e677bc1a57be8ecc4fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Jul 2012 17:32:03 +0200 Subject: [PATCH 0017/1120] viking: Update to 1.3. --- pkgs/applications/misc/viking/default.nix | 26 ++++++---- .../applications/misc/viking/gpsdclient.patch | 51 ------------------- .../misc/viking/implicit-declaration.patch | 13 ----- pkgs/applications/misc/viking/test-bc.patch | 22 -------- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 20 insertions(+), 96 deletions(-) delete mode 100644 pkgs/applications/misc/viking/gpsdclient.patch delete mode 100644 pkgs/applications/misc/viking/implicit-declaration.patch delete mode 100644 pkgs/applications/misc/viking/test-bc.patch diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index a98ed2aa5ff5..70ac055db098 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,19 +1,27 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl -, gpsd, bc, file }: +, gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper +, docbook_xml_dtd_412 }: -stdenv.mkDerivation rec { - name = "viking-0.9.8"; +let version = "1.3"; in +stdenv.mkDerivation { + name = "viking-${version}"; src = fetchurl { - url = "mirror://sourceforge/viking/${name}.tar.gz"; - sha256 = "1is8g6ld5pd13iiv9qm8526q1cblg01pqyakg52sd6k7fys7dz2d"; + url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz"; + sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l"; }; - patches = [ - ./test-bc.patch ./gpsdclient.patch ./implicit-declaration.patch - ]; + buildInputs = + [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 + ]; - buildInputs = [ pkgconfig intltool gettext gtk expat curl gpsd bc file ]; + configureFlags = [ "--disable-scrollkeeper" ]; + + preBuild = + '' sed -i help/Makefile \ + -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' + ''; doCheck = true; diff --git a/pkgs/applications/misc/viking/gpsdclient.patch b/pkgs/applications/misc/viking/gpsdclient.patch deleted file mode 100644 index 417226322600..000000000000 --- a/pkgs/applications/misc/viking/gpsdclient.patch +++ /dev/null @@ -1,51 +0,0 @@ -Debian patch that allows compilation with libgps (from `gpsd'). -Failing to apply this patch, we get the following error: - - vikgpslayer.c:237: error: field 'realtime_gpsd_unit' has incomplete type - vikgpslayer.c: In function 'vik_gps_layer_new': - vikgpslayer.c:473: warning: implicit declaration of function 'gpsd_units' - vikgpslayer.c: In function 'rt_gpsd_try_connect': - vikgpslayer.c:1321: warning: passing argument 2 of 'gps_set_raw_hook' from incompatible pointer type - -diff -urNad trunk~/src/gpsdclient.h trunk/src/gpsdclient.h ---- trunk~/src/gpsdclient.h 1970-01-01 01:00:00.000000000 +0100 -+++ trunk/src/gpsdclient.h 2009-04-15 14:30:22.000000000 +0200 -@@ -0,0 +1,25 @@ -+/* $Id: gpsdclient.h 5330 2009-03-03 04:05:42Z ckuethe $ */ -+/* gpsdclient.h -- common functions for GPSD clients */ -+ -+#ifndef _GPSD_GPSDCLIENT_H_ -+#define _GPSD_GPSDCLIENT_H_ -+struct fixsource_t -+/* describe a data source */ -+{ -+ char *spec; /* pointer to actual storage */ -+ char *server; -+ char *port; -+ char *device; -+}; -+ -+enum unit {unspecified, imperial, nautical, metric}; -+enum unit gpsd_units(void); -+enum deg_str_type { deg_dd, deg_ddmm, deg_ddmmss }; -+ -+extern /*@observer@*/ char *deg_to_str( enum deg_str_type type, double f); -+ -+extern void gpsd_source_spec(/*@null@*/const char *fromstring, -+ /*@out@*/struct fixsource_t *source); -+ -+#endif /* _GPSDCLIENT_H_ */ -+/* gpsdclient.h ends here */ -diff -urNad trunk~/src/vikgpslayer.c trunk/src/vikgpslayer.c ---- trunk~/src/vikgpslayer.c 2009-02-08 14:47:01.000000000 +0100 -+++ trunk/src/vikgpslayer.c 2009-04-15 14:30:55.000000000 +0200 -@@ -39,6 +39,9 @@ - #include - #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - #include -+#ifndef gpsd_units -+#include "gpsdclient.h" -+#endif - #endif - - #if ! GLIB_CHECK_VERSION(2,14,0) diff --git a/pkgs/applications/misc/viking/implicit-declaration.patch b/pkgs/applications/misc/viking/implicit-declaration.patch deleted file mode 100644 index 60f8ad1177ff..000000000000 --- a/pkgs/applications/misc/viking/implicit-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -Debian patch that fixes an implicat declaration. - -diff -urNad trunk~/src/util.c trunk/src/util.c ---- trunk~/src/util.c 2009-02-08 14:47:01.000000000 +0100 -+++ trunk/src/util.c 2009-04-15 17:23:44.000000000 +0200 -@@ -26,6 +26,7 @@ - #endif - - #include -+#include - - #include "dialog.h" - diff --git a/pkgs/applications/misc/viking/test-bc.patch b/pkgs/applications/misc/viking/test-bc.patch deleted file mode 100644 index fc0c91eec522..000000000000 --- a/pkgs/applications/misc/viking/test-bc.patch +++ /dev/null @@ -1,22 +0,0 @@ -For some reason, `bc -l' yields no output. - ---- viking-0.9.8/test/check_degrees_conversions.sh 2008-03-15 23:01:48.000000000 +0100 -+++ viking-0.9.8/test/check_degrees_conversions.sh 2009-05-30 23:23:27.000000000 +0200 -@@ -7,7 +7,7 @@ function check_success() - for value in "$@" - do - result=`./degrees_converter "$value" | cut -d' ' -f3` -- diff=`echo "$result - $expected" | bc -l` -+ diff=`echo "$result - $expected" | bc` - if [ $diff != 0 ] - then - echo "$value -> $result != $expected" -@@ -23,7 +23,7 @@ function check_failure() - for value in "$@" - do - result=`./degrees_converter "$value" | cut -d' ' -f3` -- diff=`echo "$result - $expected" | bc -l` -+ diff=`echo "$result - $expected" | bc` - if [ $diff = 0 ] - then - echo "$value -> $result = $expected" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc9d10b2bcd..c59993528ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1533,7 +1533,9 @@ let vifm = callPackage ../applications/misc/vifm {}; - viking = callPackage ../applications/misc/viking { }; + viking = callPackage ../applications/misc/viking { + inherit (gnome) scrollkeeper; + }; vncrec = builderDefsPackage ../tools/video/vncrec { inherit (xlibs) imake libX11 xproto gccmakedep libXt From 946f2c10ea2a3493c7533f53d7c0e8782e420775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 23:00:47 +0200 Subject: [PATCH 0018/1120] xineLib: update to 1.2.2 --- pkgs/development/libraries/xine-lib/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 13b2fdce4582..4ae48a4c04e1 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -5,21 +5,13 @@ }: stdenv.mkDerivation rec { - name = "xine-lib-1.2.0"; + name = "xine-lib-1.2.2"; src = fetchurl { - url = "mirror://sourceforge/xine/${name}.tar.bz2"; - sha256 = "1yss9cxxkcb6dzrv78xvi845ls6lhhbv6g8yfm6zjjl07v7jbm6c"; + url = "mirror://sourceforge/xine/${name}.tar.xz"; + sha256 = "1mjk686h1qzqj51h4xs4xvagfgnnhm8czbzzjvr5w034pr8n8rg1"; }; - patches = [ ./zlib126.patch ]; -# patches = -# [ (fetchurl { -# url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.1.19-ffmpeg.patch?revision=1.1"; -# sha256 = "0dqr0kc829djfn0wvk4jg84v61pxynqbp4s4phvywd7x9caf092b"; -# }) -# ]; - buildNativeInputs = [ pkgconfig perl ]; buildInputs = [ From 8a764b7891cbb8d4753c420254608814de428905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 23:01:00 +0200 Subject: [PATCH 0019/1120] xine-ui: update to 0.99.7 --- pkgs/applications/video/xine-ui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 38bacb251177..821e1c7bb0c5 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl -, lirc, shared_mime_info }: +{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl +, lirc, shared_mime_info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.6"; + name = "xine-ui-0.99.7"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf"; + sha256 = "1i3byriqav06b55kwzs4dkzrjw7mmmcv0rc7jzb52hn8qp8xz34x"; }; buildNativeInputs = [ pkgconfig shared_mime_info ]; buildInputs = - [ xineLib libpng12 readline ncurses curl lirc + [ xineLib libpng readline ncurses curl lirc libjpeg xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto xlibs.libXinerama xlibs.libXi xlibs.libXft ]; From 5592b1f9b181fa5872b2e75c5ca8fcbd6e023b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 23:01:23 +0200 Subject: [PATCH 0020/1120] eaglemode: update to 0.84.0 It failds to build with xine-lib, but it goes on as it's not a strong requirement. Then, the final path is not dependant on xine anymore. I hope next releases fix this. --- pkgs/applications/misc/eaglemode/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index f027588c5dc6..519db53ea18f 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -2,11 +2,11 @@ librsvg, glib, gtk, libXext, libXxf86vm, poppler }: stdenv.mkDerivation { - name = "eaglemode-0.83.0"; + name = "eaglemode-0.84.0"; src = fetchurl { - url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2; - sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3"; + url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2; + sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs"; }; buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig @@ -14,9 +14,12 @@ stdenv.mkDerivation { # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. + # I use 'yes y' to skip a build error linking with xineLib, + # because xine stopped exporting "_x_vo_new_port" + # http://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261 buildPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext" - yes n | perl make.pl build + yes y | perl make.pl build ''; dontPatchELF = true; From ef1d8eb915404ee55a5edbf6636228f5ab337dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 2 Jul 2012 23:09:01 +0200 Subject: [PATCH 0021/1120] xine-lib: removing a now unused patch I forgot that in a previous commit. --- .../libraries/xine-lib/zlib126.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 pkgs/development/libraries/xine-lib/zlib126.patch diff --git a/pkgs/development/libraries/xine-lib/zlib126.patch b/pkgs/development/libraries/xine-lib/zlib126.patch deleted file mode 100644 index f48063e038b5..000000000000 --- a/pkgs/development/libraries/xine-lib/zlib126.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://anonscm.debian.org/hg/xine-lib/xine-lib/rev/24d09421ed09 - -# HG changeset patch -# User Ulrich Müller -# Date 1327945720 0 -# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd -# Parent da296856c52e654cf599248de3a01bb754363c79 -Compile failure in osd.c with sys-libs/zlib-1.2.6 - -diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c ---- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000 -@@ -109,7 +109,7 @@ - osd_font_t font; - - --static int gzwrite_i16(gzFile *fp, uint16_t number) { -+static int gzwrite_i16(gzFile fp, uint16_t number) { - return gzputc(fp, number & 0xFF) != -1 && - gzputc(fp, (number >> 8) & 0xFF) != -1; - } -@@ -341,7 +341,7 @@ - - char filename[1024]; - FT_Bitmap *out_bitmap; -- gzFile *fp; -+ gzFile fp; - int error; - int error_counter; - int glyph_index; -diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c ---- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000 -@@ -650,7 +650,7 @@ - osd->display_y = y; - } - --static uint16_t gzread_i16(gzFile *fp) { -+static uint16_t gzread_i16(gzFile fp) { - uint16_t ret; - ret = gzgetc(fp); - ret |= (gzgetc(fp)<<8); -@@ -663,7 +663,7 @@ - - static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - -- gzFile *fp; -+ gzFile fp; - osd_font_t *font = NULL; - int i, ret = 0; - - From 8a5d9bad94c8e35883fbe42efb56b451f0e07f2c Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Jul 2012 13:57:45 +0200 Subject: [PATCH 0022/1120] Update VirtualBox to version 4.1.18. This should make #15 obsolete, as those patches were cherry-picked from upstream. --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1e17c10ffd26..2736c603a48d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let version = "4.1.16"; in +let version = "4.1.18"; in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "0kl21wqz822qgdcilfail5qqgsbhgzixwbbwpkmsh6670jc4jw5n"; + sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 7583b706e4c6..ec77ca91910f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.1.16"; in +let version = "4.1.18"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1f2p26cg005xc6vi9dbim0macv60d8k8nq20rk7awrbghfib5imm"; + sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; From 2e2335c5c031f9121121809cd51e50961690227d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jul 2012 20:13:44 -0400 Subject: [PATCH 0023/1120] reviewboard: Update to 1.6.9 and fix the build ReviewBoard requires Django 1.3.1. --- pkgs/top-level/python-packages.nix | 35 ++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc7775cb867a..4d61c2e473b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -525,6 +525,23 @@ let pythonPackages = python.modules // rec { }; + django_1_3_1 = buildPythonPackage rec { + name = "Django-1.3.1"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; + sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg"; + }; + + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; + }; + + django_evolution = buildPythonPackage rec { name = "django_evolution-0.6.7"; @@ -533,7 +550,7 @@ let pythonPackages = python.modules // rec { md5 = "24b8373916f53f74d701b99a6cf41409"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django_1_3_1 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -543,14 +560,14 @@ let pythonPackages = python.modules // rec { djblets = buildPythonPackage rec { - name = "Djblets-0.6.16"; + name = "Djblets-0.6.19"; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/Djblets/0.6/Djblets-0.6.16.tar.gz"; - sha256 = "1793jy0y5w79p8395lvvdlmvdybgwvc5lvgzmk1csf08ba772vc4"; + url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; + sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8"; }; - propagatedBuildInputs = [ pkgs.pil django ]; + propagatedBuildInputs = [ pkgs.pil django_1_3_1 ]; meta = { description = "A collection of useful extensions for Django"; @@ -1986,17 +2003,17 @@ let pythonPackages = python.modules // rec { reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.6"; + name = "ReviewBoard-1.6.9"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "de965f48c9e63198d3c7c2bb2e8404170868e8c0ee4d6ab796abb9b1ccda6c1d"; + sha256 = "06pwbmqwsb0g2y8zg5hk5ibaivsl1af7v0vnkqranimf4yaa10mc"; }; propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil paramiko flup pygments - djblets django django_evolution pkgs.pycrypto python.modules.sqlite3 - pysvn pkgs.pil + djblets django_1_3_1 django_evolution pkgs.pycrypto python.modules.sqlite3 + pysvn pkgs.pil psycopg2 ]; }; From d0bfd4b6234b26e0ca03c817b7ba56a9cd9e540c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jul 2012 09:53:26 +0200 Subject: [PATCH 0024/1120] opencv: updating to 2.4.1. Let's hydra tell us if it breaks anything. --- pkgs/development/libraries/opencv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 46c170d33f99..009935e14c07 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib }: -let v = "2.3.1a"; in +let v = "2.4.1"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; - sha256 = "0325s7pa2npcw2gc06pr6q5ik4xdyf08rvkfc0myn10w20lzb8m9"; + sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ]; From ec395a78ee87388b4f808a9d4efaa28fd518cea6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Jul 2012 21:48:19 +0200 Subject: [PATCH 0025/1120] chromium: Extend update script to use channels. The previos update script just used the last version of chromium that showed up at the bucket list at: http://commondatastorage.googleapis.com/chromium-browser-official/ I'm not sure which channel this list actually holds, so I'm going to switch now using the official release channels grabbed by omahaproxy. This also has the advantage that we can provide different versions/flavors of chromium. We now also write our data to sources.nix instead of source.nix, as we have more than one source. --- .../networking/browsers/chromium/update.sh | 48 ++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 066cd1c147f7..c9dd69df9a20 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,34 +1,50 @@ #!/bin/sh +channels_url="http://omahaproxy.appspot.com/"; bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; +output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix"; -get_newest_version() +get_channels() { - curl -s "$bucket_url" | sed -ne ' H;/<[Kk][Ee][Yy]>chromium-[^<]*chromium-\([^<.]\+\(\.[^<.]\+\)\+\)\.tar\.bz2<.*$/\1/p - }'; + for chline in $(echo "$1" | cut -d, -f-2); + do + channel="${chline%%,*}"; + version="${chline##*,}"; + + url="${bucket_url%/}/chromium-$version.tar.bz2"; + + sha256="$(nix-prefetch-url "$url")"; + + echo " $channel = {"; + echo " version = \"$version\";"; + echo " url = \"$url\";"; + echo " sha256 = \"$sha256\";"; + echo " };"; + done; } cd "$(dirname "$0")"; -version="$(get_newest_version)"; +versions="$(curl -s "$channels_url" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; -if [ -e source.nix ]; then - oldver="$(sed -n 's/^ *version *= *"\([^"]\+\)".*$/\1/p' source.nix)"; - if [ "x$oldver" = "x$version" ]; then - echo "Already the newest version: $version" >&2; +if [ -e "$output_file" ]; +then + vhash="$(echo "$versions" | sha256sum | cut -d' ' -f1)"; + old_vhash="$(sed -n 's/# *VHASH: *//p' "$output_file")"; + + if [ "x$vhash" = "x$old_vhash" ]; + then + echo "$output_file is already up to date, bailing out." >&2; exit 1; fi; fi; -url="${bucket_url%/}/chromium-$version.tar.bz2"; +channels="$(get_channels "$versions")"; -sha256="$(nix-prefetch-url "$url")"; - -cat > source.nix < "$output_file" <<-EOF +# This file is autogenerated from update.sh in the same directory. +# VHASH: $vhash { - version = "$version"; - url = "$url"; - sha256 = "$sha256"; +$channels } EOF From a65ba9e083f9049a7644f1bc96c2de40d3e98b4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 3 Jul 2012 21:53:56 +0200 Subject: [PATCH 0026/1120] chromium: Generate new sources.nix. This means that we now have hashes and URLs for the latest versions of chromium and can now work on integrating the changes into default.nix. --- .../networking/browsers/chromium/sources.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/sources.nix diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix new file mode 100644 index 000000000000..db07bc460c78 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -0,0 +1,19 @@ +# This file is autogenerated from update.sh in the same directory. +# VHASH: 5e5af2017fa2e05f11aa741c6f87fff0549b93e3bc2aa40e6cc0a0aff84ba010 +{ + dev = { + version = "21.0.1180.15"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.15.tar.bz2"; + sha256 = "0ahsrsyw4928vg1kl3dv44q77ksp85crw6m7fy20nq46qihb0mxa"; + }; + beta = { + version = "20.0.1132.47"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2"; + sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3"; + }; + stable = { + version = "20.0.1132.47"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2"; + sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3"; + }; +} From f6e063e7fc23a4a28134e34b41b37c5bb2026bf5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Jul 2012 14:11:25 +0200 Subject: [PATCH 0027/1120] chromium: Use new channel based sources. Switch to channel based sources and default to the "stable" channel. --- pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 889c2ad83184..751aaf8ee67d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -26,6 +26,7 @@ let mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); config = mkConfigurable { + channel = "stable"; selinux = false; nacl = false; openssl = true; @@ -36,7 +37,7 @@ let pulseaudio = getConfig ["pulseaudio"] true; }; - sourceInfo = import ./source.nix; + sourceInfo = builtins.getAttr config.channel (import ./sources.nix); mkGypFlags = with stdenv.lib; let sanitize = value: From 834d8be46e0469d80bd9e208793991694d4d6ec2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Jul 2012 14:12:36 +0200 Subject: [PATCH 0028/1120] chromium: Fix build for versions older than 21.x. The current stable version won't build if gyp can't use svnversion from the subversion package, so let's provide it for versions below 21.x. --- pkgs/applications/networking/browsers/chromium/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 751aaf8ee67d..4c3a02dcecc2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,8 @@ { stdenv, getConfig, fetchurl, makeWrapper, which +# this is needed in order to build the versions older than 21.x +, subversion + # default dependencies , bzip2, flac, speex , libevent, expat, libjpeg @@ -70,12 +73,14 @@ let use_system_v8 = false; }; + needsSubversion = stdenv.lib.versionOlder sourceInfo.version "21.0.0.0"; + defaultDependencies = [ bzip2 flac speex libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib - ]; + ] ++ stdenv.lib.optional needsSubversion subversion; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; From 950c73271ae35d4211f4f64d834c059f941084b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Jul 2012 14:14:00 +0200 Subject: [PATCH 0029/1120] chromium: Remove obsolete source.nix. As already promised, the old single-channel source.nix is now obsolete as we're using Omahaproxy now and the build of the stable version finishes successful and the browser runs fine. --- pkgs/applications/networking/browsers/chromium/source.nix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source.nix diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source.nix deleted file mode 100644 index 2dc94ea29436..000000000000 --- a/pkgs/applications/networking/browsers/chromium/source.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - version = "21.0.1179.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1179.1.tar.bz2"; - sha256 = "1ynm1dv8nwjg6a0absid1g3r62y0mpb74pmal8g9nmqb92rlkdnc"; -} From aa75c065d46d2ce5778e3b49fdcb19eba6cd8745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Jul 2012 23:43:25 +0200 Subject: [PATCH 0030/1120] libmikmod and mikmod: update the former to 3.2.0, and add mikmod. --- pkgs/applications/audio/mikmod/default.nix | 19 +++++++++++++++++++ .../libraries/libmikmod/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/audio/mikmod/default.nix diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix new file mode 100644 index 000000000000..a86e09278c3c --- /dev/null +++ b/pkgs/applications/audio/mikmod/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, libmikmod, ncurses }: + +stdenv.mkDerivation rec { + name = "mikmod-3.2.2"; + src = fetchurl { + url = "http://mikmod.shlomifish.org/files/${name}.tar.gz"; + sha256 = "105vl1kyah588wpbpq6ck1wlr0jj55l2ps72q5i01gs9px8ncmp8"; + }; + + buildInputs = [ libmikmod ncurses ]; + + meta = { + description = "Tracker music player for the terminal"; + homepage = http://mikmod.shlomifish.org/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 3d2a2635fbcc..cde3aecce078 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "libmikmod-3.1.12"; + name = "libmikmod-3.2.0"; src = fetchurl { - url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "0cpwpl0iqd5zsdwshw69arzlwp883bkmkx41wf3fzrh60dw2n6l9"; + url = "http://mikmod.shlomifish.org/files/${name}.tar.gz"; + sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k"; }; buildInputs = [ texinfo ]; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { A library for playing tracker music module files supporting many formats, including MOD, S3M, IT and XM. ''; - homepage = http://mikmod.raphnet.net/; + homepage = http://mikmod.shlomifish.org/; license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c59993528ce9..0fbdca560114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7077,6 +7077,8 @@ let icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png"; }; + mikmod = callPackage ../applications/audio/mikmod { }; + minicom = callPackage ../tools/misc/minicom { }; minidjvu = callPackage ../applications/graphics/minidjvu { }; From 71ffa0ce4ef01257939276dcf4a40eb8701f6378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Jul 2012 17:32:03 +0200 Subject: [PATCH 0031/1120] Seeks 0.4.1. --- pkgs/tools/networking/p2p/seeks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index bce4b0687bac..43c189f36a91 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -2,13 +2,13 @@ , pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv }: -let version = "0.4.0"; in +let version = "0.4.1"; in stdenv.mkDerivation { name = "seeks-${version}"; src = fetchurl { url = "mirror://sourceforge/seeks/hippy/seeks-${version}.tar.gz"; - sha256 = "1y91dmd0b0yj5036x8kk92iy88dsnzdwhhz23ba9lp96vpafd2ky"; + sha256 = "1ppbbjw1zffxxhyvy64xwsff9xlw9wigqb7qwq5iw5mhbblz545q"; }; buildInputs = From 3bdc4b417f759dbd5389c08172fdea6ef2a5559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 5 Jul 2012 09:56:22 +0200 Subject: [PATCH 0032/1120] lrzip: adding an upstream patch that fixes its md5 checksum. The next version will have this fix already. --- pkgs/tools/compression/lrzip/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index d806e9fd24a6..35df411fd0f2 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,5 +1,11 @@ {stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}: +let + md5fix = fetchurl { + url = "https://github.com/ckolivas/lrzip/commit/9430b6ff4a58adb69ef4cf74f1245fd5b3b313dd.patch"; + sha256 = "084x4wi3mamcxphzwf43iw287v1ylrk0xjghg6b5k6vgm9gkqlx8"; + }; +in stdenv.mkDerivation rec { name = "lrzip-0.612"; @@ -10,6 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo bzip2 nasm perl ]; + patches = [ md5fix ]; + meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; From e8cbee82783ee17a44c05dbefa18f5b8a070f9da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:47:47 +0200 Subject: [PATCH 0033/1120] haskell-stm: add version 2.4 --- pkgs/development/libraries/haskell/stm/2.4.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/stm/2.4.nix diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix new file mode 100644 index 000000000000..a949474cef12 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "stm"; + version = "2.4"; + sha256 = "13flyzh2vnqnap78qjawdh3150rmp9bxnlgynsf793lm1b3z15fl"; + meta = { + description = "Software Transactional Memory"; + 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 c329fbc74784..08a365fb70be 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -137,7 +137,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.5 ok regexCompat = self.regexCompat_0_95_1; # 7.5 fail regexPosix = self.regexPosix_0_95_1; # 7.5 fail - stm = self.stm_2_3; # 7.5 ok + stm = self.stm_2_4; # 7.5 ok syb = self.syb_0_3_6_2; # 7.5 ok text = self.text_0_11_2_2; # 7.5 ok transformers = self.transformers_0_3_0_0; # 7.5 ok @@ -1336,7 +1336,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm_2_1_2_1 = callPackage ../development/libraries/haskell/stm/2.1.2.1.nix {}; stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; - stm = self.stm_2_3; + stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; + stm = self.stm_2_4; storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; From 9fdec86356e99c2b40883d2e53efd002a8665f63 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:48:41 +0200 Subject: [PATCH 0034/1120] haskell-syb: add version 0.3.7 --- pkgs/development/libraries/haskell/syb/0.3.7.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/syb/0.3.7.nix diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix new file mode 100644 index 000000000000..44a16e0bf5ca --- /dev/null +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "syb"; + version = "0.3.7"; + sha256 = "0wysa348icabskih3k9xbmwaaw34hg58lpz3w3075942h650bx2r"; + meta = { + homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB"; + description = "Scrap Your Boilerplate"; + 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 08a365fb70be..6afeddf0ac45 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); regexCompat = self.regexCompat_0_95_1; # 7.5 fail regexPosix = self.regexPosix_0_95_1; # 7.5 fail stm = self.stm_2_4; # 7.5 ok - syb = self.syb_0_3_6_2; # 7.5 ok + syb = self.syb_0_3_7; # 7.5 ok text = self.text_0_11_2_2; # 7.5 ok transformers = self.transformers_0_3_0_0; # 7.5 ok xhtml = self.xhtml_3000_2_1; # 7.5 ok @@ -1291,6 +1291,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_6_1 = callPackage ../development/libraries/haskell/syb/0.3.6.1.nix {}; syb_0_3_6_2 = callPackage ../development/libraries/haskell/syb/0.3.6.2.nix {}; + syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {}; syb = null; # by default, we assume that syb ships with GHC, which is # true for the older GHC versions From 83c234b48af7cd5bef021d57ab5d09cf7ec39f3a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:58:10 +0200 Subject: [PATCH 0035/1120] haskell-async: update to version 2.0.1.0 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 15cef9b35f1c..36c9a839ab0d 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.0.0"; - sha256 = "03aqgfgpar53k7bzb3s988a4fg0pzy7jmjv299wz2hxl7vr6fzkr"; + version = "2.0.1.0"; + sha256 = "00yfxp18zhfjnxz0bqzym0ikarzsa75yw5pi33dsyv9kivra3k5q"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; From 54b28b0300481266da7e2eee06bfc27645922cfa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:58:10 +0200 Subject: [PATCH 0036/1120] haskell-tls: update to version 0.9.6 --- 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 71067cd75ff7..9a89c082959d 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 = "0.9.5"; - sha256 = "1nbfimyxi546n239brhw5lrb7907svvhvy5zgy1f853h17vnli5y"; + version = "0.9.6"; + sha256 = "0bcmq7pvdbgnc8ls949m3x9sxj5svsrdpagjns1iq575jg38jx3g"; isLibrary = true; isExecutable = true; buildDepends = [ From 5784af1772d7e6e94b8d02df5aae2aad72180052 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:58:10 +0200 Subject: [PATCH 0037/1120] haskell-wxc: update to version 0.90.0.4 --- pkgs/development/libraries/haskell/wxHaskell/wxc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index 7bfd121a13fd..f439b9e1594a 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wxc"; - version = "0.90.0.3"; - sha256 = "14b8g2w4knwxj5vkp759y8m3nmsi4n1zy57ma1kz7lw6jklb7dlq"; + version = "0.90.0.4"; + sha256 = "1bh20i1rb8ng0ni1v98nm8qv5wni19dvxwf5i3ijxhrxqdq4i7p6"; buildDepends = [ wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; noHaddock = true; From 6e6a037272897aa0deef4a256d424476ffe762f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:58:10 +0200 Subject: [PATCH 0038/1120] haskell-wxcore: update to version 0.90.0.3 --- pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index 9fa98d47f91e..98032d91c8e4 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wxcore"; - version = "0.90.0.1"; - sha256 = "031947805bjw32f1a8w2ra8714ysq5k0pxp11cr9hgcc93l9f3pq"; + version = "0.90.0.3"; + sha256 = "0d79hr6cz9zj3w57h6630nfnsmfq1w73gz04jjmlhwh8ih557imw"; buildDepends = [ filepath parsec stm time wxc wxdirect ]; extraLibraries = [ libX11 mesa wxGTK ]; meta = { From 622a53ca61d2a39a7504c2e8772e08f8b4e9ee2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Jul 2012 09:58:10 +0200 Subject: [PATCH 0039/1120] haskell-yesod-core: update to version 1.0.1.3 --- 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 b21ce4b00f06..17d3eb4427e0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.0.1.2"; - sha256 = "1c9ay0xv2s1kcj92ai0bj1gbml4k4w62n2mw7c5r6m88k8wmxh6z"; + version = "1.0.1.3"; + sha256 = "1rdj622zi12v9d7cxkn8w4q43k8c6gfz8wrpmvya76gqmg6h2gil"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From 1ae3ea8385e60f964c322bd317ebfd55d3597b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 5 Jul 2012 11:55:24 +0200 Subject: [PATCH 0040/1120] hwloc: Propagate `pciutils'. --- pkgs/development/libraries/hwloc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index aa59a8917141..4f2bd4f679a0 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ pciutils numactl ])); + ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + + propagatedBuildInputs = + # Since `libpci' appears in `hwloc.pc', it must be propagated. + stdenv.lib.optional stdenv.isLinux pciutils; postInstall = stdenv.lib.optionalString (stdenv.isLinux && numactl != null) From b659b026c5fc6ee43d6ec785780c4ceaeed7821e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 2 Jul 2012 11:50:05 +0200 Subject: [PATCH 0041/1120] google-talk-plugin: updated upstream, changing hashes --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 8a2ef6fe0a15..86588f2ed97b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -46,12 +46,12 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "1dma067h7qj8rbcnm0n7wy3wd1clkysq9xj4kaxijbb5zrw06k3q"; + sha256 = "1lgvv6bkdc5knghyn4gsg5gp7h3qyr4rb978gsi39gkvcazksm0b"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "02ymhhbfby0sn9132cvdr6jp9c7sk6hfg0jwg1fc3kzjg7q3y7fs"; + sha256 = "0k9j27pklwb3vih2cydz9552p9270p73hdi14f0bmn6afxjxd13m"; } else throw "Google Talk does not support your platform."; From 2cedd7021bf0ba25964363470a09933a4244515a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 5 Jul 2012 08:14:24 +0200 Subject: [PATCH 0042/1120] node.js: copy v8 headers most npm's that want to build binary stuff (bindings) look for the v8 headers at NODE_BINARY_PATH/../include Ideally, we get something like npm2nix someday and fix these build scripts. Until then, this little hack does the trick. --- pkgs/development/web/nodejs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 98e4736b4f1d..ef45825a5848 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8 }: +{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false }: stdenv.mkDerivation rec { version = "0.6.19"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { postInstall = '' sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js + '' + stdenv.lib.optionalString linkV8Headers '' # helps binary npms + ln -s ${v8}/include/* $out/include '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; From ffe4829bbb33b6ca436c7251cbb871347a76c6c4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 5 Jul 2012 08:55:23 +0200 Subject: [PATCH 0043/1120] mongodb: switch to boost 1.49 now it's back --- 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 0fbdca560114..e21558ac5117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5206,7 +5206,7 @@ let monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost147; + boost = boost149; useV8 = (getConfig ["mongodb" "useV8"] false); }; From 500037bb4b4c392a1855270d508ecc866dc0bcbf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jul 2012 12:13:01 -0400 Subject: [PATCH 0044/1120] Add perl-WWW-Curl --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e761f6556d1e..bd998e5a67ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3898,6 +3898,20 @@ rec { }; }; + WWWCurl = buildPerlPackage rec { + name = "WWW-Curl-4.15"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/WWW/${name}.tar.gz"; + sha256 = "18az7k0jsr642lp6dfy0b2s7vx0cd7sj9dgk93wff73safa09x1y"; + }; + buildInputs = [ pkgs.curl ]; + preConfigure = + '' + substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' + ''; + doCheck = false; # performs network access + }; + WWWMechanize = buildPerlPackage rec { name = "WWW-Mechanize-1.54"; src = fetchurl { From df645c22cc8931f076c2c9fa4a982368633d83e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jul 2012 12:55:50 -0400 Subject: [PATCH 0045/1120] qemu-kvm: update to 1.1.0 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 8 +++--- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 ------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f4..af200c7a1ef1 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,20 +3,20 @@ assert stdenv.isLinux; -let version = "1.0.1"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; + sha256 = "1gzch3yshq7yirc5k3cn0m3ibd6qbl2hvl1lbh7lychfc7s4a963"; }; - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; + patches = [ ./smb-tmpdir.patch ]; postPatch = - '' for i in $(find kvm -type f) + '' for i in $(find . -type f) do sed -i "$i" \ -e 's|/bin/bash|/bin/sh|g ; diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch deleted file mode 100644 index 446a69a146b0..000000000000 --- a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From http://patchwork.ozlabs.org/patch/137186/ - -diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c ---- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200 -+++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100 -@@ -1,7 +1,7 @@ - /* - * Block driver for the Virtual Disk Image (VDI) format - * -- * Copyright (c) 2009 Stefan Weil -+ * Copyright (c) 2009, 2012 Stefan Weil - * - * 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 -@@ -767,8 +767,12 @@ - acb->header_modified = 1; - } - acb->bmap_last = block_index; -+ /* Copy data to be written to new block and zero unused parts. */ -+ memset(block, 0, sector_in_block * SECTOR_SIZE); - memcpy(block + sector_in_block * SECTOR_SIZE, - acb->buf, n_sectors * SECTOR_SIZE); -+ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0, -+ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE); - acb->hd_iov.iov_base = (void *)block; - acb->hd_iov.iov_len = s->block_size; - qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1); From 562259efc1fc3fa06b8f81a48bf612880abf2230 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jul 2012 14:05:02 -0400 Subject: [PATCH 0046/1120] nix: Update to 1.1pre2723_1aba0bf --- 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 a54661143583..8b6ccb787be9 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.1pre2718_8da6772"; + name = "nix-1.1pre2723_1aba0bf"; src = fetchurl { - url = "http://hydra.nixos.org/build/2727338/download/4/${name}.tar.bz2"; - sha256 = "99466467b01102d8a2e1022283259ac490427b9a45c3c4784af027977014d7c5"; + url = "http://hydra.nixos.org/build/2746466/download/4/${name}.tar.bz2"; + sha256 = "06224ecbde09124eea25bfcafcb06637457bc6ac9a9e332d84e9eaf561599160"; }; buildNativeInputs = [ perl pkgconfig ]; From a2501c3561193045e7654bbb169d52a23c871282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 5 Jul 2012 23:29:45 +0200 Subject: [PATCH 0047/1120] Adding lv2 support LV2 is a portable plugin standard for audio systems, similar in scope to LADSPA, VST, AU, and others. The Calf audio plugin pack uses LV2 and Ardour3 has also been updated to support LV2 Plugins --- pkgs/applications/audio/ardour/ardour3.nix | 17 +++++++----- pkgs/applications/audio/calf/default.nix | 22 +++++++++++++++ .../libraries/audio/lilv/default.nix | 27 +++++++++++++++++++ .../libraries/audio/lv2/default.nix | 27 +++++++++++++++++++ .../libraries/audio/sratom/default.nix | 27 +++++++++++++++++++ .../libraries/audio/suil/default.nix | 27 +++++++++++++++++++ pkgs/development/libraries/serd/default.nix | 27 +++++++++++++++++++ pkgs/development/libraries/sord/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 16 +++++++++++ 9 files changed, 210 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/audio/calf/default.nix create mode 100644 pkgs/development/libraries/audio/lilv/default.nix create mode 100644 pkgs/development/libraries/audio/lv2/default.nix create mode 100644 pkgs/development/libraries/audio/sratom/default.nix create mode 100644 pkgs/development/libraries/audio/suil/default.nix create mode 100644 pkgs/development/libraries/serd/default.nix create mode 100644 pkgs/development/libraries/sord/default.nix diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index c34576016ad2..c803ec076187 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glib, glibmm, gtk, gtkmm, jackaudio , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, makeWrapper, pango, perl, pkgconfig -, python }: +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango +, perl, pkgconfig, python, serd, sord, sratom, suil }: let # Ardour 3 Beta 4a @@ -19,11 +19,14 @@ stdenv.mkDerivation { sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk"; }; - buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec - flac glib glibmm gtk gtkmm jackaudio libgnomecanvas - libgnomecanvasmm liblo libmad libogg librdf librdf_raptor - librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid - libxml2 libxslt pango perl pkgconfig python ]; + buildInputs = + [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec + flac glib glibmm gtk gtkmm jackaudio libgnomecanvas + libgnomecanvasmm liblo libmad libogg librdf librdf_raptor + librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid + libxml2 libxslt lilv lv2 pango perl pkgconfig python serd sord + sratom suil + ]; patchPhase = '' printf '#include "ardour/svn_revision.h"\nnamespace ARDOUR { const char* svn_revision = \"${rev}\"; }\n' > libs/ardour/svn_revision.cc diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix new file mode 100644 index 000000000000..4b1f6dcd2687 --- /dev/null +++ b/pkgs/applications/audio/calf/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH +, libglade, lv2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "calf-${version}"; + version = "0.0.18.6"; + + src = fetchurl { + url = "mirror://sourceforge/calf/${name}.tar.gz"; + sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh"; + }; + + buildInputs = + [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://calf.sourceforge.net; + description = "A set of high quality open source audio plugins for musicians"; + license = licenses.lgpl2; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix new file mode 100644 index 000000000000..a02a6ebabac0 --- /dev/null +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "lilv-${version}"; + version = "0.14.2"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "0g9sg5f8xkkvsad0c6rh4j1k2b2hwsh83yg66f4qznxh43np7zlx"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/lilv; + description = "A C library to make the use of LV2 plugins"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix new file mode 100644 index 000000000000..136a825eef90 --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://lv2plug.in/spec/${name}.tar.bz2"; + sha256 = "0lfp7679wwqd49k4mjxwqslpfx5fz2q7akxqayg400zqn70whzl5"; + }; + + buildInputs = [ gtk libsndfile pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://lv2plug.in; + description = "A plugin standard for audio systems"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix new file mode 100644 index 000000000000..b23b58a3f820 --- /dev/null +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }: + +stdenv.mkDerivation rec { + name = "sratom-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "12wi0ycjnn6mlddcp476wzr6k2bb4ig1489gg8h1k7v0w7d6ry1a"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/sratom; + description = "A library for serialising LV2 atoms to/from RDF"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix new file mode 100644 index 000000000000..a7300f541c4e --- /dev/null +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "suil-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp"; + }; + + buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/suil; + description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix new file mode 100644 index 000000000000..8deb26abc1da --- /dev/null +++ b/pkgs/development/libraries/serd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pcre, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "serd-${version}"; + version = "0.14.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "023gsw0nwn2fh2vp7v2gwsmdwk6658zfl1ihdvr9xbayfcv88wlg"; + }; + + buildInputs = [ pcre pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/serd; + description = "A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix new file mode 100644 index 000000000000..ee9d241424c8 --- /dev/null +++ b/pkgs/development/libraries/sord/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, python, serd }: + +stdenv.mkDerivation rec { + name = "sord-${version}"; + version = "0.8.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "0ncaplfr3wal9h8h3lafw0bhx34w046r7md74djgrysrm2h77pwr"; + }; + + buildInputs = [ pkgconfig python serd ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/sord; + description = "A lightweight C library for storing RDF data in memory"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e21558ac5117..b4a4c5528cf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4624,6 +4624,10 @@ let librdf = callPackage ../development/libraries/librdf { }; + lilv = callPackage ../development/libraries/audio/lilv { }; + + lv2 = callPackage ../development/libraries/audio/lv2 { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; redland = pkgs.librdf_redland; @@ -4662,6 +4666,8 @@ let SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; + serd = callPackage ../development/libraries/serd {}; + simgear = callPackage ../development/libraries/simgear {}; sfml_git = callPackage ../development/libraries/sfml { }; @@ -4684,6 +4690,8 @@ let soqt = callPackage ../development/libraries/soqt { }; + sord = callPackage ../development/libraries/sord {}; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; @@ -4692,6 +4700,8 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + sratom = callPackage ../development/libraries/audio/sratom { }; + srtp = callPackage ../development/libraries/srtp {}; sqlite = lowPrio (callPackage ../development/libraries/sqlite { @@ -4716,6 +4726,8 @@ let strigi = callPackage ../development/libraries/strigi {}; + suil = callPackage ../development/libraries/audio/suil { }; + suitesparse = callPackage ../development/libraries/suitesparse { }; sword = callPackage ../development/libraries/sword { }; @@ -6345,6 +6357,10 @@ let bvi = callPackage ../applications/editors/bvi { }; + calf = callPackage ../applications/audio/calf { + inherit (gnome) libglade; + }; + calibre = callPackage ../applications/misc/calibre { }; carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { From ebc1c7d6c73b42ea0e8c91868736a358cb9e9fc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jul 2012 17:31:23 -0400 Subject: [PATCH 0048/1120] cacert: Update to 20120628 --- pkgs/data/misc/cacert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 4db1e84b4853..7349ab3e9828 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20110902"; + name = "cacert-20120628"; src = fetchurl { url = "http://nixos.org/tarballs/${name}.pem.bz2"; - sha256 = "05vwziwrckgdg4l029jsb8apj65lcvk0rfcyyrvz34m2znk0vlmi"; + sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir"; }; unpackPhase = "true"; From 1afb3b58e1a5afba2f3afe7225ba4ccbd111e096 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 5 Jul 2012 17:31:38 -0400 Subject: [PATCH 0049/1120] systemd: Update to 186 --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bc60400146d8..80ce415ca80f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "systemd-185"; + name = "systemd-186"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1iwp41xvpq0x2flhhs8lpyjbfyg1220ahmy7037zdjy26w9g82br"; + sha256 = "0zmj8r7a1xb5f3lvyfgw7095rq3yvr0ibw1730j54blm07sh3hmj"; }; buildInputs = From af9924b92904a8ce6bcef44fa44fbdfe63ea5d5d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 5 Jun 2012 15:18:34 +0200 Subject: [PATCH 0050/1120] Add Cython, because it's needed to build xpra. --- .../interpreters/cython/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/interpreters/cython/default.nix diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix new file mode 100644 index 000000000000..42dafcb7f2e7 --- /dev/null +++ b/pkgs/development/interpreters/cython/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python, pkgconfig }: + +stdenv.mkDerivation { + name = "cython-0.16"; + + src = fetchurl { + url = http://www.cython.org/release/Cython-0.16.tar.gz; + sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp"; + }; + + buildPhase = "python setup.py build --build-base $out"; + + installPhase = "python setup.py install --prefix=$out"; + + buildInputs = [ python pkgconfig ]; + + meta = { + description = "An interpreter to help writing C extensions for Python"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e21558ac5117..8777ebc0b3bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1777,6 +1777,8 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; + cython = callPackage ../development/interpreters/cython { }; + dylan = callPackage ../development/compilers/gwydion-dylan { dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { }; }; From d802bacdd93adf52797e3066b66da62c35a9693d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 5 Jun 2012 15:19:49 +0200 Subject: [PATCH 0051/1120] xpra: New version from the fork. This is because the original version is no longer in development, as stated on the website at http://code.google.com/p/partiwm/wiki/xpra: "This project is in deep hibernation; I haven't had time to devote for several years now. If you are looking for xpra, you may prefer Antoine Martin's fork, which receives more support. It is available at: http://xpra.org/" So I guess its safe to switch over to that fork. --- pkgs/tools/X11/xpra/default.nix | 14 ++++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index cf7692cc58ac..9fc34a2cf3fd 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,17 +1,15 @@ -{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}: +{stdenv, fetchurl, pkgconfig, python, cython, pygtk, xlibs, gtk, ffmpeg, x264, libvpx, makeWrapper}: stdenv.mkDerivation { - name = "xpra-0.0.3"; + name = "xpra-0.3.2"; src = fetchurl { - url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz; - sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp"; + url = http://xpra.org/src/xpra-0.3.2.tar.bz2; + sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y"; }; - #src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3; - buildInputs = [ - pkgconfig python pyrex pygtk gtk makeWrapper + pkgconfig python cython pygtk gtk ffmpeg x264 libvpx makeWrapper xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst ]; @@ -33,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://partiwm.org/wiki/xpra; + homepage = http://xpra.org/; description = "Persistent remote applications for X"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8777ebc0b3bf..fc26ed174d6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7683,9 +7683,7 @@ let libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { - pyrex = pyrex095; - }; + xpra = callPackage ../tools/X11/xpra { }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; From 5cf889967374a49f0af8eb974c1d14b255e4fa14 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 6 Jul 2012 03:33:52 +0200 Subject: [PATCH 0052/1120] xpra: Don't include cython into store requisites. Cython is not required in order to run XPRA, so we now explicitly specify what should be put into PYTHONPATH instead of using the PYTHONPATH which is set during build time. That way we don't get unnecessary stuff in /nix/store, like the mentioned cython compiler/interpreter. --- pkgs/tools/X11/xpra/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 9fc34a2cf3fd..a6d0065e8cc1 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, pkgconfig, python, cython, pygtk, xlibs, gtk, ffmpeg, x264, libvpx, makeWrapper}: +{ stdenv, fetchurl, pkgconfig, python, cython +, pygtk, pygobject, pycairo, xlibs, gtk +, ffmpeg, x264, libvpx, makeWrapper}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "xpra-0.3.2"; src = fetchurl { @@ -8,8 +10,10 @@ stdenv.mkDerivation { sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y"; }; + buildNativeInputs = [ cython ]; + buildInputs = [ - pkgconfig python cython pygtk gtk ffmpeg x264 libvpx makeWrapper + pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst ]; @@ -19,13 +23,20 @@ stdenv.mkDerivation { ./do-build ''; + pythonPaths = [ + "$out/lib/python" + "$(toPythonPath ${pygtk})/gtk-2.0" + ] ++ map (i: "$(toPythonPath ${i})") [ + pygobject pycairo notify + ]; + installPhase = '' mkdir -p $out cp -r install/* $out for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --set PYTHONPATH "$out/lib/python:$(toPythonPath ${pygtk})/gtk-2.0:$PYTHONPATH" \ + --set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \ --prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin" done ''; From ceff799efcf1380b765c20a8a35d3cdaa26bafcb Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 6 Jul 2012 03:36:15 +0200 Subject: [PATCH 0053/1120] xpra: Add python notify module. This is not needed to run XPRA, but gets rid of a few nasty errors. XPRA is using the notify library to display nice desktop notifications, so there might be users who actually like to have those funny things. --- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index a6d0065e8cc1..3fbb350e0ab0 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, python, cython -, pygtk, pygobject, pycairo, xlibs, gtk +, pygtk, pygobject, pycairo, notify, xlibs, gtk , ffmpeg, x264, libvpx, makeWrapper}: stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc26ed174d6e..3c9a0b51bbeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7683,7 +7683,9 @@ let libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; - xpra = callPackage ../tools/X11/xpra { }; + xpra = callPackage ../tools/X11/xpra { + inherit (pythonPackages) notify; + }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome) libglade; From 758209f075037cf7de05518bd40d0e4c68d93728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 5 Jul 2012 11:07:26 +0200 Subject: [PATCH 0054/1120] Adding libdivsufsort. Required for zpaq; I want to package it. --- .../libraries/libdivsufsort/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/libdivsufsort/default.nix diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix new file mode 100644 index 000000000000..21ee2351c58f --- /dev/null +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libdivsufsort-2.0.1"; + + src = fetchurl { + url = http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.bz2; + sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; + }; + + meta = { + homepage = http://code.google.com/p/libdivsufsort/; + license = "MIT"; + description = "Library to construct the suffix array and the BW transformed string"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e21558ac5117..a8ac77c699a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3953,6 +3953,8 @@ let libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; + libdmtx = callPackage ../development/libraries/libdmtx { }; libdnet = callPackage ../development/libraries/libdnet { }; From 8427f562033b9b8d01183a62584bda46d6d52d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 6 Jul 2012 12:01:58 +0200 Subject: [PATCH 0055/1120] ffmpeg: adding libdc1394 support (default false) --- pkgs/development/libraries/ffmpeg/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index a29940b4f2f9..bb89eb4ebd29 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -8,6 +8,7 @@ , xvidSupport ? true, xvidcore ? null , vdpauSupport ? true, libvdpau ? null , faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null }: assert speexSupport -> speex != null; @@ -47,7 +48,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support "--enable-libx264" ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" - ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame @@ -58,7 +60,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional faacSupport faac; + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394; enableParallelBuilding = true; From 96a0a6859855bed481b6f7ca421e7e73d0b7bd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 6 Jul 2012 12:10:06 +0200 Subject: [PATCH 0056/1120] ffmpeg: build the ffserver Since the first expression of ffmpeg, it's disabled. I don't know why. It does not require more dependencies. --- pkgs/development/libraries/ffmpeg/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index bb89eb4ebd29..3b5e28a2ee7f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { "--enable-gpl" "--enable-postproc" "--enable-swscale" - "--disable-ffserver" "--disable-ffplay" "--enable-shared" "--enable-runtime-cpudetect" From f3b78a6b6f230337b061cda1faba15d5a8d322ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 6 Jul 2012 17:38:30 +0200 Subject: [PATCH 0057/1120] gnunet: update to 0.9.3 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index be67c289814c..5214c294b825 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> (gtk != null) && (libglade != null); stdenv.mkDerivation rec { - name = "gnunet-0.9.2"; + name = "gnunet-0.9.3"; src = fetchurl { url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "1sa7xc85l7lkd0s7vyxnqhnm7cngnycrvp7zc6yj4b3qjg5z3x94"; + sha256 = "0ppirvwjb7w7270g0w83z6wyk984cnxv2ydxj7qr0j1cz2j6nn2h"; }; buildInputs = [ From 714f100970ca25e58a2b4d8697b2fd9606226a0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Jul 2012 14:23:07 -0400 Subject: [PATCH 0058/1120] httpd: Support building with another multi-processing module --- pkgs/servers/http/apache-httpd/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 1f5e1ae69bce..f2a21ee28be2 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -2,10 +2,14 @@ , sslSupport, proxySupport ? true , apr, aprutil, pcre , ldapSupport ? true, openldap +, # Multi-processing module to use. This is built into the server and + # cannot be selected at runtime. + mpm ? "prefork" }: assert sslSupport -> openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; +assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { version = "2.2.22"; @@ -24,6 +28,9 @@ stdenv.mkDerivation rec { # passing simply CFLAGS did not help, then I go by NIX_CFLAGS_COMPILE NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1"; + # Required for ‘pthread_cancel’. + NIX_LDFLAGS = "-lgcc_s"; + configureFlags = '' --with-z=${zlib} --with-pcre=${pcre} @@ -32,8 +39,11 @@ stdenv.mkDerivation rec { ${if proxySupport then "--enable-proxy" else ""} ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} + --with-mpm=${mpm} ''; + enableParallelBuilding = true; + postInstall = '' echo "removing manual" rm -rf $out/manual From 4184e580a96ae075f2ac69af5f7bcea99c99a944 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Jul 2012 15:14:16 -0400 Subject: [PATCH 0059/1120] php: Update to 5.3.14 --- pkgs/development/interpreters/php/5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index d071070f9a6e..48eb8ac5ee9d 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -8,7 +8,7 @@ in composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.13"; + version = "5.3.14"; name = "php-${version}"; @@ -157,7 +157,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "16yr678bgks6hlhmmmi5s9ivhcx1f1bhvxkk3zrlkr3bn4sp46pg"; + sha256 = "1cqw0knkrb7wn49ki5kcly4i0hjnd12sf9l4rhk0vny5hdp5n1y8"; name = "php-${version}.tar.bz2"; }; From 5debe94bb3b0578c2f5fb22250e7d9b3f3abe67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 00:59:40 +0200 Subject: [PATCH 0060/1120] gmp: don't build fat binaries on Solaris --- pkgs/development/libraries/gmp/5.0.5.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 3fb625850515..98ebe5fcc256 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildNativeInputs = [ m4 ]; configureFlags = - # Build a "fat binary", with routines for several sub-architectures (x86). - [ "--enable-fat" ] + # Build a "fat binary", with routines for several sub-architectures + # (x86), except on Solaris where some tests crash with "Memory fault". + # See , for instance. + (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat") ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ]); doCheck = true; From f47c5d6bd755dc647281a17f2f6375477a57794d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 21:53:57 +0200 Subject: [PATCH 0061/1120] openldap: update to version 2.4.31 --- .../libraries/openldap/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 22f98535803c..5c9fedb7fc55 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,23 +1,19 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: -stdenv.mkDerivation { - name = "openldap-2.4.13"; - +stdenv.mkDerivation rec { + name = "openldap-2.4.31"; + src = fetchurl { - url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.4.13.tgz; - sha256 = "18l06v8z5wnr92m28bwxd27l6kw3i0gi00yivv603da6m76cm0ic"; + url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; }; - + buildInputs = [openssl cyrus_sasl db4 groff]; - + dontPatchELF = 1; # !!! - # Build on Glibc 2.9. - # http://www.openldap.org/lists/openldap-bugs/200808/msg00130.html - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - meta = { - homepage = http://www.openldap.org/; + homepage = "http://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; }; } From 21997309418f0d34b21390ef56ebf041d1bccbc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 21:30:58 +0200 Subject: [PATCH 0062/1120] apr: strip trailing whitespace --- pkgs/development/libraries/apr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 8c3d5c03496e..07a565596bbc 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; - + meta = { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; From 2659c3be4571a99c576da22d057e1f86a8db4fdf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 21:38:50 +0200 Subject: [PATCH 0063/1120] apr-util: enable SSL support by default and enable ldapSupport on Darwin, too --- .../libraries/apr-util/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index ce6337b3b6ad..ad02f9b84cce 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, apr, expat -, bdbSupport ? false, db4 ? null -, ldapSupport ? !stdenv.isDarwin, openldap +, sslSupport ? true, openssl +, bdbSupport ? false, db4 +, ldapSupport ? true, openldap }: +assert sslSupport -> openssl != null; assert bdbSupport -> db4 != null; +assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { name = "apr-util-1.4.1"; - + src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; md5 = "52b31b33fb1aa16e65ddaefc76e41151"; }; - + configureFlags = '' --with-apr=${apr} --with-expat=${expat} - ${if bdbSupport then "--with-berkeley-db=${db4}" else ""} - ${if ldapSupport then "--with-ldap" else ""} + --with-crypto + ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"} + ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"} + ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; - + passthru = { - inherit bdbSupport; - inherit ldapSupport; + inherit sslSupport bdbSupport ldapSupport; }; meta = { @@ -31,4 +35,3 @@ stdenv.mkDerivation rec { description = "A companion library to APR, the Apache Portable Runtime"; }; } - From c870b805124ad92642b8b407d1585d967dc3a884 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 08:41:21 +0200 Subject: [PATCH 0064/1120] apache: add version 2.4 --- .../apache-httpd/{default.nix => 2.2.nix} | 0 pkgs/servers/http/apache-httpd/2.4.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 67 insertions(+), 1 deletion(-) rename pkgs/servers/http/apache-httpd/{default.nix => 2.2.nix} (100%) create mode 100644 pkgs/servers/http/apache-httpd/2.4.nix diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/2.2.nix similarity index 100% rename from pkgs/servers/http/apache-httpd/default.nix rename to pkgs/servers/http/apache-httpd/2.2.nix diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix new file mode 100644 index 000000000000..043a15a984b4 --- /dev/null +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre +, proxySupport ? true +, sslSupport ? true, openssl +, ldapSupport ? true, openldap +, libxml2Support ? true, libxml2 +, luaSupport ? false, lua5 +}: + +let optional = stdenv.lib.optional; + optionalString = stdenv.lib.optionalString; +in + +assert sslSupport -> aprutil.sslSupport && openssl != null; +assert ldapSupport -> aprutil.ldapSupport && openldap != null; + +stdenv.mkDerivation rec { + version = "2.4.2"; + name = "apache-httpd-${version}"; + + src = fetchurl { + url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; + sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2"; + }; + + buildInputs = [perl] ++ + optional ldapSupport openldap ++ # there is no --with-ldap flag + optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + + configureFlags = '' + --with-apr=${apr} + --with-apr-util=${aprutil} + --with-z=${zlib} + --with-pcre=${pcre} + --disable-maintainer-mode + --disable-debugger-mode + --enable-mods-shared=all + ${optionalString proxySupport "--enable-proxy"} + ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} + ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ''; + + postInstall = '' + echo "removing manual" + rm -rf $out/manual + ''; + + enableParallelBuilding = true; + + passthru = { + inherit apr aprutil sslSupport proxySupport ldapSupport; + }; + + meta = { + description = "Apache HTTPD, the world's most popular web server"; + homepage = "http://httpd.apache.org/"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8ac77c699a2..b6ce5549f2bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5102,10 +5102,16 @@ let rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = callPackage ../servers/http/apache-httpd { + apacheHttpd = pkgs.apacheHttpd_2_2; + + apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; }; + apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { + sslSupport = true; + }); + sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { From ea1d479afbb93b76d580aabc1a0ff19eeac07f30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 08:57:28 +0200 Subject: [PATCH 0065/1120] apache-httpd-2.4: ensure that libgcc_s can be found at run-time --- pkgs/servers/http/apache-httpd/2.4.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 043a15a984b4..01a41cb3e635 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + # Required for ‘pthread_cancel’. + NIX_LDFLAGS = "-lgcc_s"; + configureFlags = '' --with-apr=${apr} --with-apr-util=${aprutil} From 32449b5ae6ac66a5bd0470ca81c80650620116fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 08:57:53 +0200 Subject: [PATCH 0066/1120] apache-httpd-2.4: replace use of tabs with blanks --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 01a41cb3e635..18db4ffeb759 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { }; buildInputs = [perl] ++ - optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work + optional ldapSupport openldap ++ # there is no --with-ldap flag + optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work # Required for ‘pthread_cancel’. NIX_LDFLAGS = "-lgcc_s"; From b98782f339b620d72e753f2bf57917d8bff8eeab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 09:09:05 +0200 Subject: [PATCH 0067/1120] apache-httpd-2.4: build MPMs as DSOs so that the desired one can be selected at run-time --- pkgs/servers/http/apache-httpd/2.4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 18db4ffeb759..c9161bf59093 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { --disable-maintainer-mode --disable-debugger-mode --enable-mods-shared=all + --enable-mpms-shared=all ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} From 240d2e9cfaef05fc0cb3b362723cb3b04c05cde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 10:40:53 +0200 Subject: [PATCH 0068/1120] automake: remove versions 1.7 and 1.9 --- .../tools/misc/automake/automake-1.7.x.nix | 18 ---------- .../tools/misc/automake/automake-1.9.x.nix | 33 ------------------- pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 5 files changed, 57 deletions(-) delete mode 100644 pkgs/development/tools/misc/automake/automake-1.7.x.nix delete mode 100644 pkgs/development/tools/misc/automake/automake-1.9.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.7.x.nix b/pkgs/development/tools/misc/automake/automake-1.7.x.nix deleted file mode 100644 index e0d8e516d3b5..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.7.x.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper}: - -stdenv.mkDerivation { - name = "automake-1.7.9"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://nixos.org/tarballs/automake-1.7.9.tar.bz2; - md5 = "571fd0b0598eb2a27dcf68adcfddfacb"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; -} diff --git a/pkgs/development/tools/misc/automake/automake-1.9.x.nix b/pkgs/development/tools/misc/automake/automake-1.9.x.nix deleted file mode 100644 index 5ca279d23adb..000000000000 --- a/pkgs/development/tools/misc/automake/automake-1.9.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper}: - -stdenv.mkDerivation { - name = "automake-1.9.6"; - - builder = ./builder.sh; - - setupHook = ./setup-hook.sh; - - src = fetchurl { - url = ftp://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.gz; - md5 = "c60f77a42f103606981d456f1615f5b4"; - }; - - buildInputs = [perl autoconf makeWrapper]; - - # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - meta = { - homepage = http://www.gnu.org/software/automake/; - description = "GNU Automake, a GNU standard-compliant makefile generator"; - - longDescription = '' - GNU Automake is a tool for automatically generating - `Makefile.in' files compliant with the GNU Coding - Standards. Automake requires the use of Autoconf. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6ce5549f2bd..c012ce86adcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2836,10 +2836,6 @@ let automake = automake111x; - automake17x = callPackage ../development/tools/misc/automake/automake-1.7.x.nix { }; - - automake19x = callPackage ../development/tools/misc/automake/automake-1.9.x.nix { }; - automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 59777fe99be7..3201afb44a05 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -24,7 +24,6 @@ with (import ./release-lib.nix); autoconf = all; automake110x = all; automake111x = all; - automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 18bad093294c..5391b3a51c57 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -26,7 +26,6 @@ with (import ./release-lib.nix); autoconf = all; automake110x = all; automake111x = all; - automake19x = all; avahi = allBut "i686-cygwin"; # Cygwin builds fail bash = all; bashInteractive = all; From c04a322018f6e4751b51d8fc714833ba75a8e17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 11:20:59 +0200 Subject: [PATCH 0069/1120] autoconf: update to 2.69 --- pkgs/development/tools/misc/autoconf/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index ce18fd1a377a..b4de66d9bafc 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "autoconf-2.68"; + name = "autoconf-2.69"; src = fetchurl { - url = "mirror://gnu/autoconf/${name}.tar.bz2"; - sha256 = "1j1j8d2p3r9mzx8b2hnmfqy2683r2wyyvki6bs9cmm6n7wkzp4f4"; + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"; }; buildInputs = [ m4 perl ]; @@ -14,13 +14,19 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = (stdenv.system != "i686-cygwin" - && stdenv.system != "i686-solaris"); + doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + enableParallelBuilding = true; + + preCheck = + # Make the Autotest test suite run in parallel. + '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + meta = { homepage = http://www.gnu.org/software/autoconf/; description = "GNU Autoconf, a part of the GNU Build System"; From 25adbc91bb4032f2c606dcab094768cea86127c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 11:21:23 +0200 Subject: [PATCH 0070/1120] automake: add version 1.12.1 --- .../tools/misc/automake/automake-1.12.x.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.12.x.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix new file mode 100644 index 000000000000..41aaff768766 --- /dev/null +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -0,0 +1,47 @@ +{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: + +stdenv.mkDerivation rec { + name = "automake-1.12.1"; + + # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is + # available upstream; see + # . + builder = ./builder.sh; + + setupHook = ./setup-hook.sh; + + src = fetchurl { + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "0gqpbk51lbk0a4ixwdp4cnabzaj9qdsxypr1cmbs5hjan9lhhx9j"; + }; + + buildInputs = [perl autoconf makeWrapper]; + + inherit doCheck; + + # The test suite can run in parallel. + enableParallelBuilding = true; + + # Disable indented log output from Make, otherwise "make.test" will + # fail. + preCheck = "unset NIX_INDENT_MAKE"; + + # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + meta = { + homepage = http://www.gnu.org/software/automake/; + description = "GNU Automake, a GNU standard-compliant makefile generator"; + + longDescription = '' + GNU Automake is a tool for automatically generating + `Makefile.in' files compliant with the GNU Coding + Standards. Automake requires the use of Autoconf. + ''; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c012ce86adcf..a5d2ab0dc56d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2847,6 +2847,12 @@ let && !stdenv.isFreeBSD; }; + automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { + doCheck = !stdenv.isArm && !stdenv.isCygwin + # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. + && stdenv.system != "i686-solaris"; + }; + automoc4 = callPackage ../development/tools/misc/automoc4 { }; avrdude = callPackage ../development/tools/misc/avrdude { }; From ef38f708d63361fe00e67a30696614b97a0025ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 11:24:14 +0200 Subject: [PATCH 0071/1120] automake: switch the default to 1.12 --- 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 a5d2ab0dc56d..238ebca593d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2834,7 +2834,7 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - automake = automake111x; + automake = automake112x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; From 08b29c6f96ce360f5a79e1243174593172e4a9d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:30:26 +0200 Subject: [PATCH 0072/1120] blender: update to version 2.63a --- pkgs/applications/misc/blender/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c291192ef01e..e8307a79cf75 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,11 +3,11 @@ libpng, libsamplerate, libtiff, mesa, openal, openexr, openjpeg, python, zlib, boost }: stdenv.mkDerivation rec { - name = "blender-2.62"; + name = "blender-2.63a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "19xfr5vx66p4p3hnqpglpky6f4bh3ay484mdgh7zg6j9f80dp53q"; + sha256 = "c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a"; }; buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; - meta = { + meta = { description = "3D Creation/Animation/Publishing System"; homepage = http://www.blender.org; # They comment two licenses: GPLv2 and Blender License, but they From fda57fdd5eef9c87374b9737f74f3e07d1524fa5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:44:28 +0200 Subject: [PATCH 0073/1120] ccrtp-1.8: fix build with gcc 4.6 --- pkgs/development/libraries/ccrtp/1.8.nix | 4 +++- .../libraries/ccrtp/gcc-4.6-fix.patch | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 26e7050a60df..78bf7a678ac7 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation { buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ]; - meta = { + patches = [ ./gcc-4.6-fix.patch ]; + + meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; license = "GPLv2"; diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch new file mode 100644 index 000000000000..49d07a89e52a --- /dev/null +++ b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch @@ -0,0 +1,20 @@ +diff -ubr ccrtp-1.8.0-orig/src/ccrtp/sources.h ccrtp-1.8.0/src/ccrtp/sources.h +--- ccrtp-1.8.0-orig/src/ccrtp/sources.h 2010-04-18 20:51:49.000000000 +0200 ++++ ccrtp-1.8.0/src/ccrtp/sources.h 2012-07-07 11:42:50.961179016 +0200 +@@ -45,6 +45,7 @@ + #define CCXX_RTP_SOURCES_H_ + + #include ++#include + #include + + #ifdef CCXX_NAMESPACES +@@ -406,7 +407,7 @@ + public: + typedef std::forward_iterator_tag iterator_category; + typedef Participant value_type; +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + typedef const Participant* pointer; + typedef const Participant& reference; + From 8347aefe69c234abd8166c692a583b5b3fd86b7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:45:36 +0200 Subject: [PATCH 0074/1120] cppnetlib: build with boostHeaders --- 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 238ebca593d1..c008d0efb4d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3327,7 +3327,7 @@ let cppunit = callPackage ../development/libraries/cppunit { }; cppnetlib = callPackage ../development/libraries/cppnetlib { - boost = boostFull; + boost = boostHeaders; }; cracklib = callPackage ../development/libraries/cracklib { }; From 5479b9f3b6a08254e1dabd3ed7ccf5d90646d665 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:49:31 +0200 Subject: [PATCH 0075/1120] twinkle: link standard version of boost --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c008d0efb4d3..820528954106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7509,7 +7509,6 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { - boost = boostFull; ccrtp = ccrtp_1_8; libzrtpcpp = libzrtpcpp_1_6; }; From 0921d5ddda27e645e0ef63d8762e7a183a8e46b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:50:03 +0200 Subject: [PATCH 0076/1120] ghost-one: fix build by compiling with Boost 1.44 --- 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 820528954106..88dd6439218f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5156,7 +5156,7 @@ let freeswitch = callPackage ../servers/sip/freeswitch { }; ghostOne = callPackage ../servers/games/ghost-one { - boost = boostFull; + boost = boost144; }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; From 5b4d0bb3831812c3378813e0b4f8dac6e6a73913 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:51:22 +0200 Subject: [PATCH 0077/1120] boost: drop unused 'boostFull' variant The full boost build is huge, it's unused, and it crashes GCC 4.6 anyway. --- pkgs/top-level/all-packages.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88dd6439218f..bb8ddf499718 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,13 +3236,6 @@ let boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { }; boostHeaders = boostHeaders150; - # A Boost build with all library variants enabled. Very large (about 250 MB). - boostFull = appendToName "full" (boost.override { - enableDebug = true; - enableSingleThreaded = true; - enableStatic = true; - }); - botan = callPackage ../development/libraries/botan { }; box2d = callPackage ../development/libraries/box2d { }; From eb7ad413b83710d76117de6ee3ddcedcf8726a8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:57:01 +0200 Subject: [PATCH 0078/1120] boost-1.44: add 'taggedLayout' parameter to force use of tagged layout in single-variant builds --- pkgs/development/libraries/boost/1.44.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index 2b516be2cbf5..ad09adc8606c 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -6,6 +6,7 @@ , enableShared ? true , enableStatic ? false , enablePIC ? false +, taggedLayout ? false }: let @@ -23,7 +24,7 @@ let stdenv.lib.optional enableStatic "static"); # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || + finalLayout = if (taggedLayout || (enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) then "tagged" else "system"; @@ -63,12 +64,12 @@ stdenv.mkDerivation { # Patch to get rid of following error, experienced by some packages like encfs, bitcoin: # terminate called after throwing an instance of 'std::runtime_error' # what(): locale::facet::_S_create_c_locale name not valid - (fetchurl { + (fetchurl { url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ; - sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; + sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d"; }) ]; - + crossAttrs = rec { buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to From 48b6730f3cf80ece21a3d0a748f18bf32053585e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 11:57:52 +0200 Subject: [PATCH 0079/1120] ghost-one: the linking phase requires boost in tagged layout --- 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 bb8ddf499718..9b03529e22cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5149,7 +5149,7 @@ let freeswitch = callPackage ../servers/sip/freeswitch { }; ghostOne = callPackage ../servers/games/ghost-one { - boost = boost144; + boost = boost144.override { taggedLayout = true; }; }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; From a59ed42a8bd00718927dfd4958f7957216752060 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 12:01:25 +0200 Subject: [PATCH 0080/1120] boost-1.50: added 'taggedLayout' parameter to force use of tagged layout in single variant builds --- pkgs/development/libraries/boost/1.50.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/boost/1.50.nix b/pkgs/development/libraries/boost/1.50.nix index 69d6a27c0e5f..3d6c6010a20f 100644 --- a/pkgs/development/libraries/boost/1.50.nix +++ b/pkgs/development/libraries/boost/1.50.nix @@ -7,6 +7,7 @@ , enableStatic ? false , enablePIC ? false , enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) }: let @@ -24,10 +25,7 @@ let stdenv.lib.optional enableStatic "static"); # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; + layout = if taggedLayout then "tagged" else "system"; cflags = if (enablePIC && enableExceptions) then "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" @@ -63,7 +61,7 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; installPhase = ":"; @@ -82,7 +80,7 @@ stdenv.mkDerivation { cat << EOF > user-config.jam using gcc : cross : $crossConfig-g++ ; EOF - ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install ''; }; } From af61749b18ec00003a7692948eb9d3f4467f6720 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 13:00:53 +0200 Subject: [PATCH 0081/1120] cyrus-sasl: update to version 2.1.25 --- .../cyrus-sasl-2.1.22-bad-elif.patch | 21 ------------- .../libraries/cyrus-sasl/default.nix | 31 +++++++++++++------ 2 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch deleted file mode 100644 index 33550c428d20..000000000000 --- a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-2.1.22-bad-elif.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c ---- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100 -+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-02-06 15:20:15.000000000 +0100 -@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 0da4d5da3e76..a03f753a1141 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,16 +1,27 @@ -{ stdenv, fetchurl, openssl, db4, gettext, automake} : +{ stdenv, fetchurl, openssl, db4, gettext }: -stdenv.mkDerivation { - name = "cyrus-sasl-2.1.23"; +stdenv.mkDerivation rec { + name = "cyrus-sasl-2.1.25"; src = fetchurl { - url = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz; - sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0"; + url = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${name}.tar.gz"; + sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe"; }; - preConfigure='' - configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 --enable-login" - cp ${automake}/share/automake*/config.{sub,guess} config - ''; + buildInputs = [ openssl db4 gettext ]; - patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ]; + + # Set this variable at build-time to make sure $out can be evaluated. + preConfigure = '' + configureFlagsArray=( --with-plugindir=$out/lib/sasl2 + --with-configdir=$out/lib/sasl2 + --enable-login + ) + ''; + + meta = { + homepage = "http://cyrusimap.web.cmu.edu/"; + description = "library for adding authentication support to connection-based protocols"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } From 74c0e77271f7f59b6523432df1d4b9625473ee0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 13:56:19 +0200 Subject: [PATCH 0082/1120] automake 1.11: fix test case with Autoconf 2.69 --- .../tools/misc/automake/automake-1.11.x.nix | 5 +++++ .../misc/automake/fix-test-autoconf-2.69.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 65ef3a9a146d..2172460b3c9f 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg"; }; + patches = [ ./fix-test-autoconf-2.69.patch ]; + buildInputs = [perl autoconf makeWrapper]; inherit doCheck; @@ -27,6 +29,9 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + # Run the test suite in parallel. + enableParallelBuilding = true; + meta = { homepage = http://www.gnu.org/software/automake/; description = "GNU Automake, a GNU standard-compliant makefile generator"; diff --git a/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch b/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch new file mode 100644 index 000000000000..2ffa91f24eda --- /dev/null +++ b/pkgs/development/tools/misc/automake/fix-test-autoconf-2.69.patch @@ -0,0 +1,13 @@ +With Autoconf 2.69 (instead of 2.68), config.{guess,sub} are needed. + +--- automake-1.11.2/tests/compile_f90_c_cxx.test 2011-12-20 21:56:29.000000000 +0100 ++++ automake-1.11.2/tests/compile_f90_c_cxx.test 2012-07-07 13:35:58.000000000 +0200 +@@ -41,7 +41,7 @@ END + : > baz.cc + + $ACLOCAL +-$AUTOMAKE ++$AUTOMAKE --add-missing + + # Look for the macros at the beginning of rules. Be careful, as there + # are literal tabs at the beginning of the search strings. From 50d9f2300a0d322370ffa502a6bc14bfc8d66e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 13:56:29 +0200 Subject: [PATCH 0083/1120] add `.gitignore' --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..6405b7860f29 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +,* From 2424ac71e07bda9f8950ce17a931285f89072fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 7 Jul 2012 15:44:34 +0200 Subject: [PATCH 0084/1120] libmng: use Automake 1.11 Reported by Peter Simons . --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b03529e22cf..27ec1527ff31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4128,7 +4128,9 @@ let libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { }; + libmng = callPackage ../development/libraries/libmng { + automake = automake111x; + }; libmodplug = callPackage ../development/libraries/libmodplug {}; From 631a59e449c878689cc59c23cdf932cd7a695461 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Sat, 7 Jul 2012 17:12:18 +0200 Subject: [PATCH 0085/1120] Added mr - Multiple Repository management tool --- .../version-management/mr/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/version-management/mr/default.nix diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix new file mode 100644 index 000000000000..ca272504517a --- /dev/null +++ b/pkgs/applications/version-management/mr/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit, fetchgitrevision, perl }: + +stdenv.mkDerivation rec { + + version = "1.12"; + name = "mr-" + version; + + src = fetchgit { + url = "git://git.kitenet.net/mr.git"; + rev = "353f63c968368edea9b14261f510c34ce4e0c97f"; + }; + + buildInputs = [perl]; + + buildPhase = '' + make build + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/share/man/man1 + cp mr $out/bin + cp webcheckout $out/bin + cp mr.1 $out/share/man/man1 + cp webcheckout.1 $out/share/man/man1 + ''; + + meta = { + description = "Multiple Repository management tool"; + longDescription = ''The mr(1) command can checkout, update, or perform other actions on a + set of repositories as if they were one combined respository. It + supports any combination of subversion, git, cvs, mercurial, bzr, + darcs, cvs, vcsh, fossil and veracity repositories, and support for + other revision control systems can easily be added. (There are + extensions adding support for unison and git-svn.) + + It is extremely configurable via simple shell scripting. Some examples + of things it can do include: + + - Update a repository no more frequently than once every twelve + hours. + - Run an arbitrary command before committing to a + repository. + - When updating a git repository, pull from two + different upstreams and merge the two together. + - Run several repository updates in parallel, greatly speeding + up the update process. + - Remember actions that failed due to a laptop being + offline, so they can be retried when it comes back online. + ''; + homepage = http://joeyh.name/code/mr/; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.antono ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27ec1527ff31..61eb56e41d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,6 +1056,8 @@ let mpage = callPackage ../tools/text/mpage { }; + mr = callPackage ../applications/version-management/mr { }; + mscgen = callPackage ../tools/graphics/mscgen { }; msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) { From 77b03dbc7112cd20bcebce3f0b7e288f4bc12791 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Jul 2012 20:11:06 +0400 Subject: [PATCH 0086/1120] update-upstream-data: Fix a small bug --- pkgs/build-support/upstream-updater/attrset-to-dir.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.sh b/pkgs/build-support/upstream-updater/attrset-to-dir.sh index 0e0c50e12598..2d99ef110a1c 100755 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.sh +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.sh @@ -1,8 +1,8 @@ #! /bin/sh [ -n "$2" ] && NIXPKGS_ALL="$2"; -[ -z "$NIXPKGS_ALL" ] && [ -f "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; -[ -z "$NIXPKGS_ALL" ] && [ -f "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; +[ -z "$NIXPKGS_ALL" ] && [ -d "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; [ -z "$NIXPKGS_ALL" ] && { echo "Cannot find Nixpkgs source. Please specify it via NIXPKGS_ALL or second command line argument" exit 1 From 253c129f78295b2e4b9d485f0c69d49b541d5b31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Jul 2012 20:11:55 +0400 Subject: [PATCH 0087/1120] SBCL: update to 1.0.57 It looks like SBCL 1.0.58 is not coming soon, so I update to the latest release now. --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 66e389947a0a..467ed05a6a44 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.56"; - name="sbcl-1.0.56"; - hash="0cq5hyzv3nnva0y1y6zjyd7rfdwwpxswnvmbfmqvhihz72ivyl1w"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.56/sbcl-1.0.56-source.tar.bz2"; + version="1.0.57"; + name="sbcl-1.0.57"; + hash="1vvifyq0lapx6p6wz6jknsgch3lbyr7m785844wdgkdx2hh8ch51"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; } From 2331ea4ec29db3a024e8ba7c5e4f86f692e62ac2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Jul 2012 20:32:48 +0400 Subject: [PATCH 0088/1120] TPTP: update to 5.4.0 --- pkgs/applications/science/logic/tptp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index ecd70843e0fd..87a320067131 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="TPTP"; - version="5.3.0"; + version="5.4.0"; name="${baseName}-${version}"; url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"; - hash="0xzybh332x53q4cmb3i47ygln0x6rd2nx810la1hmja9d1ixnz9b"; + hash="0nyq2kkiphwgj3hczc7zglzqjj6hxxsh6zcygpy4yhxh9a9rpkg1"; }; in rec { From 0c107996d335850d1c9e9626430f328f8dc45e91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 22:19:51 +0200 Subject: [PATCH 0089/1120] maxima: update to version 5.27.0 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0d3a12b38c28..41c21f94b011 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.26.0"; + version = "5.27.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9"; + sha256 = "9006803714f1385221c4395697fad53f125a13d29b50b188d045d08e25f8dca7"; }; buildInputs = [sbcl texinfo perl makeWrapper]; From 55ea7dc4539d0e456ce5ee32bd5d7445019532cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 7 Jul 2012 22:20:09 +0200 Subject: [PATCH 0090/1120] wxmaxima: update to version 12.04.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 9592f8f98718..52048dc9d197 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "12.01.0"; + version = "12.04.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054"; + sha256 = "60110507e0a63738a1f420b22697eaac9bea3866122e072dcd697077e8744824"; }; buildInputs = [wxGTK maxima makeWrapper]; From 0841407843512e0adbbefa1f4316d79888d48c69 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 7 Jul 2012 18:00:58 -0400 Subject: [PATCH 0091/1120] ledger3: Build with boost 1.49 The build failed with boost 1.50, and succeeds now. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61eb56e41d10..a00451a36253 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7023,7 +7023,9 @@ let links = callPackage ../applications/networking/browsers/links { }; ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger3 = callPackage ../applications/office/ledger/3.0.nix { + boost = boost149; + }; links2 = callPackage ../applications/networking/browsers/links2 { }; From 90d6e6890a480a8e2be1a2135d4f7fcc81aafbcf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jul 2012 00:32:05 +0200 Subject: [PATCH 0092/1120] perl-packages.nix: add Crypt-OpenSSL-Random-0.04, Crypt-OpenSSL-RSA-0.28, IO-Socket-INET6-2.69, and Mail-DKIM-0.39 --- pkgs/top-level/perl-packages.nix | 63 ++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bd998e5a67ff..ec2b52bfc259 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -939,6 +939,27 @@ rec { }; }; + CryptOpenSSLRandom = buildPerlPackage rec { + name = "Crypt-OpenSSL-Random-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IR/IROBERTS/${name}.tar.gz"; + sha256 = "acf7eb81023cd1f40d8c60b893096d041513df2be2aefe145cc7ae1a3dcc78c7"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + }; + + CryptOpenSSLRSA = buildPerlPackage rec { + name = "Crypt-OpenSSL-RSA-0.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLER/${name}.tar.gz"; + sha256 = "5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be"; + }; + propagatedBuildInputs = [ CryptOpenSSLRandom ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + }; + CryptSSLeay = buildPerlPackage rec { name = "Crypt-SSLeay-0.57"; src = fetchurl { @@ -1015,7 +1036,7 @@ rec { sha256 = "1998syyprmqnhpgznmk7ia3zd8saw34q7pbaprxarcz7a3bncyjc"; }; buildInputs = [ TestRequires ]; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassLoad Moose TaskWeaken TieToObject NamespaceClean ]; }; @@ -1672,12 +1693,12 @@ rec { url = "mirror://cpan/modules/by-module/HTML/${name}.tar.gz"; sha256 = "1yg9fy6s8f1jscfxf7a9hm91x43cjhk3ijw46z94sw8133h50rvy"; }; - propagatedBuildInputs = + propagatedBuildInputs = [ ClassAccessorChained Clone ConfigAny DateCalc ListMoreUtils EmailValid DataVisitor DateTime DateTimeFormatBuilder DateTimeFormatStrptime DateTimeFormatNatural - Readonly YAMLLibYAML NumberFormat HashFlatten + Readonly YAMLLibYAML NumberFormat HashFlatten HTMLTokeParserSimple RegexpCommon CaptchaReCAPTCHA HTMLScrubber FileShareDir TemplateToolkit CryptCBC CryptDES PathClass @@ -1884,6 +1905,16 @@ rec { }; }; + IOSocketInet6 = buildPerlPackage rec { + name = "IO-Socket-INET6-2.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; + sha256 = "accd565643969d905e199e28e60e833213ccc2026c372432df01e49b044c3045"; + }; + propagatedBuildInputs = [Socket6]; + doCheck = false; + }; + IOSocketSSL = buildPerlPackage rec { name = "IO-Socket-SSL-1.44"; src = fetchurl { @@ -2222,6 +2253,15 @@ rec { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MailDKIM = buildPerlPackage rec { + name = "Mail-DKIM-0.39"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JA/JASLONG/${name}.tar.gz"; + sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b"; + }; + propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; + }; + MailIMAPClient = buildPerlPackage { name = "Mail-IMAPClient-2.2.9"; src = fetchurl { @@ -2541,6 +2581,14 @@ rec { propagatedBuildInputs = [ BHooksEndOfScope DevelHide PackageStash ]; }; + NetAddrIP = buildPerlPackage rec { + name = "NetAddr-IP-4.062"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKER/${name}.tar.gz"; + sha256 = "08c037afe314ca2e6369f8aa92eb4b8937f493f977f9f1f35ca396c1de8ed0c6"; + }; + }; + NetAmazonEC2 = buildPerlPackage rec { name = "Net-Amazon-EC2-0.14-stanaka-bc66577e13"; src = fetchurl { @@ -3051,6 +3099,15 @@ rec { }; }; + Socket6 = buildPerlPackage rec { + name = "Socket6-0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz"; + sha256 = "eda753f0197e8c3c8d4ab20a634561ce84011fa51aa5ff40d4dbcb326ace0833"; + }; + buildInputs = [ pkgs.which ]; + }; + SortVersions = buildPerlPackage rec { name = "Sort-Versions-1.5"; src = fetchurl { From 9c5f8974651e30d46ecbd73c8eefbae84992c2f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jul 2012 00:32:30 +0200 Subject: [PATCH 0093/1120] SpamAssassin: add version 3.3.2 --- pkgs/servers/mail/spamassassin/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/servers/mail/spamassassin/default.nix diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix new file mode 100644 index 000000000000..8f22d08b7592 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile +, HTTPDate, MailDKIM +}: + +# TODO: +# +# - Mail::SPF +# - IP::Country +# - Razor2 +# - Net::Ident +# - DBI +# - LWP::UserAgent +# - Encode::Detect + +buildPerlPackage rec { + name = "SpamAssassin-3.3.2"; + + src = fetchurl { + url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2"; + sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; + }; + + propagatedBuildInputs = [ HTMLParser NetDNS NetAddrIP DBFile + HTTPDate MailDKIM ]; + + makeFlags = "PERL_BIN=${perl}/bin/perl"; + + doCheck = false; + + meta = { + homepage = "http://spamassassin.apache.org/"; + description = "Open-Source Spam Filter"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a00451a36253..ec698f9735ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5280,6 +5280,11 @@ let redstore = callPackage ../servers/http/redstore { }; + spamassassin = callPackage ../servers/mail/spamassassin { + inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile + HTTPDate MailDKIM; + }; + samba = callPackage ../servers/samba { }; # A lightweight Samba, useful for non-Linux-based OSes. From 75adf28346f1fddfe6f61d8010ca236ed61d2362 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 8 Jul 2012 12:36:24 +0200 Subject: [PATCH 0094/1120] perl-MailDKIM: the unit test suite fails on Hydra because it relies on network access --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ec2b52bfc259..9ce012ec7c7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2260,6 +2260,7 @@ rec { sha256 = "b1425a540f514c483e80566fb3decc2c1db4162306f6ae8794cef72a2d73557b"; }; propagatedBuildInputs = [ CryptOpenSSLRSA NetDNS MailTools ]; + doCheck = false; # tries to access the domain name system }; MailIMAPClient = buildPerlPackage { From 02cafefac47181ad7c5994a68a19f84434a9a4af Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 8 Jul 2012 07:00:50 -0400 Subject: [PATCH 0095/1120] ec2-api-tools: Upstream updated zipball --- pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index 1d146aa449e8..a85d4223b714 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65"; + sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h"; }; buildInputs = [ unzip makeWrapper ]; From ac1081fb48f65fb8e2ba1500f12105c92ccce266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 8 Jul 2012 23:48:00 +0200 Subject: [PATCH 0096/1120] guile: update to 2.0.6 --- pkgs/development/interpreters/guile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index ea895fb1186d..0e1e21ed9621 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.5"; + name = "guile-2.0.6"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "1lycm10x316jzlv1nyag7x9gisn4d3dz8jcmbi6lbdn0z6a9skc2"; + sha256 = "000ng5qsq3cl1k35jvzvhwxj92wx4q87745n2fppkd4irh58vv5l"; }; buildNativeInputs = [ makeWrapper gawk pkgconfig ]; From 9abd2194cef1b5f807db49dae7e11ca01017c604 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 8 Jul 2012 18:42:55 -0400 Subject: [PATCH 0097/1120] Revert "qemu-kvm: update to 1.1.0" This reverts commit df645c22cc8931f076c2c9fa4a982368633d83e9. KVM 1.1.0 breaks several VM builds. The NixOS installer tests hang: http://hydra.nixos.org/build/2763935 but worse, some builds give random failures indicating corruption: http://hydra.nixos.org/build/2776221 http://hydra.nixos.org/build/2776180 http://hydra.nixos.org/build/2769347 http://hydra.nixos.org/build/2769337 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 8 +++--- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index af200c7a1ef1..f6709bb439f4 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,20 +3,20 @@ assert stdenv.isLinux; -let version = "1.1.0"; in +let version = "1.0.1"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "1gzch3yshq7yirc5k3cn0m3ibd6qbl2hvl1lbh7lychfc7s4a963"; + sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; }; - patches = [ ./smb-tmpdir.patch ]; + patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; postPatch = - '' for i in $(find . -type f) + '' for i in $(find kvm -type f) do sed -i "$i" \ -e 's|/bin/bash|/bin/sh|g ; diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch new file mode 100644 index 000000000000..446a69a146b0 --- /dev/null +++ b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch @@ -0,0 +1,27 @@ +From http://patchwork.ozlabs.org/patch/137186/ + +diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c +--- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200 ++++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100 +@@ -1,7 +1,7 @@ + /* + * Block driver for the Virtual Disk Image (VDI) format + * +- * Copyright (c) 2009 Stefan Weil ++ * Copyright (c) 2009, 2012 Stefan Weil + * + * 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 +@@ -767,8 +767,12 @@ + acb->header_modified = 1; + } + acb->bmap_last = block_index; ++ /* Copy data to be written to new block and zero unused parts. */ ++ memset(block, 0, sector_in_block * SECTOR_SIZE); + memcpy(block + sector_in_block * SECTOR_SIZE, + acb->buf, n_sectors * SECTOR_SIZE); ++ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0, ++ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE); + acb->hd_iov.iov_base = (void *)block; + acb->hd_iov.iov_len = s->block_size; + qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1); From 172f03517eda4829938583b3994ea93dc40c6277 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 9 Jul 2012 07:11:10 +0200 Subject: [PATCH 0098/1120] ratpoison: install ratpoison.el into $out/share/emacs/site-lisp directory where Emacs can find it Also, copy the glibc patch into Nixpkgs to avoid errors with changing hashes from cgit. --- .../window-managers/ratpoison/default.nix | 55 +++++++++---------- .../window-managers/ratpoison/glibc-fix.patch | 22 ++++++++ 2 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 pkgs/applications/window-managers/ratpoison/glibc-fix.patch diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 77a998b9f74c..262b46190fbb 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -9,44 +9,43 @@ stdenv.mkDerivation rec { sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03"; }; - patches = - [ (fetchurl { - url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e"; - sha256 = "118c5b481fa22b8fefbe34e3dbb157f621a3bf5de0c7beb540001c99ff403a5f"; - }) - ]; - - preConfigure = "autoreconf -vf"; # needed because of the patch above - - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh - buildInputs = [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst xextproto readline libXi pkgconfig perl autoconf automake ]; + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh + + preConfigure = "autoreconf -vf"; # needed because of the patch above + + patches = [ ./glibc-fix.patch ]; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/ + ''; + meta = { + homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - longDescription = - '' Ratpoison is a simple window manager with no fat library - dependencies, no fancy graphics, no window decorations, and no - rodent dependence. It is largely modelled after GNU Screen which - has done wonders in the virtual terminal market. - - The screen can be split into non-overlapping frames. All windows - are kept maximized inside their frames to take full advantage of - your precious screen real estate. - - All interaction with the window manager is done through keystrokes. - Ratpoison has a prefix map to minimize the key clobbering that - cripples Emacs and other quality pieces of software. - ''; - license = "GPLv2+"; - homepage = http://www.nongnu.org/ratpoison/; + longDescription = '' + Ratpoison is a simple window manager with no fat library + dependencies, no fancy graphics, no window decorations, and no + rodent dependence. It is largely modelled after GNU Screen which + has done wonders in the virtual terminal market. + + The screen can be split into non-overlapping frames. All windows + are kept maximized inside their frames to take full advantage of + your precious screen real estate. + + All interaction with the window manager is done through keystrokes. + Ratpoison has a prefix map to minimize the key clobbering that + cripples Emacs and other quality pieces of software. + ''; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/ratpoison/glibc-fix.patch b/pkgs/applications/window-managers/ratpoison/glibc-fix.patch new file mode 100644 index 000000000000..c779d5af795e --- /dev/null +++ b/pkgs/applications/window-managers/ratpoison/glibc-fix.patch @@ -0,0 +1,22 @@ +From 4ad0b38fb53506d613c4b4f7268dadfcedae9b8e Mon Sep 17 00:00:00 2001 +From: Shawn Betts +Date: Mon, 13 Jul 2009 01:23:25 +0000 +Subject: check for getline in configure.in + +This fixes a build error encountered on glibc 2.10 systems +--- +diff --git a/configure.in b/configure.in +index 0c1b42c..08f4ee8 100644 +--- a/configure.in ++++ b/configure.in +@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h) + dnl Checks for typedefs, structures, and compiler characteristics. + + dnl Checks for library functions. +-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep) ++AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline) + + AC_TYPE_SIGNAL + +-- +cgit v0.9.0.2 From 57e1ad943ed5d59bafc28641bb748805eb6fa0e7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Jul 2012 04:06:36 -0400 Subject: [PATCH 0099/1120] hello: Update to 2.8 --- pkgs/applications/misc/hello/ex-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 2c62159225dd..80a3fb702c02 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.7"; + name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "1h17p5lgg47lbr2cnp4qqkr0q0f0rpffyzmvs7bvc6vdrxdknngx"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; }; doCheck = true; From 45bbcb9638d7b5cdf13c7e9d594e3cd660b31eca Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Jul 2012 11:44:44 -0400 Subject: [PATCH 0100/1120] Add initial attempt at ossec Note: This will almost certainly not work as-is, but at least it compiles. NixOS module to come. --- pkgs/tools/security/ossec/default.nix | 40 ++++++ pkgs/tools/security/ossec/no-root.patch | 176 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 218 insertions(+) create mode 100644 pkgs/tools/security/ossec/default.nix create mode 100644 pkgs/tools/security/ossec/no-root.patch diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix new file mode 100644 index 000000000000..f6f062011ab6 --- /dev/null +++ b/pkgs/tools/security/ossec/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, which }: + +stdenv.mkDerivation { + name = "ossec-client-2.6"; + + src = fetchurl { + url = http://www.ossec.net/files/ossec-hids-2.6.tar.gz; + + sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; + }; + + buildInputs = [ which ]; + + phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + + patches = [ ./no-root.patch ]; + + buildPhase = '' + echo "en + +agent +$out +no +127.0.0.1 +yes +yes +yes + + +" | ./install.sh + ''; + + meta = { + description = "Open soruce host-based instrusion detection system"; + homepage = http://www.ossec.net; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/tools/security/ossec/no-root.patch b/pkgs/tools/security/ossec/no-root.patch new file mode 100644 index 000000000000..ea6e9c54a9ae --- /dev/null +++ b/pkgs/tools/security/ossec/no-root.patch @@ -0,0 +1,176 @@ +diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh +--- ossec-hids-2.6-orig/install.sh 2011-07-11 15:36:58.000000000 -0400 ++++ ossec-hids-2.6/install.sh 2012-07-09 09:58:57.970692818 -0400 +@@ -119,14 +119,14 @@ + # Generate the /etc/ossec-init.conf + VERSION_FILE="./src/VERSION" + VERSION=`cat ${VERSION_FILE}` +- chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 +- echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} +- echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} +- echo "DATE=\"`date`\"" >> ${OSSEC_INIT} +- echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} +- chmod 600 ${OSSEC_INIT} +- cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} +- chmod 644 ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 ++ echo "DIRECTORY=\"${INSTALLDIR}\"" > ${INSTALLDIR}${OSSEC_INIT} ++ echo "VERSION=\"${VERSION}\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo "DATE=\"`date`\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo "TYPE=\"${INSTYPE}\"" >> ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 600 ${OSSEC_INIT} ++ echo cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} ++ echo chmod 644 ${INSTALLDIR}${OSSEC_INIT} + + + # If update_rules is set, we need to tweak +@@ -926,11 +926,6 @@ + catError "0x1-location"; + fi + +- # Must be root +- if [ ! "X$ME" = "Xroot" ]; then +- catError "0x2-beroot"; +- fi +- + # Checking dependencies + checkDependencies + +diff -Naur ossec-hids-2.6-orig/src/InstallAgent.sh ossec-hids-2.6/src/InstallAgent.sh +--- ossec-hids-2.6-orig/src/InstallAgent.sh 2011-07-11 15:36:58.000000000 -0400 ++++ ossec-hids-2.6/src/InstallAgent.sh 2012-07-09 09:56:12.061870552 -0400 +@@ -80,7 +80,7 @@ + else + grep "^${USER}" /etc/passwd > /dev/null 2>&1 + if [ ! $? = 0 ]; then +- /usr/sbin/groupadd ${GROUP} ++ echo /usr/sbin/groupadd ${GROUP} + + # We first check if /sbin/nologin is present. If it is not, + # we look for bin/false. If none of them is present, we +@@ -93,7 +93,7 @@ + OSMYSHELL="/bin/false" + fi + fi +- /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} ++ echo /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} + fi + fi + +@@ -105,31 +105,31 @@ + done + + # Default for all directories +-chmod -R 550 ${DIR} +-chown -R root:${GROUP} ${DIR} ++echo chmod -R 550 ${DIR} ++echo chown -R root:${GROUP} ${DIR} + + # To the ossec queue (default for agentd to read) +-chown -R ${USER}:${GROUP} ${DIR}/queue/ossec +-chmod -R 770 ${DIR}/queue/ossec ++echo chown -R ${USER}:${GROUP} ${DIR}/queue/ossec ++echo chmod -R 770 ${DIR}/queue/ossec + + # For the logging user +-chown -R ${USER}:${GROUP} ${DIR}/logs +-chmod -R 750 ${DIR}/logs +-chmod -R 775 ${DIR}/queue/rids +-touch ${DIR}/logs/ossec.log +-chown ${USER}:${GROUP} ${DIR}/logs/ossec.log +-chmod 664 ${DIR}/logs/ossec.log +- +-chown -R ${USER}:${GROUP} ${DIR}/queue/diff +-chmod -R 750 ${DIR}/queue/diff +-chmod 740 ${DIR}/queue/diff/* > /dev/null 2>&1 ++echo chown -R ${USER}:${GROUP} ${DIR}/logs ++echo chmod -R 750 ${DIR}/logs ++echo chmod -R 775 ${DIR}/queue/rids ++echo touch ${DIR}/logs/ossec.log ++echo chown ${USER}:${GROUP} ${DIR}/logs/ossec.log ++echo chmod 664 ${DIR}/logs/ossec.log ++ ++echo chown -R ${USER}:${GROUP} ${DIR}/queue/diff ++echo chmod -R 750 ${DIR}/queue/diff ++echo chmod 740 ${DIR}/queue/diff/* "> /dev/null 2>&1" + + + + + # For the etc dir +-chmod 550 ${DIR}/etc +-chown -R root:${GROUP} ${DIR}/etc ++echo chmod 550 ${DIR}/etc ++echo chown -R root:${GROUP} ${DIR}/etc + + ls /etc/localtime > /dev/null 2>&1 + if [ $? = 0 ]; then +@@ -167,25 +167,25 @@ + cp -pr ../etc/client.keys ${DIR}/etc/ > /dev/null 2>&1 + cp -pr agentlessd/scripts/* ${DIR}/agentless/ + +-chown root:${GROUP} ${DIR}/etc/internal_options.conf +-chown root:${GROUP} ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 +-chown root:${GROUP} ${DIR}/etc/client.keys > /dev/null 2>&1 +-chown root:${GROUP} ${DIR}/agentless/* +-chown ${USER}:${GROUP} ${DIR}/.ssh +-chown -R root:${GROUP} ${DIR}/etc/shared +- +-chmod 550 ${DIR}/etc +-chmod 440 ${DIR}/etc/internal_options.conf +-chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 +-chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 +-chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it +-chmod 550 ${DIR}/agentless/* +-chmod 700 ${DIR}/.ssh ++echo chown root:${GROUP} ${DIR}/etc/internal_options.conf ++echo chown root:${GROUP} ${DIR}/etc/local_internal_options.conf "> /dev/null 2>&1" ++echo chown root:${GROUP} ${DIR}/etc/client.keys "> /dev/null 2>&1" ++echo chown root:${GROUP} ${DIR}/agentless/* ++echo chown ${USER}:${GROUP} ${DIR}/.ssh ++echo chown -R root:${GROUP} ${DIR}/etc/shared ++ ++echo chmod 550 ${DIR}/etc ++echo chmod 440 ${DIR}/etc/internal_options.conf ++echo chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 ++echo chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 ++echo chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it ++echo chmod 550 ${DIR}/agentless/* ++echo chmod 700 ${DIR}/.ssh + + + # For the /var/run +-chmod 770 ${DIR}/var/run +-chown root:${GROUP} ${DIR}/var/run ++echo chmod 770 ${DIR}/var/run ++echo chown root:${GROUP} ${DIR}/var/run + + + # Moving the binary files +@@ -201,11 +201,11 @@ + sh ./init/fw-check.sh execute > /dev/null + cp -pr ../active-response/*.sh ${DIR}/active-response/bin/ + cp -pr ../active-response/firewalls/*.sh ${DIR}/active-response/bin/ +-chmod 755 ${DIR}/active-response/bin/* +-chown root:${GROUP} ${DIR}/active-response/bin/* ++echo chmod 755 ${DIR}/active-response/bin/* ++echo chown root:${GROUP} ${DIR}/active-response/bin/* + +-chown root:${GROUP} ${DIR}/bin/* +-chmod 550 ${DIR}/bin/* ++echo chown root:${GROUP} ${DIR}/bin/* ++echo chmod 550 ${DIR}/bin/* + + + # Moving the config file +@@ -221,8 +221,8 @@ + else + cp -pr ../etc/ossec-agent.conf ${DIR}/etc/ossec.conf + fi +-chown root:${GROUP} ${DIR}/etc/ossec.conf +-chmod 440 ${DIR}/etc/ossec.conf ++echo chown root:${GROUP} ${DIR}/etc/ossec.conf ++echo chmod 440 ${DIR}/etc/ossec.conf + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f2669f1932e..8bdb90d3bba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1198,6 +1198,8 @@ let optipng = callPackage ../tools/graphics/optipng { }; + ossec = callPackage ../tools/security/ossec {}; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; From a0cb7e4a61ee7ddfd3a5e49d9d9f40e35c1a4e19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 13:47:16 -0400 Subject: [PATCH 0101/1120] Add aws, a utility for working with various AWS services --- pkgs/tools/virtualization/aws/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/virtualization/aws/default.nix diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix new file mode 100644 index 000000000000..00cc4e7733fb --- /dev/null +++ b/pkgs/tools/virtualization/aws/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "aws-1.75"; + + src = fetchurl { + url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; + sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; + }; + + buildInputs = [ perl ]; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + cp $src $out/bin/aws + chmod +x $out/bin/aws + ''; + + meta = { + homepage = http://www.timkay.com/aws/; + description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bdb90d3bba0..e8f167ff1933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -419,6 +419,8 @@ let qt4Support = getConfig [ "avahi" "qt4Support" ] false; }; + aws = callPackage ../tools/virtualization/aws { }; + aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; axel = callPackage ../tools/networking/axel { }; From b00c839f4baf594778ac89ff7f7c17587536a85c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 15:26:07 -0400 Subject: [PATCH 0102/1120] Add ElasticMQ, a message queue service --- pkgs/servers/elasticmq/default.nix | 39 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++--- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/elasticmq/default.nix diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix new file mode 100644 index 000000000000..3d0324775f89 --- /dev/null +++ b/pkgs/servers/elasticmq/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, jre, makeWrapper, which }: + +stdenv.mkDerivation rec { + name = "elasticmq-0.5"; + + src = fetchurl { + url = "https://github.com/downloads/adamw/elasticmq/${name}.tar.gz"; + sha256 = "1zpv3vzairprh4x9fia82qqr14kf5hpxq1r90mn4ww7ighbv9pf1"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = + '' + mkdir -p $out/bin + cp -prd lib conf $out/ + + cp bin/run.sh $out/bin/elasticmq + substituteInPlace $out/bin/elasticmq --replace '-DBASEDIR=$BASEDIR' '-DBASEDIR=''${ELASTICMQ_DATA_PREFIX:-.}' + + wrapProgram $out/bin/elasticmq --prefix PATH : "${which}/bin:${jre}/bin" + ''; + + meta = { + homepage = https://github.com/adamw/elasticmq; + description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + longDescription = + '' + ElasticMQ is a message queueing system with Java, Scala and + Amazon SQS-compatible interfaces. You should set the + environment ELASTICMQ_DATA_PREFIX to a writable directory + where ElasticMQ will store its data and log files. It also + looks for its configuration file in + $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the + Default.scala included in the distribution as a template. + ''; + license = "APLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8f167ff1933..2acb2bb9ed66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5133,6 +5133,10 @@ let inherit openssl libtool perl; }; + couchdb = callPackage ../servers/http/couchdb { + spidermonkey = spidermonkey_185; + }; + dico = callPackage ../servers/dico { }; dict = callPackage ../servers/dict { }; @@ -5152,9 +5156,7 @@ let ejabberd = callPackage ../servers/xmpp/ejabberd { }; - couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_185; - }; + elasticmq = callPackage ../servers/elasticmq { }; felix = callPackage ../servers/felix { }; From 03964c10327fa52cd46c069e6f28715656ccbf55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 17:25:23 -0400 Subject: [PATCH 0103/1120] Add fakes3, an implementation of the S3 protocol for testing --- .../interpreters/ruby/generated.nix | 370 +++++++++--------- 1 file changed, 181 insertions(+), 189 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index a2a6273da604..bc50a08f29a8 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,68 +3,69 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_8_0; - actionmailer = g.actionmailer_3_2_3; - actionpack = g.actionpack_3_2_3; - activemodel = g.activemodel_3_2_3; - activerecord = g.activerecord_3_2_3; - activeresource = g.activeresource_3_2_3; - activesupport = g.activesupport_3_2_3; + 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; arel = g.arel_3_0_2; - atoulme_Antwrap = g.atoulme_Antwrap_0_7_1; + atoulme_Antwrap = g.atoulme_Antwrap_0_7_2; autotest_rails = g.autotest_rails_4_1_2; builder = g.builder_3_0_0; - buildr = g.buildr_1_4_6; - bundler = g.bundler_1_1_3; - childprocess = g.childprocess_0_3_2; + buildr = g.buildr_1_4_7; + bundler = g.bundler_1_1_4; + childprocess = g.childprocess_0_3_3; 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; - highline = g.highline_1_5_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; - journey = g.journey_1_0_3; - json = g.json_1_7_0; - json_pure = g.json_pure_1_7_0; + 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; mail = g.mail_2_4_4; - mime_types = g.mime_types_1_18; + mime_types = g.mime_types_1_19; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_3_4; - net_sftp = g.net_sftp_2_0_4; - net_ssh = g.net_ssh_2_3_0; + multi_json = g.multi_json_1_3_6; + net_sftp = g.net_sftp_2_0_5; + net_ssh = g.net_ssh_2_5_2; nix = g.nix_0_1_1; polyglot = g.polyglot_0_3_3; rack = g.rack_1_4_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_3; - railties = g.railties_3_2_3; + 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; rdoc = g.rdoc_3_12; rjb = g.rjb_1_4_0; - rspec = g.rspec_2_1_0; - rspec_core = g.rspec_core_2_1_0; - rspec_expectations = g.rspec_expectations_2_1_0; - rspec_mocks = g.rspec_mocks_2_1_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; rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_8; - sass = g.sass_3_1_17; - selenium_webdriver = g.selenium_webdriver_2_21_2; + 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_14_6; + thor = g.thor_0_15_4; 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; }; - gem_nix_args = [ ''autotest-rails'' ''buildr'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; + gem_nix_args = [ ''autotest-rails'' ''buildr'' ''fakes3'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ]; gems = { - ZenTest_4_8_0 = { + ZenTest_4_8_1 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -91,75 +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.0''; + name = ''ZenTest-4.8.1''; requiredGems = [ ]; - sha256 = ''1z999prd8imx8wnb8jv3i19xmzrwd72b05zhk875mbg5q64nbpnz''; + sha256 = ''0jp86czz16b0wamxvzs8p7pxwagj68h2zch9yjmjk7b069xrsg3v''; }; - actionmailer_3_2_3 = { + actionmailer_3_2_6 = { 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.3''; + name = ''actionmailer-3.2.6''; requiredGems = [ g.mail_2_4_4 ]; - sha256 = ''09zzg09q6321l4gdyk9w7400di7rqvrhh427s666frlh1a91gdj4''; + sha256 = ''1h9035i9rnh98pc4z073cpcjjkwcswjigg1a3a6ll0s9lb6dnk54''; }; - actionpack_3_2_3 = { + actionpack_3_2_6 = { 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.3''; - requiredGems = [ g.activemodel_3_2_3 g.rack_cache_1_2 g.rack_test_0_6_1 g.journey_1_0_3 g.sprockets_2_1_3 g.erubis_2_7_0 ]; - sha256 = ''0wg42jikmsy5bj8wp3kp21ggj1x6g0abbk1i39rlpfvsgj7fwx8v''; + 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''; }; - activemodel_3_2_3 = { + activemodel_3_2_6 = { 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.3''; - requiredGems = [ g.builder_3_0_0 ]; - sha256 = ''1n287g8nbm0bkvz0qh7pqw1racpzvfjzmgil9fn38p4k7dl3akg3''; + name = ''activemodel-3.2.6''; + requiredGems = [ ]; + sha256 = ''18bvwpfxr6kp66b62n17qgn7bb02va6bvckips36cxrkznafsk6j''; }; - activerecord_3_2_3 = { + activerecord_3_2_6 = { 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.3''; + name = ''activerecord-3.2.6''; requiredGems = [ g.arel_3_0_2 g.tzinfo_0_3_33 ]; - sha256 = ''0ms5q7c13d1pmzgspnwh58h9y5bzdfsjzkrkxqrrjxp0212ixcxn''; + sha256 = ''1xc901m3a85j28bn2f96fh9c5y4wq4xivympm32xj4zr2ib20c2m''; }; - activeresource_3_2_3 = { + activeresource_3_2_6 = { 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.3''; + name = ''activeresource-3.2.6''; requiredGems = [ ]; - sha256 = ''1hdsr4fs355lv3ncfjv8h2s4p61rhsbz2yk21ms3n19qwblbvnwa''; + sha256 = ''1lyv64rccgrdfhzccxj9qm5dnjy212x4q1nc21mf2xf2nc4zi33a''; }; - activesupport_3_2_3 = { + activesupport_3_2_6 = { 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.3''; - requiredGems = [ g.i18n_0_6_0 g.multi_json_1_3_4 ]; - sha256 = ''05656xcknixlkpjj5xrzk4bbniywmjn9blj0nsrpglplcf5ivh4g''; + 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''; @@ -193,7 +194,7 @@ database compatibility and query generation.''; requiredGems = [ ]; sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx''; }; - atoulme_Antwrap_0_7_1 = { + atoulme_Antwrap_0_7_2 = { 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.''; @@ -211,9 +212,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.1''; - requiredGems = [ g.rjb_1_4_0 ]; - sha256 = ''0r9jy2asyma8h0878nhjfbi00qvb4yapc8glngvmkkj21zbx2mfy''; + name = ''atoulme-Antwrap-0.7.2''; + requiredGems = [ ]; + sha256 = ''0r9l3cn0gjck5q00djas5h43pr64pjvafhz6f7zhki4qqkwbb6j3''; }; autotest_rails_4_1_2 = { basename = ''autotest_rails''; @@ -224,7 +225,7 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_8_0 ]; + requiredGems = [ g.ZenTest_4_8_1 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; builder_2_1_2 = { @@ -254,7 +255,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''13k12jii9z1hma4xxk2dl74wsx985idl3cs9svvla8p0bmgf3lzv''; }; - buildr_1_4_6 = { + buildr_1_4_7 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -266,42 +267,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.6''; - requiredGems = [ g.rake_0_8_7 g.builder_2_1_2 g.net_ssh_2_0_23 g.net_sftp_2_0_4 g.rubyzip_0_9_4 g.highline_1_5_1 g.json_pure_1_4_3 g.rubyforge_2_0_3 g.hoe_2_3_3 g.rjb_1_3_3 g.atoulme_Antwrap_0_7_1 g.diff_lcs_1_1_2 g.rspec_expectations_2_1_0 g.rspec_mocks_2_1_0 g.rspec_core_2_1_0 g.rspec_2_1_0 g.xml_simple_1_0_12 g.minitar_0_5_3 ]; - sha256 = ''11qwqrdnmzzi4zhgajfq1f1ckvd4kpfm9gyqrfjfalphs4gi0vxz''; + 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''; }; - bundler_1_1_3 = { + bundler_1_1_4 = { 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.3''; + name = ''bundler-1.1.4''; requiredGems = [ ]; - sha256 = ''df5ce52b6229bae5cf2eabae71858ea7e735fa0e479b4d00cff1ee18c5f6e800''; + sha256 = ''13pj4kk01xrdmdvgz1mvvhnbp1vi40gq50n8wdk3lpqp5za26gr0''; }; - childprocess_0_3_2 = { + childprocess_0_3_3 = { 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.2''; + name = ''childprocess-0.3.3''; requiredGems = [ g.ffi_1_0_11 ]; - sha256 = ''006j501yik87rlgkng2nqn13awnlgagk9p93bfsiccvc4fn73m3q''; - }; - diff_lcs_1_1_2 = { - basename = ''diff_lcs''; - meta = { - description = ''Provides a list of changes that represent the difference between two sequenced collections.''; - homepage = ''http://rubyforge.org/projects/ruwiki/''; - longDescription = ''Diff::LCS is a port of Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers. The implementation is based on Mario I. Wolczko's Smalltalk version (1.2, 1993) and Ned Konz's Perl version (Algorithm::Diff).''; - }; - name = ''diff-lcs-1.1.2''; - requiredGems = [ ]; - sha256 = ''1i5bfxh77whaasajhzd2qkm5zwy7ryb7pfc96m1fv9afwn6cg3yp''; + sha256 = ''0yqlbxnc427lnh1xw71qyzkic1pdpmacqxp8zw0gvx7yzkw3fjr0''; }; diff_lcs_1_1_3 = { basename = ''diff_lcs''; @@ -351,6 +341,16 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; + fakes3_0_1_5 = { + basename = ''fakes3''; + meta = { + description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects''; + 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 ]; + sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; + }; ffi_1_0_11 = { basename = ''ffi''; meta = { @@ -366,16 +366,20 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].''; requiredGems = [ ]; sha256 = ''177v6bwslyb7n961nw11i8x9j43k796s11bs98kynl58n0a3n99b''; }; - highline_1_5_1 = { + highline_1_6_2 = { basename = ''highline''; meta = { description = ''HighLine is a high-level command-line IO library.''; homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for command-line interfaces. HighLine also includes a complete menu system that can crank out anything from simple list selection to complete shells with just minutes of work.''; + longDescription = ''A high-level IO library that provides validation, type conversion, and more for +command-line interfaces. HighLine also includes a complete menu system that can +crank out anything from simple list selection to complete shells with just +minutes of work. +''; }; - name = ''highline-1.5.1''; + name = ''highline-1.6.2''; requiredGems = [ ]; - sha256 = ''0sawb011sc1i5glr80a4iflr0vvn3s5c97a4jmrhj3palv4df19i''; + sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn''; }; hike_1_2_1 = { basename = ''hike''; @@ -415,7 +419,7 @@ Plug-ins Provided: See class rdoc for help. Hint: ri Hoe''; }; name = ''hoe-2.3.3''; - requiredGems = [ g.rubyforge_2_0_4 g.rake_0_9_2_2 ]; + requiredGems = [ g.rubyforge_2_0_4 ]; sha256 = ''06jlnbhimrn6znimaaxm7kh2269lapkbmnp3wssrjmw06ms7lq9m''; }; i18n_0_6_0 = { @@ -429,27 +433,27 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0''; }; - journey_1_0_3 = { + journey_1_0_4 = { basename = ''journey''; meta = { description = ''Journey is a router''; homepage = ''http://github.com/rails/journey''; longDescription = ''Journey is a router. It routes requests.''; }; - name = ''journey-1.0.3''; + name = ''journey-1.0.4''; requiredGems = [ ]; - sha256 = ''15bxq7dqhk88n7cjvmx0ipizc22mzf5mnb58r1nq2sq5mcpag6gb''; + sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l''; }; - json_1_7_0 = { + json_1_7_3 = { 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.0''; + name = ''json-1.7.3''; requiredGems = [ ]; - sha256 = ''5affdd32dfc4a21f3d076d12e223a5da3778d0d027a6b033f556ba394c6ca6de''; + sha256 = ''1n969j5k0zb7dqfbnjhqm5hnxpsbi05rhsp5ww3cph7d5z6ycw0h''; }; json_pure_1_4_3 = { basename = ''json_pure''; @@ -462,16 +466,16 @@ See class rdoc for help. Hint: ri Hoe''; requiredGems = [ ]; sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r''; }; - json_pure_1_7_0 = { + json_pure_1_7_3 = { 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.0''; + name = ''json_pure-1.7.3''; requiredGems = [ ]; - sha256 = ''1c661piay7i4zvjl2v8w01x69v17ip5gxwqkfzclqf3zznym28pp''; + sha256 = ''0m316halw0l1gd2lx811qhyfs9a98dfgxign8zij0a1wn9wsh2ci''; }; libwebsocket_0_1_3 = { basename = ''libwebsocket''; @@ -492,28 +496,28 @@ See class rdoc for help. Hint: ri Hoe''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_18 g.treetop_1_4_10 ]; + requiredGems = [ g.mime_types_1_19 g.treetop_1_4_10 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; - mime_types_1_18 = { + mime_types_1_19 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.17.2. The identification of MIME content type is based -on a file's filename extensions. +type. This is release 1.19 with new MIME types. The identification of MIME +content type is based on a file's filename extensions. -MIME::Types for Ruby originally based on and synchronized with MIME::Types for -Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data +MIME::Types for Ruby was originally based on and synchronized with MIME::Types +for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the MIME::Type list has changed and the synchronization will no longer happen. :include: Licence.rdoc''; }; - name = ''mime-types-1.18''; + name = ''mime-types-1.19''; requiredGems = [ ]; - sha256 = ''00j7vragd5kdj235mskicn3nbg7hrdc6xjvc9bw9vqmal8x4707q''; + sha256 = ''1b44lrzk9v6i0jyajkx106qjyg8ns7siw1k42hmmwqj574ffsn26''; }; minitar_0_5_3 = { basename = ''minitar''; @@ -526,38 +530,27 @@ longer happen. requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_3_4 = { + multi_json_1_3_6 = { 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.4''; + name = ''multi_json-1.3.6''; requiredGems = [ ]; - sha256 = ''1w6zaswd6v30vjs4v8vzh638mlaybzwh15k74vmfr0jkb63amga0''; + sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; }; - net_sftp_2_0_4 = { + net_sftp_2_0_5 = { basename = ''net_sftp''; meta = { description = ''A pure Ruby implementation of the SFTP client protocol''; homepage = ''http://net-ssh.rubyforge.org/sftp''; longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; - name = ''net-sftp-2.0.4''; - requiredGems = [ g.net_ssh_2_3_0 ]; - sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky''; - }; - net_ssh_2_0_23 = { - 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.0.23''; - requiredGems = [ ]; - sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr''; + name = ''net-sftp-2.0.5''; + requiredGems = [ g.net_ssh_2_5_2 ]; + sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; net_ssh_2_3_0 = { basename = ''net_ssh''; @@ -570,6 +563,17 @@ longer happen. requiredGems = [ ]; sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv''; }; + net_ssh_2_5_2 = { + 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''; + requiredGems = [ ]; + sha256 = ''0kalahmwz9ypglrgg29wlvr4wx381pqwmx9fq3pk600v3j7j018l''; + }; nix_0_1_1 = { basename = ''nix''; meta = { @@ -650,38 +654,27 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0hq5q8fjhbb7szzrj7k0l21z025c4qsxqzd5qmgivikhymw10ws0''; }; - rails_3_2_3 = { + rails_3_2_6 = { 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.3''; - requiredGems = [ g.activesupport_3_2_3 g.actionpack_3_2_3 g.activerecord_3_2_3 g.activeresource_3_2_3 g.actionmailer_3_2_3 g.railties_3_2_3 g.bundler_1_1_3 ]; - sha256 = ''08kwzxw3y4qfy10x1h8g699h1bcp5dls2h440zdgywq45lrybmmq''; + 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''; }; - railties_3_2_3 = { + railties_3_2_6 = { 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.3''; - requiredGems = [ g.thor_0_14_6 g.rack_ssl_1_3_2 g.rdoc_3_12 ]; - sha256 = ''8715141b57dd5ad02dda101ea2812ece5e48bf6848d7586eb6c32f1d68ed7599''; - }; - rake_0_8_7 = { - 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 are specified in standard Ruby syntax.''; - }; - name = ''rake-0.8.7''; - requiredGems = [ ]; - sha256 = ''03z1zm7xwl2r9v945ambwbd9sn2smbi34xldmac7qjcmsvd7pcqh''; + name = ''railties-3.2.6''; + requiredGems = [ g.rack_ssl_1_3_2 g.rdoc_3_12 ]; + sha256 = ''1qyb4kcg2ld86qp411njr6cxfhv2ddw3jghk2rbr8d5f1ci7gfdh''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -703,7 +696,7 @@ request helpers feature.''; }; name = ''rb-fsevent-0.9.1''; requiredGems = [ ]; - sha256 = ''d06bb8a10fe89e66a2e017152d9c40d5f728ad2561f8ddd305f56fedfe566f0b''; + sha256 = ''02vgavzfsvzm0p9xvy314nnjixym82f2s58pw2i6d7p81yhvhsyh''; }; rdoc_3_12 = { basename = ''rdoc''; @@ -717,20 +710,8 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12''; - requiredGems = [ g.json_1_7_0 ]; - sha256 = ''77b6deba13ca090fb4608c218ec5d5c05d78e841cb0b53cb31f91fb56686a431''; - }; - rjb_1_3_3 = { - 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.3.3''; - requiredGems = [ ]; - sha256 = ''0jhj1y84yzdr11li784m255jvc191vs8d3zck21rfqv4z4zpifz6''; + requiredGems = [ g.json_1_7_3 ]; + sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp''; }; rjb_1_4_0 = { basename = ''rjb''; @@ -744,49 +725,60 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''03ildf1k04a430mqdfggld4wjvca3xd0d4qn0dwcfa2zxs3vnbz3''; }; - rspec_2_1_0 = { + rspec_2_9_0 = { basename = ''rspec''; meta = { - description = ''rspec-2.1.0''; - homepage = ''http://github.com/rspec/rspec''; - longDescription = ''Meta-gem that depends on the other rspec gems''; + description = ''rspec-2.9.0''; + homepage = ''http://github.com/rspec''; + longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.1.0''; - requiredGems = [ ]; - sha256 = ''16h7s8wr969wiig4qahr03ln144pz39jindlc3z11d064zvzhiza''; + name = ''rspec-2.9.0''; + requiredGems = [ g.rspec_expectations_2_9_1 ]; + sha256 = ''02r1cg82xia5vls4zq2dchmgdig8rpky8rivsqbckczr5k9w0hwv''; }; - rspec_core_2_1_0 = { + rspec_core_2_9_0 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.1.0''; + description = ''rspec-core-2.9.0''; homepage = ''http://github.com/rspec/rspec-core''; - longDescription = ''RSpec runner and example groups''; + longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.1.0''; + name = ''rspec-core-2.9.0''; requiredGems = [ ]; - sha256 = ''1fs9c8dafg7v948wzxjhhzf0djr1rjva7lymah32rlj3x5xm9zmh''; + sha256 = ''17wc7mqrwl0zzrx3gywf4w931vfdig1spyvl46fyqakf36shyknd''; }; - rspec_expectations_2_1_0 = { + rspec_expectations_2_9_0 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.1.0''; + description = ''rspec-expectations-2.9.0''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.1.0''; - requiredGems = [ g.diff_lcs_1_1_3 ]; - sha256 = ''0p7gs3zsj70fz30209961fzdgia1qyrpg54v0ywhqmvc5kl0q8lc''; + name = ''rspec-expectations-2.9.0''; + requiredGems = [ ]; + sha256 = ''0pdws2zdi1h7mx0dqhkx6l5sqvrnpkrvqsnxvpmxk413db7li34x''; }; - rspec_mocks_2_1_0 = { + 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 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.1.0''; + description = ''rspec-mocks-2.9.0''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.1.0''; + name = ''rspec-mocks-2.9.0''; requiredGems = [ ]; - sha256 = ''1qhznpj0wq08z31i1rcv99dwx2abl4rlx2338ly0dcql54s8mma4''; + sha256 = ''10mp152j5l0r3mqqhxq35m3slamzdzwsm9qnf6chh0l3zx5dwifg''; }; rubyforge_2_0_3 = { basename = ''rubyforge''; @@ -803,7 +795,7 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.3''; - requiredGems = [ g.json_pure_1_7_0 ]; + requiredGems = [ g.json_pure_1_7_3 ]; sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p''; }; rubyforge_2_0_4 = { @@ -834,17 +826,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1lc67ssqyz49rm1jms5sdvy6x41h070razxlmvj4j5q6w3qixx41''; }; - rubyzip_0_9_8 = { + rubyzip_0_9_9 = { basename = ''rubyzip''; meta = { description = ''rubyzip is a ruby module for reading and writing zip files''; homepage = ''http://github.com/aussiegeek/rubyzip''; }; - name = ''rubyzip-0.9.8''; + name = ''rubyzip-0.9.9''; requiredGems = [ ]; - sha256 = ''0nq7dcs3fhidfnvy241ypp05hj4hvw8srp70v52b9amjhsmbgbfd''; + sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_1_17 = { + sass_3_1_20 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -855,20 +847,20 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.1.17''; + name = ''sass-3.1.20''; requiredGems = [ ]; - sha256 = ''09ykjz5kam03cp6hbzmnch8g2ls3lhvnx1373bbpkvk6jckd26x7''; + sha256 = ''1aw2n5vg82d7ajx9wpyfrx6v1ddxhk73j77dkwjgsmlgci5lab8a''; }; - selenium_webdriver_2_21_2 = { + selenium_webdriver_2_24_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.21.2''; - requiredGems = [ g.rubyzip_0_9_8 g.childprocess_0_3_2 g.libwebsocket_0_1_3 ]; - sha256 = ''07f291d7c1828ba22b2e50947199d766a53fff9ad0016e479b47b35bc5cc1161''; + name = ''selenium-webdriver-2.24.0''; + requiredGems = [ g.rubyzip_0_9_9 g.childprocess_0_3_3 g.libwebsocket_0_1_3 ]; + sha256 = ''0iricx2gglza44s92jhk7w44g2pbvg23jr5s0g3nggq7dc5mh48f''; }; sprockets_2_1_3 = { basename = ''sprockets''; @@ -881,16 +873,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.hike_1_2_1 g.tilt_1_3_3 ]; sha256 = ''05q6qpskabl8v0vx1mwlzv5fhf48r9f4zvc7v3xdsygm2hbs3vzh''; }; - thor_0_14_6 = { + thor_0_15_4 = { basename = ''thor''; meta = { description = ''A scripting framework that replaces rake, sake and rubigen''; homepage = ''http://github.com/wycats/thor''; longDescription = ''A scripting framework that replaces rake, sake and rubigen''; }; - name = ''thor-0.14.6''; + name = ''thor-0.15.4''; requiredGems = [ ]; - sha256 = ''c7c5abd6b7dfb331efb8740276724773cece66e1fe6b83216589bb87c67e15a3''; + sha256 = ''1q4y34p4v0ipr6z5wcnc6n1mwfysrgjcibc1ls7rbdfzx4sdcic8''; }; tilt_1_3_3 = { basename = ''tilt''; From be48fe265a1b9dc57ac648bdb4c4a3158b252cb2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 9 Jul 2012 17:29:57 -0400 Subject: [PATCH 0104/1120] ruby: update to 1.9.3-p194 --- pkgs/development/interpreters/ruby/ruby-19.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index c5c12831c0a7..d31417fe33b7 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; - sha256 = "09jmxz3lqsi5097233hc1wjnzg6z5f4y7kmlkqhskdaj6125jyn6"; + url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; + sha256 = "1fyq9g7khm45mfs1vyg0grbcgsr2zv8jkifdv4dxbzkyps0gmqj6"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru = rec { majorVersion = "1.9"; minorVersion = "3"; - patchLevel = "125"; + patchLevel = "194"; libPath = "lib/ruby/${majorVersion}"; gemPath = "lib/ruby/gems/${majorVersion}"; }; From baf5e27aafe580380639070ba39d1c324efb9f72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 17:30:20 -0400 Subject: [PATCH 0105/1120] ruby: Fix URL and enable parallel building --- pkgs/development/interpreters/ruby/ruby-19.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-19.nix b/pkgs/development/interpreters/ruby/ruby-19.nix index d31417fe33b7..b954d7e6bf0f 100644 --- a/pkgs/development/interpreters/ruby/ruby-19.nix +++ b/pkgs/development/interpreters/ruby/ruby-19.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { name = "ruby-${version}"; src = fetchurl { - url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz"; - sha256 = "1fyq9g7khm45mfs1vyg0grbcgsr2zv8jkifdv4dxbzkyps0gmqj6"; + url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.bz2"; + sha256 = "1ymq5lhp3fz0j3cs65521aihcnivbfrn76in900ccxd0msgfmld9"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml); + + enableParallelBuilding = true; configureFlags = ["--enable-shared" "--enable-pthread"]; From 91cfda020bcab57eae0ce21ce07dc1ac55edd269 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Tue, 10 Jul 2012 10:44:51 +0200 Subject: [PATCH 0106/1120] haskell-accelerate-cuda: Patch Setup file --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index aae77de6c6c9..4ed0f4ea5e38 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { hashable hashtables languageCQuote mainlandPretty mtl srcloc transformers unorderedContainers ]; + patchPhase = '' + sed -i -e 's|\|defaultMainWithHooks autoconfUserHooks|' Setup.hs + ''; meta = { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Accelerate backend for NVIDIA GPUs"; From a6c8986ee03ab8573b9d7028f847841a97d30835 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 10 Jul 2012 06:38:41 -0400 Subject: [PATCH 0107/1120] dwm: Bump to 4.5 --- pkgs/applications/misc/dmenu/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 32af65f924a2..eae0b0ff233a 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXinerama}: stdenv.mkDerivation rec { - name = "dmenu-4.4.1"; + name = "dmenu-4.5"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0l25vdnzlslk0r4m6hjkzxdygh3wpq04b9mr8zc9h3b1md2icr3d"; + sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"; }; buildInputs = [ libX11 libXinerama ]; @@ -20,3 +20,4 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; all; }; } + From 0b072598652b74e2c1b858479a16019be5bbe39d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Jul 2012 09:18:12 -0400 Subject: [PATCH 0108/1120] linux: Update to 3.2.22 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index aa5ef29a6094..70b9d9dcf385 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.21"; + version = "3.2.22"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0m3jn3nr1ghlhxch06hv9naidfy1kiwyabyzdl6k5lwkbqi7l1gi"; + sha256 = "1nf3ph06p743jjxfgwwcy8156mx4fi1cy7zi7hc1gz5bq4c0k8mw"; }; config = configWithPlatform stdenv.platform; From f3052e14e5955f1d662e9af2e087ef1d043068dc Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 10 Jul 2012 15:56:23 +0200 Subject: [PATCH 0109/1120] weechat: update to 0.3.8 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0fd521b9cce0..a891c145b76d 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -2,12 +2,12 @@ , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }: stdenv.mkDerivation rec { - version = "0.3.7"; + version = "0.3.8"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "1bphyhx5rnirga5l42z4lijw68qx724gffic1z60jdwfxc5dxknl"; + sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e"; }; buildInputs = From 9ca3cc08f6d9d0b66cb6229f7f4ddcf098102770 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 15:34:38 +0200 Subject: [PATCH 0110/1120] automake-1.11.x: update to version 1.11.6 --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 2172460b3c9f..7c9d06baa543 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: stdenv.mkDerivation rec { - name = "automake-1.11.2"; + name = "automake-1.11.6"; # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is # available upstream; see @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.bz2"; - sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg"; + url = "mirror://gnu/automake/${name}.tar.xz"; + sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; }; patches = [ ./fix-test-autoconf-2.69.patch ]; From bb6c1e987812bc94f932f8cabd91d1fd83d9438a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 15:35:04 +0200 Subject: [PATCH 0111/1120] automake-1.12.x: update to version 1.12.2 --- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 41aaff768766..ffcba351dd75 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: stdenv.mkDerivation rec { - name = "automake-1.12.1"; + name = "automake-1.12.2"; # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is # available upstream; see @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0gqpbk51lbk0a4ixwdp4cnabzaj9qdsxypr1cmbs5hjan9lhhx9j"; + sha256 = "5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f"; }; buildInputs = [perl autoconf makeWrapper]; From 12c0998e03531b495105f6cf627b39eac4648e49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 15:57:40 +0200 Subject: [PATCH 0112/1120] libmng: build library with Automake 1.10.x; the build fails with later versions --- pkgs/development/libraries/libmng/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 3082bd0ce23a..5a73fd417f90 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }: +{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake110x, autoconf, libtool }: stdenv.mkDerivation rec { name = "libmng-1.0.10"; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { preConfigure = "unmaintained/autogen.sh"; - buildNativeInputs = [ automake autoconf libtool ]; + buildNativeInputs = [ automake110x autoconf libtool ]; propagatedBuildInputs = [ zlib libpng libjpeg lcms ]; - meta = { + meta = { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; license = "zlib/libpng"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2acb2bb9ed66..bc2dcbfec972 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4134,9 +4134,7 @@ let libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { - automake = automake111x; - }; + libmng = callPackage ../development/libraries/libmng { }; libmodplug = callPackage ../development/libraries/libmodplug {}; From d59146be3dc096cabbcdc37a01701333bf92e472 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 15:57:56 +0200 Subject: [PATCH 0113/1120] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc2dcbfec972..4f989ca86a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -420,7 +420,7 @@ let }; aws = callPackage ../tools/virtualization/aws { }; - + aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; axel = callPackage ../tools/networking/axel { }; @@ -4670,7 +4670,7 @@ let SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; serd = callPackage ../development/libraries/serd {}; - + simgear = callPackage ../development/libraries/simgear {}; sfml_git = callPackage ../development/libraries/sfml { }; From 5c6185d92536782935bc84c146a08393a29aae0b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 17:38:43 +0200 Subject: [PATCH 0114/1120] automake-1.12.x.nix: disable 't/aclocal7.sh' regression test to avoid failures on Hydra The test succeeds on my machine, but not when built on Hydra. It would be great if some Automake guru could examine what exactly is going on. --- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index ffcba351dd75..e2db84d2fc34 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; + # This test succeeds on my machine, but fails on Hydra (for reasons + # not yet understood). + patchPhase = '' + sed -i -e 's|t/aclocal7.sh||' Makefile.in + ''; + inherit doCheck; # The test suite can run in parallel. From 662f7d02abfe4f572d6412bcf4df7e27fdb98d21 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 10 Jul 2012 19:45:59 +0200 Subject: [PATCH 0115/1120] alot, afew: update to latest revision, adding new dependency (pygpgme) --- pkgs/top-level/python-packages.nix | 39 +++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d61c2e473b1..6cb149defb82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -33,12 +33,11 @@ let pythonPackages = python.modules // rec { afew = buildPythonPackage rec { - rev = "8abd64bfdcd83a486b2a3977c08fe071523b2551"; - name = "afew-1.0pre${rev}"; + name = "afew-1.0pre"; src = fetchurl { - url = "https://github.com/teythoon/afew/tarball/${rev}"; + url = "https://github.com/teythoon/afew/tarball/master"; name = "${name}.tar.bz"; - sha256 = "9b140d0eb0e5013419983604bb09a51f087a4abdf0a390c24a9596f867dc8c05"; + sha256 = "949710f8dcf503f42f2a2d77ea71e48ccf70155a764f75ad29cc93edc120809b"; }; propagatedBuildInputs = [ notmuch pkgs.dbacl ]; @@ -60,18 +59,17 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - version = "0.3.1"; - name = "alot-${version}"; + name = "alot-0.3.1"; src = fetchurl { - url = "https://github.com/pazz/alot/tarball/${version}"; + url = "https://github.com/pazz/alot/tarball/master"; name = "${name}.tar.bz"; - md5 = "6c5986d9192863879e95a3f8f30ccb75"; + sha256 = "06683de36688615d3d526198c93133e1131897c888ffa31e83f1ad292eae57af"; }; doCheck = false; - propagatedBuildInputs = [ notmuch urwid twisted magic configobj ]; + propagatedBuildInputs = [ notmuch urwid twisted magic configobj pygpgme ]; postInstall = '' wrapProgram $out/bin/alot \ @@ -1667,6 +1665,29 @@ let pythonPackages = python.modules // rec { }; + pygpgme = buildPythonPackage rec { + version = "0.3"; + name = "pygpgme-${version}"; + + src = fetchurl { + url = "https://launchpad.net/pygpgme/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pkgs.gpgme ]; + + meta = { + homepage = "https://launchpad.net/pygpgme"; + description = "A Python wrapper for the GPGME library."; + license = pkgs.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; From 719852784a76d86fe177bea3377066eee8c649ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 22:25:44 +0200 Subject: [PATCH 0116/1120] automake-1.11.x: create symlinks for un-versioned directory names The latest Automake version installs the 'aclocal' and 'automake' directories with a '-1.11' version suffix. Our setup hook is not prepared to handle that, so we add those symlinks as a quick fix. A better solution would be to extend the setup hook for Automake to recognize those kind of version suffixes. --- pkgs/development/tools/misc/automake/builder.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 7f9e9219de31..e54a2acca67e 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -36,10 +36,12 @@ postInstall() { # global directory, while callers of `aclocal' do not need to pass # `-I' options explicitly. - for prog in $out/bin/aclocal*; do + for prog in $out/bin/aclocal*; do wrapAclocal "$prog" done + + ln -s aclocal-1.11 $out/share/aclocal + ln -s automake-1.11 $out/share/automake } - genericBuild From cfb08fc6002670aaa02c2abc5315156c17e93219 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 22:20:12 +0200 Subject: [PATCH 0117/1120] mountall: strip trailing whitespace --- pkgs/os-specific/linux/mountall/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix index b563b80f9a9f..67d7801fdb23 100644 --- a/pkgs/os-specific/linux/mountall/default.nix +++ b/pkgs/os-specific/linux/mountall/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }: - + stdenv.mkDerivation { name = "mountall-2.35"; - + src = fetchurl { url = https://launchpad.net/ubuntu/+archive/primary/+files/mountall_2.35.tar.gz; sha256 = "1k52d4x75balnwcsqgznvzrdqgbp2dqnrzw0n25kajdcwr192wwy"; @@ -15,10 +15,10 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ]; makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; - + meta = { homepage = https://launchpad.net/ubuntu/+source/mountall; description = "Utility to mount all filesystems and emit Upstart events"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } From 0b71387b76d57f6a8d26ec3a696af24ec796abeb Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 11 Jul 2012 11:05:24 +0200 Subject: [PATCH 0118/1120] Add haskell-hoauth-0.3.4 --- .../libraries/haskell/hoauth/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hoauth/default.nix diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix new file mode 100644 index 000000000000..f097a1342185 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -0,0 +1,18 @@ +{ cabal, binary, cryptoPubkeyTypes, curl, dataenc, entropy, mtl +, random, RSA, SHA, time, utf8String +}: + +cabal.mkDerivation (self: { + pname = "hoauth"; + version = "0.3.4"; + sha256 = "0a8a77smzhxmynfi0ayvsgibpw9aav2f7pi9j3dxjas14zg9qv2k"; + buildDepends = [ + binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA + time utf8String + ]; + meta = { + description = "A Haskell implementation of OAuth 1.0a protocol."; + 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 6afeddf0ac45..c7465d7131f2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -856,6 +856,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; + hoauth = callPackage ../development/libraries/haskell/hoauth {}; + hoogle = callPackage ../development/libraries/haskell/hoogle {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; From 8253542544b6b5c2a11376034800aa98215ba370 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 11 Jul 2012 07:23:14 -0400 Subject: [PATCH 0119/1120] Add logstash For now just download the pre-built jar. We may build our own later. --- pkgs/tools/misc/logstash/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/tools/misc/logstash/default.nix diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix new file mode 100644 index 000000000000..b273e4630a3f --- /dev/null +++ b/pkgs/tools/misc/logstash/default.nix @@ -0,0 +1,11 @@ +{ fetchurl }: + +let version = "1.1.0"; in + +fetchurl { + url = "http://semicomplete.com/files/logstash/logstash-${version}-monolithic.jar"; + + name = "logstash-${version}.jar"; + + sha256 = "03s9g2appsmdg973212dl37ldws36fgsvxi9w1lxbvmmclc4k7vc"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f989ca86a23..a2ee56d44ef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -957,6 +957,8 @@ let less = callPackage ../tools/misc/less { }; + logstash = callPackage ../tools/misc/logstash { }; + klavaro = callPackage ../games/klavaro {}; minidlna = callPackage ../tools/networking/minidlna { }; From 945a3480d493eb270e719273d499f5091c8a126d Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 11 Jul 2012 20:03:36 +0200 Subject: [PATCH 0120/1120] ghc-HEAD: update to a new snapshot --- 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 cf0c569d3beb..3db488737c32 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.5.20120607"; + version = "7.5.20120706"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1xrdx646g5ip2f2jypbm46y6jis3ddf8bild2704swbl2j4yb3vb"; + sha256 = "196aghpgzf5k47l603fynxxjjkkk5f6y2cylxv3skavvd1g16bs2"; }; buildInputs = [ ghc perl gmp ncurses ]; From db46c668b80ab9d9a80a22ca3b2d811f233bc971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:05:36 +0200 Subject: [PATCH 0121/1120] libgsf and libextractor: allow build without gtk/gnome I leave them enabled by default though; I don't really know how much it helps, having them built with gtk or gnome support. I head towards building gnunet without gtk dependencies. --- pkgs/development/libraries/libextractor/default.nix | 9 ++++++--- pkgs/development/libraries/libgsf/default.nix | 13 +++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b532f3283d48..0ea9810e8ae4 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,5 +1,8 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2 -, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }: +, ffmpeg, exiv2, libgsf, rpm, pkgconfig +, gtkSupport ? true, glib ? null, gtk ? null}: + +assert gtkSupport -> glib != null && gtk != null; stdenv.mkDerivation rec { name = "libextractor-0.6.2"; @@ -18,8 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg libgsf rpm - pkgconfig glib gtk - ]; + pkgconfig + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9d36bc3d5f24..01891ccf3603 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,10 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, glib, gettext, intltool, bzip2, gdk_pixbuf -, gnome_vfs, libbonobo, python }: +, gettext, intltool, bzip2, python +, gnomeSupport ? true, glib ? null, gdk_pixbuf ? null +, gnome_vfs ? null, libbonobo ? null }: +assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null + && glib != null; stdenv.mkDerivation rec { name = "libgsf-1.14.22"; @@ -13,9 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python gdk_pixbuf ]; + [ perl perlXMLParser gettext bzip2 gnome_vfs python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ]; - propagatedBuildInputs = [ glib libxml2 libbonobo ]; + propagatedBuildInputs = [ libxml2 ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ]; doCheck = true; From 715737b3ac2f6ca2aeb63ec147757790f4048af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:07:00 +0200 Subject: [PATCH 0122/1120] gnunet: removing gtk dependencies gnunet does not depend anymore on gtk. There is a separate package, gnunet-gtk, still not in nixpkgs. --- pkgs/applications/networking/p2p/gnunet/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 5214c294b825..f2fbf7046492 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt , zlib, gmp, curl, libtool, adns, sqlite, pkgconfig , libxml2, ncurses, gettext, libunistring -, gtkSupport ? false, gtk ? null, libglade ? null , makeWrapper }: -assert gtkSupport -> (gtk != null) && (libglade != null); - stdenv.mkDerivation rec { name = "gnunet-0.9.3"; @@ -18,7 +15,7 @@ stdenv.mkDerivation rec { libextractor libmicrohttpd libgcrypt gmp curl libtool zlib adns sqlite libxml2 ncurses pkgconfig gettext libunistring makeWrapper - ] ++ (if gtkSupport then [ gtk libglade ] else []); + ]; preConfigure = '' # Brute force: since nix-worker chroots don't provide From 6163742ea4f21cde506aa31ef4209de1db11fcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:15:06 +0200 Subject: [PATCH 0123/1120] libgsf: fix build without gnome support I recently committed it with broken without-gnome support. --- pkgs/development/libraries/libgsf/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 01891ccf3603..3941fd4d694d 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, gettext, intltool, bzip2, python -, gnomeSupport ? true, glib ? null, gdk_pixbuf ? null +, gettext, intltool, bzip2, glib, python +, gnomeSupport ? true, gdk_pixbuf ? null , gnome_vfs ? null, libbonobo ? null }: assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python ] - ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ]; + [ perl perlXMLParser gettext bzip2 python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; - propagatedBuildInputs = [ libxml2 ] - ++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ]; + propagatedBuildInputs = [ libxml2 glib ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; doCheck = true; From b4e0565a8656e0db2482f548a4b60298ffd6a97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:20:14 +0200 Subject: [PATCH 0124/1120] libextractor: allow disabling video support. --- pkgs/development/libraries/libextractor/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 0ea9810e8ae4..043690bbbb1e 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,8 +1,10 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2 -, ffmpeg, exiv2, libgsf, rpm, pkgconfig -, gtkSupport ? true, glib ? null, gtk ? null}: +{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis +, exiv2, libgsf, rpm, pkgconfig +, gtkSupport ? true, glib ? null, gtk ? null +, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: assert gtkSupport -> glib != null && gtk != null; +assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { name = "libextractor-0.6.2"; @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ]; + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] + ++ stdenv.lib.optionals videoSupport [ ffmpeg gtkSupport ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " From 8fd57ff21e88528617b1ac063098d1e3afd99dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:29:44 +0200 Subject: [PATCH 0125/1120] libextractor: fixing the videoSupport = false I comitted it wrong before. --- pkgs/development/libraries/libextractor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 043690bbbb1e..d2cbdf841b00 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg + [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] From 978f18b931635c4346d68b6d3880317e1ea2ee6a Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 11 Jul 2012 21:55:09 +0200 Subject: [PATCH 0126/1120] Add JuicyPixels Haskell package --- pkgs/top-level/haskell-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6afeddf0ac45..2b681aac3f6c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -936,6 +936,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ivor = callPackage ../development/libraries/haskell/ivor {}; + JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; + jpeg = callPackage ../development/libraries/haskell/jpeg {}; JsContracts = callPackage ../development/libraries/haskell/JsContracts { From b9e1a3f109806809f1a845c9cc32663276460582 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 11 Jul 2012 21:55:39 +0200 Subject: [PATCH 0127/1120] Add JuicyPixels Haskell package Forgot to attach the Nix expression for that package. It is generated by cabal2nix and works fine on my machine (i686, ghc7.4.1). --- .../libraries/haskell/JuicyPixels/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/JuicyPixels/default.nix diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix new file mode 100644 index 000000000000..87431c6b2425 --- /dev/null +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -0,0 +1,18 @@ +{ cabal, cereal, deepseq, mtl, primitive, transformers, vector +, zlib +}: + +cabal.mkDerivation (self: { + pname = "JuicyPixels"; + version = "1.3"; + sha256 = "07wljfag4ylw16wdi7znjb61pfihdik5d7p4h2lmz6xirm4mjzrm"; + buildDepends = [ + cereal deepseq mtl primitive transformers vector zlib + ]; + meta = { + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg and bitmap)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) From 2dd9874d8de7879fed4c1ea0d1a5b1d344c0aa2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 11 Jul 2012 17:04:38 -0400 Subject: [PATCH 0128/1120] pan: Updated to 0.139 --- pkgs/applications/networking/newsreaders/pan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index ae6e7dd4681e..c9965a784e0f 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -5,14 +5,14 @@ assert spellChecking -> gtkspell != null; -let version = "0.138"; in +let version = "0.139"; in stdenv.mkDerivation { name = "pan-${version}"; src = fetchurl { url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; - sha1 = "8ad70d0b2bfb771eb7af1f973af6520f9998591a"; + sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; }; buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] From ab638b9caa7de5ec55217eadf3f92ca089f058ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 12 Jul 2012 09:31:00 +0200 Subject: [PATCH 0129/1120] disnix-activation-scripts: updating URL Hydra should have some of those URL permament. Otherwise it will break from time to time. mornfall requested this change on irc. --- .../package-management/disnix/activation-scripts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 23906fb3aff0..353e2fee4b70 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -18,7 +18,7 @@ assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { name = "disnix-activation-scripts-0.3pre30423"; src = fetchurl { - url = http://hydra.nixos.org/build/1842091/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; + url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064"; }; From 8f736be126ce5bb74fc421679d41359df7ab8982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 12 Jul 2012 10:44:54 +0200 Subject: [PATCH 0130/1120] disnix-activation-scripts: updating the hash The url change involved an output hash change. Who could have imagined. --- .../package-management/disnix/activation-scripts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix index 353e2fee4b70..beae2e3b5f69 100644 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ b/pkgs/tools/package-management/disnix/activation-scripts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { name = "disnix-activation-scripts-0.3pre30423"; src = fetchurl { url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; - sha256 = "11b569bflknjbjddam4mv07bpmihbfx5acxzxzhnshj6x8sv6064"; + sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 293027453f713fce5b3a5b7660ce8003395a4604 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 12 Jul 2012 11:28:15 +0200 Subject: [PATCH 0131/1120] i3: fixed build - The make variable PREFIX must be at build time because common.mk uses it to decide where to expect $SYSCONFDIR. - The make target "all" is run by default and needn't be set explicitly. - Shebang paths in scripts are patched automatically be the default builder, we don't have to do that manually. --- pkgs/applications/window-managers/i3/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 04e50f808274..3a3a3626fb93 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -13,18 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; - prePatch = '' - sed s,/usr/bin/env,${coreutils}/bin/env, -i generate-command-parser.pl - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-migrate-config-to-v4 - sed s,/usr/bin/env,${coreutils}/bin/env, -i i3-wsbar - ''; - - makeFlags = "all"; - installFlags = "PREFIX=\${out}"; + configurePhase = "makeFlags=PREFIX=$out"; meta = { description = "i3 is a tiling window manager"; - homepage = http://i3wm.org; + homepage = "http://i3wm.org"; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; }; From 46dc1202709142c4778a6da4bbf34d76e6fd4bdc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Jul 2012 11:53:02 -0400 Subject: [PATCH 0132/1120] Fix the "path" option type Comparing a string with a context with "/" doesn't work because the "==" operator also compares context. So the context needs to be discarded. --- pkgs/lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 2c85ee0077a4..956368138aa2 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -89,7 +89,7 @@ rec { path = mkOptionType { name = "path"; # Hacky: there is no ‘isPath’ primop. - check = lib.traceValIfNot (x: builtins.substring 0 1 (toString x) == "/"); + check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/"); }; listOf = types.list; From 0b85d04d9ea5b1cded6ba775b989a993f58d989b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 12 Jul 2012 23:42:20 +0200 Subject: [PATCH 0133/1120] kobodeluxe: fix compilation errors. The glibc29 patch was taken from Gentoo. --- pkgs/games/kobodeluxe/default.nix | 6 +++ pkgs/games/kobodeluxe/glibc29.patch | 83 +++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 pkgs/games/kobodeluxe/glibc29.patch diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 1d700d5cf038..70288e549a4e 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image]; + prePatch = '' + sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp + ''; + + patches = [ ./glibc29.patch ]; + meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/pkgs/games/kobodeluxe/glibc29.patch new file mode 100644 index 000000000000..7a9ef355a821 --- /dev/null +++ b/pkgs/games/kobodeluxe/glibc29.patch @@ -0,0 +1,83 @@ +--- a/enemies.h ++++ b/enemies.h +@@ -70,9 +70,9 @@ + extern const enemy_kind bomb2; + extern const enemy_kind bombdeto; + extern const enemy_kind cannon; +-extern const enemy_kind pipe1; ++extern const enemy_kind pipeone; + extern const enemy_kind core; +-extern const enemy_kind pipe2; ++extern const enemy_kind pipetwo; + extern const enemy_kind rock; + extern const enemy_kind ring; + extern const enemy_kind enemy_m1; +@@ -430,7 +430,7 @@ + + inline int _enemy::is_pipe() + { +- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); ++ return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo))); + } + + +--- a/enemy.cpp ++++ b/enemy.cpp +@@ -713,7 +713,7 @@ + + void _enemy::kill_cannon() + { +- enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y)); ++ enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y)); + sound.g_base_node_explo(x, y); + release(); + } +@@ -755,10 +755,10 @@ + + void _enemy::kill_core() + { +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); + sound.g_base_core_explo(x, y); + release(); +@@ -851,7 +851,7 @@ + screen.set_map(x1, y1, m ^ a); + release(); + } +-const enemy_kind pipe1 = { ++const enemy_kind pipeone = { + 0, + &_enemy::make_pipe1, + &_enemy::move_pipe1, +@@ -978,19 +978,19 @@ + } + p ^= a; + if(p & U_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); + if(p & R_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); + if(p & D_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); + if(p & L_MASK) +- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); ++ enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); + manage.add_score(10); + release(); + } + + +-const enemy_kind pipe2 = { ++const enemy_kind pipetwo = { + 0, + &_enemy::make_pipe2, + &_enemy::move_pipe2, From 7c4b2bb6c44e2f411a28300e9e73d03b0d053d9e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 13 Jul 2012 01:33:40 +0200 Subject: [PATCH 0134/1120] obnam: Update to 1.1 --- pkgs/tools/backup/obnam/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index c70e8054c7c7..119633e06387 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }: pythonPackages.buildPythonPackage { - name = "obnam-1.0"; + name = "obnam-1.1"; namePrefix = ""; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.0.orig.tar.gz"; - sha256 = "b3589aac8d97283e44ed8e8c8cf751c4e9cc0677d433a85e27bd42f0d54da623"; + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz"; + sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb149defb82..fb265337b39e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2706,11 +2706,11 @@ let pythonPackages = python.modules // rec { }; cliapp = buildPythonPackage rec { - name = "cliapp-0.29"; + name = "cliapp-1.20120630"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_0.29.orig.tar.gz"; - sha256 = "4a3f2e1705c5e9ac5a80a460ae9bad8e88c0778f7013638eda39e3ee0dd008b2"; + url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120630.orig.tar.gz"; + sha256 = "6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716"; }; buildInputs = [ sphinx ]; @@ -2746,11 +2746,11 @@ let pythonPackages = python.modules // rec { }; ttystatus = buildPythonPackage rec { - name = "ttystatus-0.18"; + name = "ttystatus-0.19"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.18.orig.tar.gz"; - sha256 = "9fab747f3e1f474b66101354b06f943120d72d1f1e353b4692e7e6cca226b9cc"; + url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.19.orig.tar.gz"; + sha256 = "7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d"; }; buildInputs = [ sphinx ]; From a126bf9ae444557cb71a1e8653b91b6d5774f35b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 16 Jun 2012 21:09:30 +0200 Subject: [PATCH 0135/1120] networkmanager: Update to 0.9.4.0 --- .../networking/network-manager/default.nix | 17 ++++++-- .../network-manager/nixos-purity.patch | 43 +++++++++++++------ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 00f37bd61e38..e5bd2ab77e38 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,16 +1,20 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, substituteAll }: +, libgcrypt, dnsmasq, avahi, bind, perl, substituteAll }: stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3"; + sha256 = "eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f"; }; + preConfigure = '' + substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl + ''; + # Right now we hardcode quite a few paths at build time. Probably we should # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { patches = [ ( substituteAll { src = ./nixos-purity.patch; - inherit avahi dnsmasq ppp; + inherit avahi dnsmasq ppp bind; glibc = stdenv.gcc.libc; }) ]; @@ -46,6 +50,11 @@ stdenv.mkDerivation rec { installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) ''; + postInstall = + '' + mkdir -p $out/lib/NetworkManager + ''; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management in an easy way. Desktop environment independent."; diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/nixos-purity.patch index 41f7d3b73516..998c2f25b2b2 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/nixos-purity.patch @@ -1,11 +1,11 @@ diff --git a/src/backends/NetworkManagerExherbo.c b/src/backends/NetworkManagerExherbo.c -index d7e24cf..aa64210 100644 +index d027789..ef6b646 100644 --- a/src/backends/NetworkManagerExherbo.c +++ b/src/backends/NetworkManagerExherbo.c -@@ -56,9 +56,9 @@ void nm_system_enable_loopback (void) - */ - void nm_system_update_dns (void) - { +@@ -41,9 +41,9 @@ void nm_backend_update_dns (void) + /* Make glibc/nscd aware of any changes to the resolv.conf file by + * restarting nscd. Only restart if already running. + */ - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { + if (g_file_test ("@glibc@/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); @@ -15,7 +15,7 @@ index d7e24cf..aa64210 100644 } diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index 88136a9..b4113a9 100644 +index 0932139..5b5aee8 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -68,10 +68,6 @@ const char * @@ -44,8 +44,23 @@ index 237661f..48bc33f 100644 NULL }; const char **path = dhcpcd_paths; +diff --git a/src/dns-manager/nm-dns-bind.c b/src/dns-manager/nm-dns-bind.c +index 1a3243b..a47dccd 100644 +--- a/src/dns-manager/nm-dns-bind.c ++++ b/src/dns-manager/nm-dns-bind.c +@@ -51,9 +51,7 @@ static inline const char * + find_bind (void) + { + static const char *paths[] = { +- "/usr/local/sbin/named", +- "/usr/sbin/named", +- "/sbin/named", ++ "@bind@/sbin/named", + NULL + }; + const char **binary = paths; diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index 2767208..6562015 100644 +index 8e216f4..6e00210 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -52,9 +52,7 @@ static inline const char * @@ -60,7 +75,7 @@ index 2767208..6562015 100644 }; const char **binary = paths; diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index ca2f9dc..7afb118 100644 +index ca2f9dc..ce718d0 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -170,9 +170,7 @@ static inline const char * @@ -75,11 +90,11 @@ index ca2f9dc..7afb118 100644 }; diff --git a/src/nm-device.c b/src/nm-device.c -index 3522ea4..75b2db3 100644 +index 1dc94ee..e60f3c8 100644 --- a/src/nm-device.c +++ b/src/nm-device.c -@@ -1285,8 +1285,7 @@ aipd_exec (NMDevice *self, GError **error) - gboolean success = FALSE; +@@ -1321,8 +1321,7 @@ aipd_start (NMDevice *self, NMDeviceStateReason *reason) + char *argv[6], *cmdline; const char **aipd_binary = NULL; static const char *aipd_paths[] = { - "/usr/sbin/avahi-autoipd", @@ -88,7 +103,7 @@ index 3522ea4..75b2db3 100644 NULL }; int i = 0; -@@ -2446,7 +2445,7 @@ share_init (void) +@@ -2555,7 +2554,7 @@ share_init (void) } for (iter = modules; *iter; iter++) { @@ -98,7 +113,7 @@ index 3522ea4..75b2db3 100644 GError *error = NULL; diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index e863aab..27c14e2 100644 +index 59698c3..7dba0f7 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -661,9 +661,7 @@ static inline const char * @@ -112,7 +127,7 @@ index e863aab..27c14e2 100644 NULL }; -@@ -992,7 +990,7 @@ nm_ppp_manager_start (NMPPPManager *manager, +@@ -988,7 +986,7 @@ nm_ppp_manager_start (NMPPPManager *manager, /* Make sure /dev/ppp exists (bgo #533064) */ if (stat ("/dev/ppp", &st) || !S_ISCHR (st.st_mode)) From f2a77f5d9d395084adce2c8e3d2e40dacf447df5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 13 Jul 2012 18:18:52 +0400 Subject: [PATCH 0136/1120] TeXLive: update to 2012 snapshot from Debian --- pkgs/data/fonts/tipa/default.nix | 24 +++++++++++ .../libraries/silgraphite/default.nix | 20 +++++++++ .../typesetting/tex/texlive/aggregate.nix | 11 ++--- .../tools/typesetting/tex/texlive/default.nix | 42 ++++++++++++------- pkgs/tools/typesetting/tex/texlive/extra.nix | 8 ++-- pkgs/top-level/all-packages.nix | 14 ++++--- 6 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 pkgs/data/fonts/tipa/default.nix create mode 100644 pkgs/development/libraries/silgraphite/default.nix diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix new file mode 100644 index 000000000000..47e98f7c53aa --- /dev/null +++ b/pkgs/data/fonts/tipa/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "tipa-1.3"; + + src = fetchurl { + url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz"; + sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m"; + }; + + installPhase = '' + export PREFIX="$out/texmf" + mkdir -p "$PREFIX" "$out/share" + make install PREFIX="$PREFIX" + + ln -s $out/texmf* $out/share/ + ''; + + meta = { + description = "Phonetic font for TeX"; + }; +} + + diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix new file mode 100644 index 000000000000..2bb38b3781f9 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: +stdenv.mkDerivation rec { + version = "2.3.1"; + name = "silgraphite-2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz"; + sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65"; + }; + + buildInputs = [pkgconfig freetype libXft pango fontconfig]; + + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + + meta = { + description = ''An advanced font engine''; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = with stdenv.lib.maintainers; linux; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index c018d2da0d3d..c2ccecab0896 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -46,13 +46,14 @@ rec { rm $out/texmf*/ls-R for i in web2c texconfig fonts/map; do - cp -r $out/texmf/$i/* $out/texmf-config/$i || true + cp -Lr $out/texmf/$i/* $out/texmf-config/$i || true done + chmod -R u+w $out/texmf-config - TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - PATH=$PATH:$out/bin mktexlsr $out/texmf* - TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - PATH=$PATH:$out/bin mktexlsr $out/texmf* + yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees + yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* + yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees + yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* '') ["minInit" "defEnsureDir" "addInputs"]; meta = { diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 30e59849d32f..aac8da784b3d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,18 +1,18 @@ args : with args; rec { src = fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2009.orig.tar.gz; - sha256 = "0ywc8h4jnig53fs0bji2ivw5f9j6zlgdy477jqw7xvpc7migjpw7"; + url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2012.20120628.orig.tar.xz; + sha256 = "0k94df3lfvghngzdzi2d4fz2z0gs8iglz7h3w2lxvlhiwwpmx601"; }; texmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-base/texlive-base_2009.orig.tar.gz; - sha256 = "130z907xcxr10yrzbbmp9l8a00dabvi4bi702s5jxamjzav17cmf"; + url = mirror://debian/pool/main/t/texlive-base/texlive-base_2012.20120611.orig.tar.xz; + sha256 = "116zm0qdq9rd4vakhd2py9q7lq3ihspc7hy33bh8wy5v1rgiqsm6"; }; langTexmfSrc = fetchurl { - url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2009.orig.tar.gz; - sha256 = "10shnsc71n95zy9ys938pljdid9ampmc50k4lji9wv53hm14laic"; + url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2012.20120611.orig.tar.xz; + sha256 = "0zh9svszfkbjx72i7sa9gg0gak93wf05845mxpjv56h8qwk4bffv"; }; setupHook = ./setup-hook.sh; @@ -44,15 +44,23 @@ rec { '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; doPostInstall = fullDepEntry('' - mv $out/bin $out/libexec + mkdir -p $out/libexec/ + mv $out/bin $out/libexec/$(uname -m) mkdir -p $out/bin - for i in "$out/libexec/"*"/"*; do - test \( \! -d "$i" \) -a -x "$i" || continue - echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) - chmod a+x $out/bin/$(basename $i) + for i in "$out/libexec/"* "$out/libexec/"*/* ; do + test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue + if [ -x "$i" ]; then + echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) + chmod a+x $out/bin/$(basename $i) + else + mv "$i" "$out/libexec" + ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")"; + ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")"; + rm "$out/libexec/$(basename "$i")" + fi; done [ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config - ln -s "$out/"*texmf* "$out/share/" + ln -s -v "$out/"*texmf* "$out/share/" || true sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat @@ -79,16 +87,20 @@ rec { zlib bzip2 ncurses libpng flex bison libX11 libICE xproto freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext xextproto perl libSM - ruby expat curl libjpeg python fontconfig + ruby expat curl libjpeg python fontconfig xz + pkgconfig poppler silgraphite lesstif zziplib ]; configureFlags = [ "--with-x11" - "--enable-ipc" "--with-mktexfmt" + "--enable-ipc" "--with-mktexfmt" "--enable-shared" + "--disable-native-texlive-build" "--with-system-zziplib" + "--with-system-icu" "--with-system-libgs" "--with-system-t1lib" + "--with-system-freetype2" ]; phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"]; - name = "texlive-core-2009"; + name = "texlive-core-2012"; meta = { description = "A TeX distribution"; maintainers = [ args.lib.maintainers.raskin ]; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 1ecec91a6856..180019bb205f 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,12 +1,12 @@ args: with args; rec { - name = "texlive-extra-2009"; + name = "texlive-extra-2012"; src = fetchurl { - url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2009.orig.tar.gz; - sha256 = "04k48lxy76bad1270gb9k4aza2q13can2dbcf2hj0a3byls099kp"; + url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2012.20120611.orig.tar.xz; + sha256 = "1wn2gwifb5ww6nb15zdbkk5yz5spynvwqscvrgxzb84p0z3hy8dq"; }; - buildInputs = [texLive]; + buildInputs = [texLive xz]; phaseNames = ["doCopy"]; doCopy = fullDepEntry ('' mkdir -p $out/share diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2ee56d44ef9..b9134fcf9fb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4673,6 +4673,8 @@ let serd = callPackage ../development/libraries/serd {}; + silgraphite = callPackage ../development/libraries/silgraphite {}; + simgear = callPackage ../development/libraries/simgear {}; sfml_git = callPackage ../development/libraries/sfml { }; @@ -6266,6 +6268,8 @@ let terminus_font = callPackage ../data/fonts/terminus-font { }; + tipa = callPackage ../data/fonts/tipa { }; + ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -8610,9 +8614,9 @@ let texFunctions = import ../tools/typesetting/tex/nix pkgs; texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) { - inherit builderDefs zlib bzip2 ncurses libpng ed - gd t1lib freetype icu perl expat curl - libjpeg bison python fontconfig flex; + inherit builderDefs zlib bzip2 ncurses libpng ed lesstif + gd t1lib freetype icu perl expat curl xz pkgconfig zziplib + libjpeg bison python fontconfig flex poppler silgraphite; inherit (xlibs) libXaw libX11 xproto libXt libXpm libXmu libXext xextproto libSM libICE; ghostscript = ghostscriptX; @@ -8621,7 +8625,7 @@ let texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv ]; + texLivePGF texLiveBeamer texLiveModerncv tipa ]; }); /* Look in configurations/misc/raskin.nix for usage example (around revisions @@ -8646,7 +8650,7 @@ let }; texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) { - inherit texLive; + inherit texLive xz; }; texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) { From ae67368e545c6949821a1f46467384a85742a9f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 13 Jul 2012 12:13:59 -0400 Subject: [PATCH 0137/1120] exif / libexif: Update to 0.6.21 Addresses CVE-2012-2812, CVE-2012-2813, CVE-2012-2814, CVE-2012-2836, CVE-2012-2837, CVE-2012-2840, CVE-2012-2841 and CVE-2012-2845. --- pkgs/development/libraries/libexif/default.nix | 4 ++-- pkgs/tools/graphics/exif/default.nix | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index a9b60feff2f3..48c66cb60706 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libexif-0.6.20"; + name = "libexif-0.6.21"; src = fetchurl { url = "mirror://sourceforge/libexif/${name}.tar.bz2"; - sha256 = "05fphfmgrni6838v0lkcqv88fbw7r1mdw3ypy3bh567vv05x4wm7"; + sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n"; }; buildInputs = [ gettext ]; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 94bf2e2cb0db..a8599980d94d 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,12 +1,17 @@ -{stdenv, fetchurl, pkgconfig, libexif, popt}: +{ stdenv, fetchurl, pkgconfig, libexif, popt }: -stdenv.mkDerivation { - name = "exif-0.6.15"; +stdenv.mkDerivation rec { + name = "exif-0.6.21"; src = fetchurl { - url = mirror://sourceforge/libexif/exif-0.6.15.tar.bz2; - sha256 = "19kxl72l1iqq747k58rir7v4ld1676j3dmjdc1pik9hjlgdb1yj1"; + url = "mirror://sourceforge/libexif/${name}.tar.bz2"; + sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - buildInputs = [pkgconfig libexif popt]; + buildInputs = [ pkgconfig libexif popt ]; + + meta = { + homepage = http://libexif.sourceforge.net/; + description = "A utility to read and manipulate EXIF data in digital photographs"; + }; } From 9d387d616d228a6de3f556abbeeca1b02fec2fd1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Jul 2012 18:00:00 -0400 Subject: [PATCH 0138/1120] Add b43-firmware-cutter --- .../firmware/b43-firmware-cutter/default.nix | 22 +++++++++++++++++++ .../b43-firmware-cutter/no-root-install.patch | 18 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix create mode 100644 pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix new file mode 100644 index 000000000000..b6465c0d7943 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "b43-fwcutter-015"; + + src = fetchurl { + url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; + sha256 = "1sznw1jrhyfbx0ilwzrj6mzlgc96fzjbx56j4ji8lsypyp8m6sjc"; + }; + + patches = [ ./no-root-install.patch ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Firmware extractor for cards supported by the b43 kernel module"; + homepage = http://wireless.kernel.org/en/users/Drivers/b43; + license = "free-non-copyleft"; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch new file mode 100644 index 000000000000..578812e0ad0b --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch @@ -0,0 +1,18 @@ +diff -Naur b43-fwcutter-015-orig/Makefile b43-fwcutter-015/Makefile +--- b43-fwcutter-015-orig/Makefile 2011-08-21 08:17:01.000000000 -0400 ++++ b43-fwcutter-015/Makefile 2012-07-13 17:57:53.002154557 -0400 +@@ -51,10 +51,10 @@ + $(QUIET_CC) $(CFLAGS) -o $(BIN) $(call OBJS,$(SRCS)) $(LDFLAGS) + + install: all +- install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/ +- install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/ +- install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/ +- install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/ ++ install -d -m 755 $(PREFIX)/bin/ ++ install -m 755 $(BIN) $(PREFIX)/bin/ ++ install -d -m 755 $(PREFIX)/man/man1/ ++ install -m 644 $(BIN).1 $(PREFIX)/man/man1/ + + clean: + -rm -Rf obj dep *.orig *.rej *~ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2ee56d44ef9..5d29c0a727c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5395,6 +5395,8 @@ let inherit (perlPackages) LocaleGettext TermReadKey RpcXML; }; + b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; + bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; bluez = callPackage ../os-specific/linux/bluez { }; From 5330b4a343d46482f23075a9bcd6dd73542ac5c2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Jul 2012 18:31:09 -0400 Subject: [PATCH 0139/1120] Add b43-firmware-5.100.138 Placed into a versioned nix file because kernels older than 3.2 need an older version. --- .../linux/firmware/b43-firmware/5.1.138.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix new file mode 100644 index 000000000000..acf20d12c403 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, b43FirmwareCutter }: + +let version = "5.100.138"; in + +stdenv.mkDerivation { + name = "b43-firmware-${version}"; + + src = fetchurl { + url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; + sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi"; + }; + + buildInputs = [ b43FirmwareCutter ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir $out + b43-fwcutter -w $out linux/wl_apsta.o + ''; + + meta = { + description = "Firmware for cards supported by the b43 kernel module"; + homepage = http://wireless.kernel.org/en/users/Drivers/b43; + license = stdenv.lib.lisences.proprietary; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d29c0a727c3..08319e0de648 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5395,6 +5395,8 @@ let inherit (perlPackages) LocaleGettext TermReadKey RpcXML; }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; + b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; From 1a1ee54241446197964218d8509d688b11c977e8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Jul 2012 20:58:58 -0400 Subject: [PATCH 0140/1120] The word is spelled 'licenses', not 'lisences' --- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index acf20d12c403..1c4173c72fd4 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; homepage = http://wireless.kernel.org/en/users/Drivers/b43; - license = stdenv.lib.lisences.proprietary; + license = stdenv.lib.licenses.proprietary; maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } From 685acc6ef88767cd63a110ade63437ba8177de06 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 13 Jul 2012 22:48:43 -0400 Subject: [PATCH 0141/1120] Linux 3.4: Enable options to make b43 work with bcm4331 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index b643de8bff65..e9186e151640 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -76,6 +76,8 @@ let HOSTAP_FIRMWARE_NVRAM y ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y # Some settings to make sure that fbcondecor works - in particular, # disable tileblitting and the drivers that need it. From b5d312a56c7c626b8bd127807f5a302d46f74202 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 10:54:43 +0200 Subject: [PATCH 0142/1120] haskell-hoauth: add meta.maintainer --- pkgs/development/libraries/haskell/hoauth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix index f097a1342185..e118f7650979 100644 --- a/pkgs/development/libraries/haskell/hoauth/default.nix +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "A Haskell implementation of OAuth 1.0a protocol."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 45f6ee29ec0136e5f332fc4ac0a02abaa8210ef4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 10:55:23 +0200 Subject: [PATCH 0143/1120] haskell-JuicyPixels: add meta.maintainer --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 87431c6b2425..a99f8295c60f 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "Picture loading/serialization (in png, jpeg and bitmap)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 297982be34c1bb7670aae44e93bd9849949a1b39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:01:59 +0200 Subject: [PATCH 0144/1120] haskell-mime-types: add version 0.1.0.0 --- .../libraries/haskell/mime-types/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/mime-types/default.nix diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix new file mode 100644 index 000000000000..8359d6dc181d --- /dev/null +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -0,0 +1,15 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "mime-types"; + version = "0.1.0.0"; + sha256 = "0xc36pr84nszyych3jd8sl6kj1grsyv8ci8v7ilrbpnw7ngbkw1p"; + buildDepends = [ text ]; + meta = { + homepage = "https://github.com/yesodweb/wai"; + description = "Basic mime-type handling types and functions"; + license = self.stdenv.lib.licenses.mit; + 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 5515990baaa5..26dc5ad00dd0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -993,6 +993,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mimeMail = callPackage ../development/libraries/haskell/mime-mail {}; + mimeTypes = callPackage ../development/libraries/haskell/mime-types {}; + MissingH = callPackage ../development/libraries/haskell/MissingH {}; mmap = callPackage ../development/libraries/haskell/mmap {}; From b52336f242c17b832728d7544ee8489e81baea7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:02:12 +0200 Subject: [PATCH 0145/1120] haskell-process-extras: add version 0.1.0 --- .../libraries/haskell/process-extras/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/process-extras/default.nix diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix new file mode 100644 index 000000000000..16c1b96f0425 --- /dev/null +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -0,0 +1,15 @@ +{ cabal, text }: + +cabal.mkDerivation (self: { + pname = "process-extras"; + version = "0.1.0"; + sha256 = "0bq8nz2iapmngmkx2vlyk4ffw20b34yw5q7h7j6r3zrjzq42prsp"; + buildDepends = [ text ]; + meta = { + homepage = "https://github.com/davidlazar/process-extras"; + description = "Process extras"; + license = self.stdenv.lib.licenses.mit; + 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 26dc5ad00dd0..5b2e159eff0f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1149,6 +1149,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive = callPackage ../development/libraries/haskell/primitive {}; + processExtras = callPackage ../development/libraries/haskell/process-extras {}; + processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; prolog = callPackage ../development/libraries/haskell/prolog {}; From 3f7c859b8ebecb3c0a86b60052608b2dab75027b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:02:38 +0200 Subject: [PATCH 0146/1120] haskell-maude: update to version 0.6.1 --- pkgs/development/libraries/haskell/maude/default.nix | 8 ++++---- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 709156d290f7..84f0d83a9242 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, text }: +{ cabal, filepath, processExtras, temporary, text, xml }: cabal.mkDerivation (self: { pname = "maude"; - version = "0.3.0"; - sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg"; - buildDepends = [ parsec text ]; + version = "0.6.1"; + sha256 = "0qadqpj5vzg84mqh29p6vr2ffih7y69ds0jdpxmr17am5bh3mhql"; + buildDepends = [ filepath processExtras temporary text xml ]; meta = { homepage = "https://github.com/davidlazar/maude-hs"; description = "An interface to the Maude rewriting system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b2e159eff0f..b5fdcc9a2348 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -981,9 +981,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; - maude = callPackage ../development/libraries/haskell/maude { - parsec = self.parsec3; - }; + maude = callPackage ../development/libraries/haskell/maude {}; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; From 65b67ce2a1c0a78c457f23d78cdf21a5295e32c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0147/1120] haskell-Hipmunk: update to version 5.2.0.9 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index d6c3b5ffc231..770bfa275150 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.8"; - sha256 = "0xsckndxmzbp32fqb8i90k21rz0xjj3smxjijw742l637p3mv5zw"; + version = "5.2.0.9"; + sha256 = "0c0s5spsyp67ajfzck8f29px2xid8aiws12l3dswvp50d74a9mlq"; buildDepends = [ StateVar transformers ]; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; From 3b532b371af714d2c60ac20638c23dcf854a6f11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0148/1120] haskell-SHA: update to version 1.5.1 --- pkgs/development/libraries/haskell/SHA/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index d1eff38c0d70..956b1a8f8a34 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SHA"; - version = "1.5.0.1"; - sha256 = "1nyj50hyka2fnk9nnidygl8d52xgvmj9m8aywjzbzdaxxrmdab8g"; + version = "1.5.1"; + sha256 = "009c0nabva0c4aq4yhqdmdqmrrjmg8scpy7yz65bbhqnfwnjvdks"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; From bb7be367001409dbabceb929ef53b759b085d8d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0149/1120] haskell-Vec: update to version 1.0 --- pkgs/development/libraries/haskell/Vec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 77cc9e37a9dd..996cfd1a78cd 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "Vec"; - version = "0.9.9"; - sha256 = "1ms6w8003aplcndqglw2gxj0ji4m3jki9ndj5gni24w8dqiy5x47"; + version = "1.0"; + sha256 = "1lyi7di92q1f0k08nj7766nm0ygaqdrjdphnb6imvyrsmjrspaqk"; meta = { - homepage = "http://graphics.cs.ucdavis.edu/~sdillard/Vec"; + homepage = "http://github.net/sedillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 9dfeb7c0d06bb5a83c926a5f6efdaba36d984ded Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0150/1120] haskell-async: update to version 2.0.1.1 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 36c9a839ab0d..ca759009817f 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.1.0"; - sha256 = "00yfxp18zhfjnxz0bqzym0ikarzsa75yw5pi33dsyv9kivra3k5q"; + version = "2.0.1.1"; + sha256 = "132xr0sb3j02s134my4p7khj95d3v3jlpxqjrgn6h8brw0gp6wcq"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; From d29fe161cef0b02672183dadfe0954d6019b1968 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0151/1120] haskell-base-unicode-symbols: update to version 0.2.2.4 --- .../libraries/haskell/base-unicode-symbols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 020bce0a82c2..3eccd0a4ffac 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base-unicode-symbols"; - version = "0.2.2.3"; - sha256 = "0803ncdydkxivn4kcjfn9v0lm43xg47y5iws7lajhhyg6v4zq08j"; + version = "0.2.2.4"; + sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52"; meta = { homepage = "http://haskell.org/haskellwiki/Unicode-symbols"; description = "Unicode alternatives for common functions and operators"; From 39fb1d6f384140c9e948bf6af9d5a67d5f2475c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0152/1120] haskell-binary: update to version 0.5.1.1 --- pkgs/development/libraries/haskell/binary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index 01a9483c5541..a8fefba02741 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.5.1.0"; - sha256 = "18si0f021447b1kqshar224zyh02gc65z7v82waxcn4igss7gm1a"; + version = "0.5.1.1"; + sha256 = "0s62a92a2wwp8hdmkc6j6i9lh5mi6z1yd26fbhsbbm8bxah64pcl"; meta = { homepage = "http://code.haskell.org/binary/"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; From 6838d503abc9f194953c809d6c42c8e5f381ebf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:38 +0200 Subject: [PATCH 0153/1120] haskell-hakyll: update to version 3.4.0.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 11e4d90205c8..8dfeb9413d38 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.3.0.1"; - sha256 = "1rymj7j97803hy7nv235m29m0rird1c0ik81mkaicdfiabkihmrq"; + version = "3.4.0.0"; + sha256 = "1m69kzjbsspf69qc3yq6qhpnk3vd3k5qa7zssazm8717sgrb2z9m"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup From 658b9855fec4003ac4b71e03840f5869fa44ef4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0154/1120] haskell-happstack-server: update to version 7.0.3 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 97cfd0173b9b..39f93102da00 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.2"; - sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb"; + version = "7.0.3"; + sha256 = "06r5h1jhb4h9hra7radhr3rq404283nwv4mhppfxsh4adk5ng0qy"; isLibrary = true; isExecutable = true; buildDepends = [ From ad0f0d6817c3ecb9fea13efe1249320f87d84930 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0155/1120] haskell-hastache: update to version 0.4.1 --- pkgs/development/libraries/haskell/hastache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index ef11e344b446..54decaa5ecb8 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hastache"; - version = "0.3.3"; - sha256 = "18ayrfwi3jn3q650m5dm9wx9c7djwc2miz3mxlscd9gzlnrfi772"; + version = "0.4.1"; + sha256 = "1d6d3bmmfx1jh38hhmvaq1ncdxlfjc0mc7jvbxqgr00dg73wfgdk"; buildDepends = [ blazeBuilder filepath ieee754 mtl syb text utf8String ]; From 7a539c2b1bbfd084b3d9be7a58e65f46179ef62e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0156/1120] haskell-haxr: update to version 3000.9.0.1 --- .../development/libraries/haskell/haxr/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index 12f2b2f84f3a..1283d3a4a59e 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,17 +1,15 @@ -{ cabal, blazeBuilder, dataenc, HaXml, HTTP, mtl, network, time -, utf8String +{ cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network +, time, utf8String }: cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.8.5"; - sha256 = "1gfifqc7ldklapnymwd9ss0lll6q87sbg1hc6pa4c9sh275x1rz6"; + version = "3000.9.0.1"; + sha256 = "106hw8ysjx12dvwij4ld6n54mxj2yl1p7iihp2fwz50v50mz6102"; buildDepends = [ - blazeBuilder dataenc HaXml HTTP mtl network time utf8String + base64Bytestring blazeBuilder HaXml HTTP mtl network time + utf8String ]; - patchPhase = '' - sed -i haxr.cabal -e 's|HaXml == 1.22.\*|HaXml|' - ''; meta = { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; From 23dcb273a14b85c78f86e577be9b9e4da26179f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0157/1120] haskell-hledger-lib: update to version 0.18.2 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index fb517c3cef14..ef244bcb7689 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.18.1"; - sha256 = "0dv5q20n5almxxl0n68lv1172x61z2q16nvwydzrc7qp1j31d8my"; + version = "0.18.2"; + sha256 = "0lcs58bdix4m7sslrdi38rqw5x5fb4ip0n5is0phxdrbp0nggd4z"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String From 3a602ec029d3ab50fa7b6b47d5314856043466d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0158/1120] haskell-hledger-web: update to version 0.18.2 --- pkgs/development/libraries/haskell/hledger-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 2659f1292a7b..cc4ccc186c63 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.18.1"; - sha256 = "1khjqqjjcwcymyh395rfc39wzybacw5n64wmj2sixyw0p1l4mwg7"; + version = "0.18.2"; + sha256 = "1bhah29why34qaiy7mgzpzjd5dm94izcf3jmgflix56gkgzk86p1"; isLibrary = true; isExecutable = true; buildDepends = [ From 3ff1801d9eb96fcc5a3bc905a4e663b3ab8e9a75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0159/1120] haskell-hledger: update to version 0.18.2 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 3f5ce8b43d40..815ca1b87fd9 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.18.1"; - sha256 = "0nrs9qawvny6dl0pj3f183sgwmam9dsb2dfhp8hqnxx48g1p01lk"; + version = "0.18.2"; + sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld"; isLibrary = true; isExecutable = true; buildDepends = [ From b012e956ad8095cc3ae3673362a1e0349d059ed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0160/1120] haskell-language-c-quote: update to version 0.3.2 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index b4986af4a019..a765b015a314 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.1.2"; - sha256 = "0lqr9z2akx90l07k1qbv3y4wwwlcilj08zva4v9scbqydrwpqxip"; + version = "0.3.2"; + sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From f405ab64670c6229035b4b0fc3305c4f5a1d31bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0161/1120] haskell-largeword: update to version 1.0.2 --- pkgs/development/libraries/haskell/largeword/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 0c5266523992..7f01336f281d 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.1"; - sha256 = "0kkkck220wap3ad2k6461ylhshiqbizv0qh35i2325fhqx892gyr"; + version = "1.0.2"; + sha256 = "0ylbl9rffhqw9ahasn23n00h7v5yqmghmqkrq446zdr72bq23hk2"; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; From 50df34469d8b1d0683437439593c5ec9b54021cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0162/1120] haskell-mainland-pretty: update to version 0.1.3.0 --- .../development/libraries/haskell/mainland-pretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index f4b49a6f409a..d64a6c761800 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.1.2.0"; - sha256 = "0qhv8qfzcm5n1scgmxsv1c2qqnhvp8r0hmax22vzaq7jmlzwhj4p"; + version = "0.1.3.0"; + sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; buildDepends = [ srcloc symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; From e2b33fbbca36d047019ac95dc600941c159a416f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:39 +0200 Subject: [PATCH 0163/1120] haskell-shelly: update to version 0.13.0.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 7b63732024e2..2d2b3ca495d2 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.12.2"; - sha256 = "0nhycisk6jc3mqd2xqcxxgfqsqm8vp5k4g45gdljalb87rqvqkkv"; + version = "0.13.0.1"; + sha256 = "1iw2hbnr9pwfvz6hhmnmg4h2h58ggppbjy3vs0i08hc33nms1lvy"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 618a95a37bdfe2fa45c22ffdff5684e13b57b28e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0164/1120] haskell-srcloc: update to version 0.1.2 --- pkgs/development/libraries/haskell/srcloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index a29d1bd662ce..d76309bc7956 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.1.1.1"; - sha256 = "131g83sa0kjwy4bz6hcaxplywqd0899sw5r5x0nr0bffkhk91k60"; + version = "0.1.2"; + sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; buildDepends = [ syb symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; From 58a534011289181ee2c4fe7690e729b86c14f44d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0165/1120] haskell-symbol: update to version 0.1.3 --- pkgs/development/libraries/haskell/symbol/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 42cfd77f1c81..b8dd2aa69a2d 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, deepseq, syb }: cabal.mkDerivation (self: { pname = "symbol"; - version = "0.1.1.1"; - sha256 = "1vda97jh9jrvb4l9v9m3xzv8z96jdwf5fji643i6ff3n3h9ysn77"; - buildDepends = [ syb ]; + version = "0.1.3"; + sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j"; + buildDepends = [ deepseq syb ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A 'Symbol' type for fast symbol comparison"; From d5cbb3ce2c6ebf69052581db19349653bf6dad13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0166/1120] haskell-system-fileio: update to version 0.3.9 --- pkgs/development/libraries/haskell/system-fileio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 58284655eb88..7534ce4a1d13 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.8"; - sha256 = "0zv7ngxc3qgrlfbp0vqirzcwmkmi9ql8pgqhn1ls56iqwbxbb654"; + version = "0.3.9"; + sha256 = "0mfmijwnkp92s58jb51lk0p1p3418f6qskr95phc1zp40yrcw8nx"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From d4f99e23954991b92fb0cb7bb469a440ebcc76bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0167/1120] haskell-yesod-json: update to version 1.0.1.0 --- pkgs/development/libraries/haskell/yesod-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 7ff0abedc1a8..b91ca879afad 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.0.0.1"; - sha256 = "0dh294y067xa1y9lxamspbq21npv66ilsiayynsiykzik86k6vph"; + version = "1.0.1.0"; + sha256 = "0baxyy4mddgpfzm4scfizz8pi6y7a135kjwfhss51m6xx36s84zl"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes From f2d77b76d771c45eaf1232127d58511e117dab11 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0168/1120] haskell-hlint: update to version 1.8.30 --- 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 3b2afdd791e5..471b22a5825d 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.29"; - sha256 = "07l281106kkahdzgilhh2njjirll0mhr318i3zmhn2ygcb9dvkdr"; + version = "1.8.30"; + sha256 = "1c52h7pi759dnqzfq46nyckp75aswpqkf2n7aag2np955ky7rd05"; isLibrary = true; isExecutable = true; buildDepends = [ From ed7a149f7d6a5e0f04c96fa3aa71fe06436d3f78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 11:14:40 +0200 Subject: [PATCH 0169/1120] haskell-cpphs: update to version 1.14 --- 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 fe20037cb951..4fbce76474c8 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.13.3"; - sha256 = "1dnz4992hr662ys1lkf6iyqmi2a3bksim8dlryqwd9wx9h24lhq2"; + version = "1.14"; + sha256 = "1lscgylcbbny60lx36xwm8y22jmbv23159pfn8n87kbskq6cpk0z"; isLibrary = true; isExecutable = true; meta = { From 49b893ba3a2256d7cef7c76b16eba8fd575835f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 14:26:06 +0200 Subject: [PATCH 0170/1120] perl-Font-AFM: add version 1.20 --- 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 9ce012ec7c7f..6633ff3914f8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1546,6 +1546,14 @@ rec { propagatedBuildInputs = [ TestScript ]; }; + FontAFM = buildPerlPackage rec { + name = "Font-AFM-1.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "32671166da32596a0f6baacd0c1233825a60acaf25805d79c81a3f18d6088bc1"; + }; + }; + FontTTF = buildPerlPackage { name = "Font-TTF-0.43"; src = fetchurl { From ac7781cc4006803f62c05060a405cb1772c8a698 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 14:40:31 +0200 Subject: [PATCH 0171/1120] perl-File-chdir: update to version 0.1006 --- 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 6633ff3914f8..9c9f1c3ee8c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1446,11 +1446,11 @@ rec { ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; }; - Filechdir = buildPerlPackage { - name = "File-chdir-0.1002"; + Filechdir = buildPerlPackage rec { + name = "File-chdir-0.1006"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz; - sha256 = "1fc2l754bxsizli3injm4wqf8dn03iq16rmfn62l99nxpibl5k6p"; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; + sha256 = "b26e91f8b5480544da599412612ff9287007be9703d41c35251f09c5ff19879a"; }; }; From aa986a89ae19404284338a78acfe10e7a7920d69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 14:40:46 +0200 Subject: [PATCH 0172/1120] perl-HTML-Tree: update to version 4.2 --- 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 9c9f1c3ee8c3..9008459c63eb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1766,11 +1766,11 @@ rec { buildInputs = [TestPod]; }; - HTMLTree = buildPerlPackage { - name = "HTML-Tree-3.23"; + HTMLTree = buildPerlPackage rec { + name = "HTML-Tree-4.2"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETEK/HTML-Tree-3.23.tar.gz; - sha256 = "1pn80f4g1wixs030f40b80wrj12kwfinwycrx3f10drg4v7ml5zm"; + url = "mirror://cpan/authors/id/J/JF/JFEARN/${name}.tar.gz"; + sha256 = "80e4e3caa5e0e025dee5ed383a8d4cc7479ae4802184c4757dafd147a8fca7c9"; }; propagatedBuildInputs = [HTMLParser]; }; From 3d416ed030dc123df9f41480825103b6ac1f2a7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 14:51:08 +0200 Subject: [PATCH 0173/1120] ikiwiki: update to version 3.20120629 --- pkgs/applications/misc/ikiwiki/default.nix | 47 ++++++++++++++++------ pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 83665aab5f55..bb3e1eb1306d 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,32 +1,46 @@ -{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, YAML +{ stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML +, YAMLLibYAML, which, HTMLTree, python, docutils, Filechdir , gitSupport ? false, git ? null , monotoneSupport ? false, monotone ? null +, bazaarSupport ? false, bazaar ? null +, cvsSupport ? false, cvs ? null, cvsps ? null +, subversionSupport ? false, subversion ? null +, mercurialSupport ? false, mercurial ? null , extraUtils ? [] }: assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); +assert bazaarSupport -> (bazaar != null); +assert cvsSupport -> (cvs != null && cvsps != null); +assert subversionSupport -> (subversion != null); +assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20120516"; + version = "3.20120629"; + + lib = stdenv.lib; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "b75097d4f4db79a16f8b74bc4e7f824a586e0e150ecf18103888bbe553a41eb0"; + sha256 = "7e39cdb727f261ce20fde5f0b05966680589a3d028c569780addd4b530382f07"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML ] - ++ stdenv.lib.optionals gitSupport [git] - ++ stdenv.lib.optionals monotoneSupport [monotone]; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree python docutils ] + ++ lib.optionals gitSupport [git] + ++ lib.optionals monotoneSupport [monotone] + ++ lib.optionals bazaarSupport [bazaar] + ++ lib.optionals cvsSupport [cvs cvsps Filechdir] + ++ lib.optionals subversionSupport [subversion] + ++ lib.optionals mercurialSupport [mercurial]; patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man @@ -42,17 +56,26 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \ - ${lib.optionalString gitSupport - ''--prefix PATH : ${git}/bin \''} - ${lib.optionalString monotoneSupport - ''--prefix PATH : ${monotone}/bin \''} + ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} + ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} + ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''} + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} + ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''} + ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; + checkTarget = "test"; + doCheck = true; + meta = { description = "Wiki compiler, storing pages and history in a RCS"; - homepage = http://ikiwiki.info/; + homepage = "http://ikiwiki.info/"; license = "GPLv2+"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08319e0de648..4c3c028c341d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6954,10 +6954,7 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML; - gitSupport = false; - monotoneSupport = false; - extraUtils = []; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir; }; imagemagick = callPackage ../applications/graphics/ImageMagick { From 40ef76f4a4b036f0b3efc2493bb521ce2818efd1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Jul 2012 15:47:05 +0200 Subject: [PATCH 0174/1120] ikiwiki: make docutils support optional --- pkgs/applications/misc/ikiwiki/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index bb3e1eb1306d..f3fb575c6e57 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML, which, HTMLTree, python, docutils, Filechdir +, YAMLLibYAML, which, HTMLTree , gitSupport ? false, git ? null +, docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null , bazaarSupport ? false, bazaar ? null -, cvsSupport ? false, cvs ? null, cvsps ? null +, cvsSupport ? false, cvs ? null, cvsps ? null, Filechdir ? null , subversionSupport ? false, subversion ? null , mercurialSupport ? false, mercurial ? null , extraUtils ? [] }: +assert docutilsSupport -> (python != null && docutils != null); assert gitSupport -> (git != null); assert monotoneSupport -> (monotone != null); assert bazaarSupport -> (bazaar != null); -assert cvsSupport -> (cvs != null && cvsps != null); +assert cvsSupport -> (cvs != null && cvsps != null && Filechdir != null); assert subversionSupport -> (subversion != null); assert mercurialSupport -> (mercurial != null); @@ -34,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree python docutils ] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree ] + ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] ++ lib.optionals bazaarSupport [bazaar] From 6bf409999f970370117f31801a574217164f1cea Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 12:17:28 -0400 Subject: [PATCH 0175/1120] linux-3.4: Add the improved transaction scheduler for USB 2.0 This is needed for new Apple trackpads --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e9186e151640..e1df11ba4f4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -202,6 +202,7 @@ let THERMAL_HWMON y # Hardware monitoring support USB_DEBUG n USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y X86_MCE y From 8ff20e5b77b7aea77b5bd22da3d2c10a99481b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 14 Jul 2012 18:50:32 +0200 Subject: [PATCH 0176/1120] Build the LinuxSampler LV2 plugin --- pkgs/applications/audio/linuxsampler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index a100390c2708..1ef081c84d07 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, jackaudio, libgig, libsndfile, libtool , pkgconfig }: +, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "linuxsampler-svn-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib asio autoconf automake bison jackaudio libgig libsndfile - libtool pkgconfig + libtool lv2 pkgconfig ]; meta = with stdenv.lib; { From dc5ba23ab46878e46ca6858ea313645f5782e19a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 14 Jul 2012 17:41:52 -0400 Subject: [PATCH 0177/1120] linux: Update to 3.2.23 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 70b9d9dcf385..ab1ec38ba523 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.22"; + version = "3.2.23"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1nf3ph06p743jjxfgwwcy8156mx4fi1cy7zi7hc1gz5bq4c0k8mw"; + sha256 = "1fmxr9qdz239aqf63j1648rvfngysqqk8qzwb1wjsn5hzrahsxmw"; }; config = configWithPlatform stdenv.platform; From 039b70904193091cc894e47491010343f5cefebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 15 Jul 2012 11:51:49 +0200 Subject: [PATCH 0178/1120] Fix the hardcoded /usr/local path in the debug ffado-diag, diagnostic script --- pkgs/os-specific/linux/ffado/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 3755bbe80bbd..a78599c6a20f 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \ PYPKGDIR=$out/$PYLIBSUFFIX install + sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag + PYDIR=$out/$PYLIBSUFFIX wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \ $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX: From 0d64ae833542a1d17e87cd4c5aca46fd35fd3c8a Mon Sep 17 00:00:00 2001 From: Daniel Santa Cruz Date: Sun, 15 Jul 2012 14:40:58 -0400 Subject: [PATCH 0179/1120] Packages needed for Yesod + Postgresql development --- .../haskell/persistent-postgresql/default.nix | 19 +++++++++++++++++++ .../haskell/postgresql-libpq/default.nix | 14 ++++++++++++++ .../haskell/postgresql-simple/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++++ 4 files changed, 59 insertions(+) create mode 100644 pkgs/development/libraries/haskell/persistent-postgresql/default.nix create mode 100644 pkgs/development/libraries/haskell/postgresql-libpq/default.nix create mode 100644 pkgs/development/libraries/haskell/postgresql-simple/default.nix diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix new file mode 100644 index 000000000000..15b1c426aea3 --- /dev/null +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -0,0 +1,19 @@ +{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq +, postgresqlSimple, text, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "persistent-postgresql"; + version = "0.9.1"; + sha256 = "0kzw4lq4i6lj149aws4ca4z43jmwvcbjr5gf5lk0pwcmzp6chr32"; + buildDepends = [ + aeson conduit monadControl persistent postgresqlLibpq + postgresqlSimple text time transformers + ]; + meta = { + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix new file mode 100644 index 000000000000..abe2e83a018b --- /dev/null +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -0,0 +1,14 @@ +{ cabal, postgresql }: + +cabal.mkDerivation (self: { + pname = "postgresql-libpq"; + version = "0.8.2"; + sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g"; + extraLibraries = [ postgresql ]; + meta = { + homepage = "http://github.com/lpsmith/postgresql-libpq"; + description = "low-level binding to libpq"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix new file mode 100644 index 000000000000..03263c9ff97e --- /dev/null +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq +, text, time, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "postgresql-simple"; + version = "0.1.4.3"; + sha256 = "0q0mkkd22hji7ns25i86shy1504d0d4mc3fqljpfffm6m36855kc"; + buildDepends = [ + attoparsec blazeBuilder blazeTextual postgresqlLibpq text time + transformers vector + ]; + meta = { + description = "Mid-Level PostgreSQL client library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5515990baaa5..6baf27851699 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1129,6 +1129,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); persistent = callPackage ../development/libraries/haskell/persistent {}; + persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {}; + persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {}; persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {}; @@ -1141,6 +1143,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); poolConduit = callPackage ../development/libraries/haskell/pool-conduit {}; + postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq { + postgresql = pkgs.postgresql91; + }; + + postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {}; + ppm = callPackage ../development/libraries/haskell/ppm {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; From 3c090b3f297549092bfaae85f4d4892571dc69fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:20:59 +0200 Subject: [PATCH 0180/1120] haskell-gitit: patch to support current version of hslogger --- pkgs/development/libraries/haskell/gitit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 7f15c201999b..148750e9ddcd 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -18,6 +18,9 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; + patchPhase = '' + sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal + ''; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From 666a1aa7276f3ff68b90b469673f760be33d33f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:11 +0200 Subject: [PATCH 0181/1120] haskell-hoogle: update to version 4.2.12 --- 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 9db10b33b1d7..db5dc38e38f8 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.11"; - sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid"; + version = "4.2.12"; + sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy"; isLibrary = true; isExecutable = true; buildDepends = [ From 3be2d8d9cd3fc765c98d4a517e082d40aee07134 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:11 +0200 Subject: [PATCH 0182/1120] haskell-language-c-quote: update to version 0.4.0 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index a765b015a314..503fa8f561fc 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.2"; - sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; + version = "0.4.0"; + sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 8e85516e045149a6bbd9e09020df9ceb255a75a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:11 +0200 Subject: [PATCH 0183/1120] haskell-mainland-pretty: update to version 0.2.1 --- .../libraries/haskell/mainland-pretty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index d64a6c761800..221a69fa7da7 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,10 +1,10 @@ -{ cabal, srcloc, symbol }: +{ cabal, srcloc, text }: cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.1.3.0"; - sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; - buildDepends = [ srcloc symbol ]; + version = "0.2.1"; + sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h"; + buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; From 932ee764a4e2d2410ccc2cef9bdfd24e94da4e50 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:11 +0200 Subject: [PATCH 0184/1120] haskell-simple-sendfile: update to version 0.2.5 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 313f2aa4869d..766e1ef96171 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.4"; - sha256 = "1c7imvkb5aq5mlg6a1r36fp9klniicbj56n32yvzj4qqf1zy2pbx"; + version = "0.2.5"; + sha256 = "1g9plryh86lc03rf1s8m36wyc2yqp4y6f02viq9c4g1k85rkbs53"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; From ffbdd377f15b2af032285345c1b4ed013e6ed953 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:12 +0200 Subject: [PATCH 0185/1120] haskell-srcloc: update to version 0.2.0 --- pkgs/development/libraries/haskell/srcloc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index d76309bc7956..007ce644be0c 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb, symbol }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.1.2"; - sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; - buildDepends = [ syb symbol ]; + version = "0.2.0"; + sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs"; + buildDepends = [ syb ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; From abad8b8873a587220a2ff949b41d8e179b5bbd92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:21:12 +0200 Subject: [PATCH 0186/1120] haskell-hslogger: update to version 1.2.0 --- pkgs/development/tools/haskell/hslogger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index b181f164ed96..4128f6b7d098 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger"; - version = "1.1.5"; - sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7"; + version = "1.2.0"; + sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time ]; From 76c096e4ea3694fc2ca89cb2097881cc2af3be6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:22:51 +0200 Subject: [PATCH 0187/1120] haskell-hoogle: revert update to version 4.2.12 We need a current version of http-types for this update. --- 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 db5dc38e38f8..9db10b33b1d7 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.12"; - sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy"; + version = "4.2.11"; + sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid"; isLibrary = true; isExecutable = true; buildDepends = [ From 0b0babffc5f5256b8e1f1e258f36faaf94329274 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 16 Jul 2012 11:36:35 +0200 Subject: [PATCH 0188/1120] Add meta.maintainer attribute to Haskell packages. --- .../libraries/haskell/persistent-postgresql/default.nix | 1 + pkgs/development/libraries/haskell/postgresql-libpq/default.nix | 1 + pkgs/development/libraries/haskell/postgresql-simple/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 15b1c426aea3..c1022e137491 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Backend for the persistent library using postgresql"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index abe2e83a018b..19f729a56414 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "low-level binding to libpq"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 03263c9ff97e..a142abdbceb8 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -14,5 +14,6 @@ cabal.mkDerivation (self: { description = "Mid-Level PostgreSQL client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From 09f6874aadce28bd085f3df5704ca08b3a51cb9a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 16 Jul 2012 12:06:31 +0200 Subject: [PATCH 0189/1120] Add trickle 1.07 --- pkgs/tools/networking/trickle/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/networking/trickle/default.nix diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix new file mode 100644 index 000000000000..646108525d3c --- /dev/null +++ b/pkgs/tools/networking/trickle/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, libevent }: + +stdenv.mkDerivation rec { + name = "trickle-1.07"; + + src = fetchurl { + url = "http://monkey.org/~marius/trickle/${name}.tar.gz"; + sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; + }; + + buildInputs = [libevent]; + + preConfigure = '' + sed -i 's|libevent.a|libevent.so|' configure + ''; + + preBuild = '' + sed -i '/#define in_addr_t/ s:^://:' config.h + ''; + + LDFLAGS = "-levent"; + + configureFlags = "--with-libevent"; + + meta = { + description = "Trickle, a portable lightweight userspace bandwidth shaper."; + license = "BSD"; + homepage = http://monkey.org/~marius/pages/?page=trickle; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2444e920bed5..64d2b986cc1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1508,6 +1508,8 @@ let torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + trickle = callPackage ../tools/networking/trickle {}; + ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { }; From a677ded47fd2fc9abf35d89ff2fbf8d343749c5a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 07:16:34 -0400 Subject: [PATCH 0190/1120] Add werkzeug python package --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb265337b39e..c4977cfe0c1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2590,6 +2590,22 @@ let pythonPackages = python.modules // rec { }; + werkzeug = buildPythonPackage { + name = "werkzeug-0.8.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz"; + md5 = "12aa03e302ce49da98703938f257347a"; + }; + + meta = { + homepage = http://werkzeug.pocoo.org/; + description = "A WSGI utility library for Python"; + license = "BSD"; + }; + }; + + wxPython = wxPython28; From 00b8c7701291399d3421e3b883c796c11ce9e4c7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 07:20:24 -0400 Subject: [PATCH 0191/1120] Add flask python package --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4977cfe0c1d..ba8292fabb4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -686,6 +686,24 @@ let pythonPackages = python.modules // rec { }; + flask = buildPythonPackage { + name = "flask-0.9"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz"; + md5 = "4a89ef2b3ab0f151f781182bd0cc8933"; + }; + + buildInputs = [ werkzeug jinja2 ]; + + meta = { + homepage = http://flask.pocoo.org/; + description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; + license = "BSD"; + }; + }; + + flup = buildPythonPackage (rec { name = "flup-1.0.2"; From be4a92ad331a63b7d105510d4c7d700ab7e6ebff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Jul 2012 11:21:56 -0400 Subject: [PATCH 0192/1120] nix: Update to 1.1pre2742_a7a43ad --- 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 8b6ccb787be9..3025f0450b86 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.1pre2723_1aba0bf"; + name = "nix-1.1pre2742_a7a43ad"; src = fetchurl { - url = "http://hydra.nixos.org/build/2746466/download/4/${name}.tar.bz2"; - sha256 = "06224ecbde09124eea25bfcafcb06637457bc6ac9a9e332d84e9eaf561599160"; + url = "http://hydra.nixos.org/build/2799663/download/4/${name}.tar.bz2"; + sha256 = "bad6b3b6177d47cef0be3c81a5e1e876f656e99afeea673613e00656ebf07d3e"; }; buildNativeInputs = [ perl pkgconfig ]; From 94e2616c1ab1b183ffbba22b41626bb0026b7548 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 11:54:45 -0400 Subject: [PATCH 0193/1120] flask: Dependencies need to be propagated --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba8292fabb4d..35c12903b2cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -694,7 +694,7 @@ let pythonPackages = python.modules // rec { md5 = "4a89ef2b3ab0f151f781182bd0cc8933"; }; - buildInputs = [ werkzeug jinja2 ]; + propagatedBuildInputs = [ werkzeug jinja2 ]; meta = { homepage = http://flask.pocoo.org/; From d04cbc85cf2d3754a9f6cfcc924f77ff4d2642e6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 20:26:27 -0400 Subject: [PATCH 0194/1120] linux-3.4: Update to 3.4.5 --- 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 e1df11ba4f4d..5cbde5651538 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.4"; + version = "3.4.5"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0l4h7amhsmgpnii8rgwi32nd7ajsifk2xckjd39pfzwdifacw5yw"; + sha256 = "17m58d2mc2mgr49hlwhic03s0z1mjyp7lhfvfmpqi3qszrz3xij3"; }; config = configWithPlatform stdenv.platform; From c5ad1e22a185df0a4a65d7002dac0a54a1b0a2a8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 21:26:04 -0400 Subject: [PATCH 0195/1120] gnupg: Try to build on all platforms --- pkgs/tools/security/gnupg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index d3c9e3c13b6a..0667a7f9885c 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -54,5 +54,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; + + platforms = stdenv.lib.platforms.all; }; } From 96b5e9795a7a793b46946e0a75f6d64c8e884558 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 Jul 2012 12:03:13 +0200 Subject: [PATCH 0196/1120] chromium: Update to the latest release channels. --- .../networking/browsers/chromium/sources.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index db07bc460c78..93cc3a993b16 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,19 +1,19 @@ # This file is autogenerated from update.sh in the same directory. -# VHASH: 5e5af2017fa2e05f11aa741c6f87fff0549b93e3bc2aa40e6cc0a0aff84ba010 +# VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8 { dev = { - version = "21.0.1180.15"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.15.tar.bz2"; - sha256 = "0ahsrsyw4928vg1kl3dv44q77ksp85crw6m7fy20nq46qihb0mxa"; + version = "22.0.1207.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2"; + sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp"; }; beta = { - version = "20.0.1132.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2"; - sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3"; + version = "21.0.1180.41"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2"; + sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a"; }; stable = { - version = "20.0.1132.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2"; - sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3"; + version = "20.0.1132.57"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2"; + sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j"; }; } From 83d63ea910321fdf271d102f37cf34f3da57bd05 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 17 Jul 2012 12:46:39 +0200 Subject: [PATCH 0197/1120] opera: Update to 12.0 --- .../networking/browsers/opera/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c53a5f345256..8c3cd9f11cd5 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -9,22 +9,22 @@ assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; let - mirror = ftp://ftp.ussg.iu.edu/pub/opera; + mirror = http://get.geo.opera.com/pub/opera; in stdenv.mkDerivation rec { - name = "opera-11.64-1403"; + name = "opera-12.00-1467"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz"; - sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82"; + url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz"; + sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz"; - sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69"; + url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz"; + sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From 0a7e280587bb8669f9c2a6ac15c913be43a978fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Jul 2012 12:14:41 +0200 Subject: [PATCH 0198/1120] xscreensaver: update to version 5.18 --- .../screensavers/xscreensaver/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 2cd915c498ee..cf4f81ea4072 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, bc, perl, pam -, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender -, libXxf86misc -, libjpeg, mesa, gtk, libxml2, libglade +{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk +, libxml2, libglade }: stdenv.mkDerivation rec { - version = "5.15"; + version = "5.18"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d"; + sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9"; }; buildInputs = @@ -19,6 +18,16 @@ stdenv.mkDerivation rec { libXxf86misc ]; + patchPhase = + '' + # Fix build error in version 5.18. Remove this patch when updating + # to a later version. + sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c + # Fix path to GTK. + sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ + -i driver/Makefile.in po/Makefile.in.in + ''; + configureFlags = [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" @@ -27,12 +36,6 @@ stdenv.mkDerivation rec { "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" ]; - preConfigure = - '' - sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \ - -i driver/Makefile.in po/Makefile.in.in - ''; - meta = { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; From 7e2979b56f30e1b52563cc749530400b6e4e9878 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Jul 2012 14:44:23 +0200 Subject: [PATCH 0199/1120] i3: fix build some more The build process depends on a script that relies on /usr/bin/env to find Perl. Running 'patchShebangs' early fixes that script. --- pkgs/applications/window-managers/i3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 3a3a3626fb93..14fd6ce41931 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; + patchPhase = "patchShebangs ."; + configurePhase = "makeFlags=PREFIX=$out"; meta = { From bae6ad5914cd6bd4414bb9811333219cb55f9051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 17 Jul 2012 22:17:01 +0200 Subject: [PATCH 0200/1120] yafc: update to 1.2.0 The project has been retaken and this is the latest tarball available. --- pkgs/applications/networking/yafc/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index a6c3c43417e0..0ea77701211f 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,21 +1,19 @@ -{stdenv, fetchurl, readline, openssh}: +{stdenv, fetchurl, readline, libssh, intltool}: -stdenv.mkDerivation { - name = "yafc-1.1.1"; +stdenv.mkDerivation rec { + name = "yafc"; + version = "1.2.0"; src = fetchurl { - url = mirror://sourceforge/yafc/yafc-1.1.1.tar.bz2; - sha256 = "ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6"; + url = "https://github.com/downloads/sebastinas/yafc/${name}-${version}.tar.xz"; + sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58"; }; - buildInputs = [readline openssh]; - - patchPhase = " - sed -e 's@/usr/bin/ssh@${openssh}/bin/ssh@' -i src/main.c - "; + buildInputs = [ readline libssh intltool ]; meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; - homepage = http://yafc.sourceforge.net; + homepage = http://www.yafc-ftp.com; + maintainers = [ "Carles Pagès " ]; license = "GPLv2+"; }; } From be22305ace29948275b9ec506b97fcf5f5141c2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Jul 2012 22:50:29 +0200 Subject: [PATCH 0201/1120] haskell-BNFC: update to version 2.4.2.1 --- pkgs/development/tools/haskell/BNFC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c06b5eacc24b..e737a02a4acb 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC"; - version = "2.4.2.0"; - sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0"; + version = "2.4.2.1"; + sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; From c93ecad6e205cbd665f2ec7fc1ecb8d814d2da4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 17 Jul 2012 23:31:19 +0200 Subject: [PATCH 0202/1120] Adding myself (page) to maintainers. --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index aab4d685361e..127295a2feb5 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -23,6 +23,7 @@ marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; neznalek = "Vladimír Čunát "; + page = "Carles Pagès "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; From 03179bd37e34b8141d7dccfd192e328409e735aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Tue, 17 Jul 2012 23:31:39 +0200 Subject: [PATCH 0203/1120] yafc: update expression to refer to maintainers list. --- pkgs/applications/networking/yafc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 0ea77701211f..7089c7507db0 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://www.yafc-ftp.com; - maintainers = [ "Carles Pagès " ]; + maintainers = [ stdenv.lib.maintainers.page ]; license = "GPLv2+"; }; } From 5c12df46cf97f30b9e640f2a31fe964d1fbe40c1 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 15 Jul 2012 01:21:01 +0200 Subject: [PATCH 0204/1120] Add haskell-lambdabot --- .../libraries/haskell/lambdabot/default.nix | 26 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lambdabot/default.nix diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix new file mode 100644 index 000000000000..49fdf743e2a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -0,0 +1,26 @@ +{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath +, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict +, MonadRandom, mtl, network, numbers, oeis, parsec, random +, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String +, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "lambdabot"; + version = "4.2.3.2"; + sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + arrows binary brainfuck dataMemocombinators filepath haskellSrc + haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl + network numbers oeis parsec random readline regexCompat show syb + tagsoup unlambda utf8String vectorSpace + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Lambdabot"; + description = "Lambdabot is a development tool and advanced IRC bot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ddfbdac9469c..7824b4ab1888 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -961,6 +961,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; + lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {}; + largeword = callPackage ../development/libraries/haskell/largeword {}; lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; From cac9051fbff2753f385bc31e10a852550cb91d80 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 21:34:53 +0200 Subject: [PATCH 0205/1120] Add brainfuck --- .../libraries/haskell/brainfuck/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/brainfuck/default.nix diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix new file mode 100644 index 000000000000..86a90f5d1b09 --- /dev/null +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -0,0 +1,13 @@ +cabal.mkDerivation (self: { + pname = "brainfuck"; + version = "0.1"; + sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl ]; + meta = { + description = "Brainfuck interpreter"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7824b4ab1888..7a0cdcd2153a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -473,6 +473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Boolean = callPackage ../development/libraries/haskell/Boolean {}; + brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {}; + bson = callPackage ../development/libraries/haskell/bson {}; byteorder = callPackage ../development/libraries/haskell/byteorder {}; From 4c50696a1bcd9dc5b546c9c4dc974c38c620f639 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 21:45:10 +0200 Subject: [PATCH 0206/1120] Add haskell/data-memocombinators --- pkgs/development/libraries/haskell/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/default.nix diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/default.nix new file mode 100644 index 000000000000..1fb2118c363c --- /dev/null +++ b/pkgs/development/libraries/haskell/default.nix @@ -0,0 +1,12 @@ +cabal.mkDerivation (self: { + pname = "data-memocombinators"; + version = "0.4.3"; + sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc"; + buildDepends = [ dataInttrie ]; + meta = { + homepage = "http://github.com/luqui/data-memocombinators"; + description = "Combinators for building memo tables"; + 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 7a0cdcd2153a..8823445bbc5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; + dataReify = callPackage ../development/libraries/haskell/data-reify {}; datetime = callPackage ../development/libraries/haskell/datetime {}; From 269f013d90924a2054a40e8e570e2a5d1fd90103 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 21:53:30 +0200 Subject: [PATCH 0207/1120] Add haskell-IOSpec --- .../libraries/haskell/IOSpec/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/IOSpec/default.nix diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix new file mode 100644 index 000000000000..46211614c4cf --- /dev/null +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, QuickCheck, Stream }: + +cabal.mkDerivation (self: { + pname = "IOSpec"; + version = "0.2.5"; + sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j"; + buildDepends = [ mtl QuickCheck Stream ]; + meta = { + description = "A pure specification of the IO monad"; + 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 8823445bbc5a..e748d4400a0a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -932,6 +932,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {}; + IOSpec = callPackage ../development/libraries/haskell/IOSpec {}; + ioStorage = callPackage ../development/libraries/haskell/io-storage {}; irc = callPackage ../development/libraries/haskell/irc { From 0a5a20d365ac70c0fda708e7083032500bc014e4 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 21:56:38 +0200 Subject: [PATCH 0208/1120] Add haskell/lambdabot-utils --- .../haskell/lambdabot-utils/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lambdabot-utils/default.nix diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix new file mode 100644 index 000000000000..9d2aa186264f --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, haskellSrc, mtl, network, random, regexCompat +, regexPosix, syb, tagsoup, utf8String, zlib +}: + +cabal.mkDerivation (self: { + pname = "lambdabot-utils"; + version = "4.2.1"; + sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx"; + buildDepends = [ + binary haskellSrc mtl network random regexCompat regexPosix syb + tagsoup utf8String zlib + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Lambdabot"; + description = "Utility libraries for the advanced IRC bot, Lambdabot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e748d4400a0a..faeb631834f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -969,6 +969,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {}; + lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; + largeword = callPackage ../development/libraries/haskell/largeword {}; lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; From d972bae84fe5463b119e6408a0c8ec6dbe665a3e Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 21:59:10 +0200 Subject: [PATCH 0209/1120] Add haskell/logict --- .../libraries/haskell/logict/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/logict/default.nix diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix new file mode 100644 index 000000000000..f67e82fbfa24 --- /dev/null +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "logict"; + version = "0.5.0.1"; + sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://code.haskell.org/~dolio/logict"; + description = "A backtracking logic-programming monad"; + 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 faeb631834f8..e13a98cbbd29 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -987,6 +987,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logfloat = callPackage ../development/libraries/haskell/logfloat {}; + logict = callPackage ../development/libraries/haskell/logict {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; From 67e105efd013f8ca5e980158e2b3d56cd3d138e0 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:04:06 +0200 Subject: [PATCH 0210/1120] Add haskell/numbers --- .../libraries/haskell/numbers/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/numbers/default.nix diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix new file mode 100644 index 000000000000..6c9056e140f0 --- /dev/null +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "numbers"; + version = "3000.0.0.0"; + sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb"; + meta = { + homepage = "https://github.com/DanBurton/numbers"; + description = "Various number types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e13a98cbbd29..fbdbbe6b251f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1080,6 +1080,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); NumInstances = callPackage ../development/libraries/haskell/NumInstances {}; + numbers = callPackage ../development/libraries/haskell/numbers {}; + numtype = callPackage ../development/libraries/haskell/numtype {}; OneTuple = callPackage ../development/libraries/haskell/OneTuple {}; From f3319f0cf6f7a306a11a5812c50f8636325f2b3c Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:06:53 +0200 Subject: [PATCH 0211/1120] Add haskell/oeis --- pkgs/development/libraries/haskell/oeis/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/oeis/default.nix diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix new file mode 100644 index 000000000000..48692cd7edf0 --- /dev/null +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -0,0 +1,13 @@ +{ cabal, HTTP, network }: + +cabal.mkDerivation (self: { + pname = "oeis"; + version = "0.3.1"; + sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2"; + buildDepends = [ HTTP network ]; + meta = { + description = "Interface to the Online Encyclopedia of Integer Sequences"; + 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 fbdbbe6b251f..b1fef22aff59 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1088,6 +1088,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ObjectName = callPackage ../development/libraries/haskell/ObjectName {}; + oeis = callPackage ../development/libraries/haskell/oeis {}; + OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {}; From 0e8b4cd7addcb54325e4401a9d560084f5b7c1eb Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:09:27 +0200 Subject: [PATCH 0212/1120] Add haskell/show --- pkgs/development/libraries/haskell/show/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/show/default.nix diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix new file mode 100644 index 000000000000..4700a8c17c88 --- /dev/null +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -0,0 +1,13 @@ +{ cabal, QuickCheck, random, smallcheck, syb }: + +cabal.mkDerivation (self: { + pname = "show"; + version = "0.4.1.2"; + sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w"; + buildDepends = [ QuickCheck random smallcheck syb ]; + meta = { + description = "'Show' instances for Lambdabot"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b1fef22aff59..975871ec4124 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1357,6 +1357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {}; + show = callPackage ../development/libraries/haskell/show {}; + SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; split = callPackage ../development/libraries/haskell/split {}; From d16ef6d18221e22392236d31eea1c495ac7d1e53 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:12:01 +0200 Subject: [PATCH 0213/1120] Add haskell/unlambda --- .../libraries/haskell/unlambda/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unlambda/default.nix diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix new file mode 100644 index 000000000000..4bdc11835864 --- /dev/null +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -0,0 +1,15 @@ +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "unlambda"; + version = "0.1"; + sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl ]; + meta = { + description = "Unlambda interpreter"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 975871ec4124..e6c01fa40f93 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1471,6 +1471,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unlambda = callPackage ../development/libraries/haskell/unlambda {}; + unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; url = callPackage ../development/libraries/haskell/url {}; From 71be80e8e98d53788740fedfd50fa9fe5566979c Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:17:49 +0200 Subject: [PATCH 0214/1120] Some correctness --- pkgs/development/libraries/haskell/brainfuck/default.nix | 3 +++ .../libraries/haskell/{ => data-memocombinators}/default.nix | 3 +++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/{ => data-memocombinators}/default.nix (94%) diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index 86a90f5d1b09..6501df584817 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -1,3 +1,5 @@ +{ cabal, mtl }: + cabal.mkDerivation (self: { pname = "brainfuck"; version = "0.1"; @@ -11,3 +13,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; }; }) + diff --git a/pkgs/development/libraries/haskell/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix similarity index 94% rename from pkgs/development/libraries/haskell/default.nix rename to pkgs/development/libraries/haskell/data-memocombinators/default.nix index 1fb2118c363c..d02cdab7110f 100644 --- a/pkgs/development/libraries/haskell/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -1,3 +1,5 @@ +{ cabal, dataInttrie }: + cabal.mkDerivation (self: { pname = "data-memocombinators"; version = "0.4.3"; @@ -10,3 +12,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; }; }) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e6c01fa40f93..03eb341b6996 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -473,7 +473,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Boolean = callPackage ../development/libraries/haskell/Boolean {}; - brainfuck = callPackage ../development/libraries/haskell/brainfuck/default.nix {}; + brainfuck = callPackage ../development/libraries/haskell/brainfuck {}; bson = callPackage ../development/libraries/haskell/bson {}; @@ -967,7 +967,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; - lambdabot = callPackage ../development/libraries/haskell/lambdabot/default.nix {}; + lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; From c145369e3c20c04b576fa2c653c927f319b40e87 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Mon, 16 Jul 2012 22:20:06 +0200 Subject: [PATCH 0215/1120] Add haskell/dataInttrie --- .../libraries/haskell/data-inttrie/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-inttrie/default.nix diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix new file mode 100644 index 000000000000..6b5f013a7094 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "data-inttrie"; + version = "0.0.7"; + sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip"; + meta = { + homepage = "http://github.com/luqui/data-inttrie"; + description = "A lazy, infinite trie of integers"; + 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 03eb341b6996..50ad0496bbf5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -586,6 +586,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; From 18c6e6c9d6290eb8ec4110eaddfa4b4af6fd9010 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 18 Jul 2012 08:56:41 +0200 Subject: [PATCH 0216/1120] Bump lambdabot version --- pkgs/development/libraries/haskell/lambdabot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index 49fdf743e2a7..2af512ef3eaa 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "lambdabot"; - version = "4.2.3.2"; - sha256 = "0jy48s4z1yn0wiaxzi3pws7j9j4ih2vqr8gr8md2i35g4bwxmxp2"; + version = "4.2.3.3"; + sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk"; isLibrary = true; isExecutable = true; buildDepends = [ From a6bf9b8bdf9afc611eb85af4df7c8005101630c7 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 10:07:22 +0200 Subject: [PATCH 0217/1120] Add haskell-glpk-hs. --- .../libraries/haskell/glpk-hs/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/glpk-hs/default.nix diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix new file mode 100644 index 000000000000..621a7e9c4c51 --- /dev/null +++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, glpk, mtl }: + +cabal.mkDerivation (self: { + pname = "glpk-hs"; + version = "0.3.2"; + sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8"; + buildDepends = [ deepseq mtl ]; + extraLibraries = [ glpk ]; + meta = { + description = "Comprehensive GLPK linear programming bindings"; + 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 ddfbdac9469c..141f02a27e58 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -730,6 +730,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL25; }; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; + GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {}; From 001fb53524b030427c0c0c5460910f667bd85e0a Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 10:13:57 +0200 Subject: [PATCH 0218/1120] Revert "haskell-srcloc: update to version 0.2.0" This reverts commit ffbdd377f15b2af032285345c1b4ed013e6ed953. Version 0.2.0 breaks accelerate-cuda, and doesn't seem to be required or used in many other places, so I'll just revert. --- pkgs/development/libraries/haskell/srcloc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index 007ce644be0c..d76309bc7956 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,10 +1,10 @@ -{ cabal, syb }: +{ cabal, syb, symbol }: cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.2.0"; - sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs"; - buildDepends = [ syb ]; + version = "0.1.2"; + sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; + buildDepends = [ syb symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; From fe4677de2f87af7b9617488b4846cc36639b4907 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 10:15:55 +0200 Subject: [PATCH 0219/1120] Revert "haskell-mainland-pretty: update to version 0.2.1" This reverts commit 8e85516e045149a6bbd9e09020df9ceb255a75a5. This depends on srcloc-2, and srcloc-2 breaks accelerate-cuda. --- .../libraries/haskell/mainland-pretty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 221a69fa7da7..d64a6c761800 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,10 +1,10 @@ -{ cabal, srcloc, text }: +{ cabal, srcloc, symbol }: cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.1"; - sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h"; - buildDepends = [ srcloc text ]; + version = "0.1.3.0"; + sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; + buildDepends = [ srcloc symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; From c432af3932624d0e9b616262d9aa75c577ce0ec0 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 10:17:57 +0200 Subject: [PATCH 0220/1120] Revert "haskell-language-c-quote: update to version 0.4.0" This reverts commit 3be2d8d9cd3fc765c98d4a517e082d40aee07134. Depends on recent version of mainland-pretty, which in turn depends on srcloc-2 which in turns breaks accelerate-cuda. --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 503fa8f561fc..a765b015a314 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.4.0"; - sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1"; + version = "0.3.2"; + sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 83505f15b21e953cd8f863d9209d83c2a15d9af0 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 11:02:00 +0200 Subject: [PATCH 0221/1120] ghc-head: bump snapshot version --- 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 3db488737c32..566e7d80f865 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.5.20120706"; + version = "7.5.20120714"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "196aghpgzf5k47l603fynxxjjkkk5f6y2cylxv3skavvd1g16bs2"; + sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah"; }; buildInputs = [ ghc perl gmp ncurses ]; From 3fbd694d7df69747afbffbfcd6ccbd21544eae3d Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 11:18:15 +0200 Subject: [PATCH 0222/1120] Try to cut recursion depth in uniqList and closePropagation. --- pkgs/lib/misc.nix | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index d3b236f73e58..17771e1ca7b5 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -158,14 +158,15 @@ rec { (tail x))))) condList)) ; - # !!! This function has O(n^2) performance, so you probably don't want to use it! - uniqList = {inputList, outputList ? []}: - if (inputList == []) then outputList else - let x=head inputList; - newOutputList = outputList ++ - (if elem x outputList then [] else [x]); - in uniqList {outputList=newOutputList; - inputList = (tail inputList);}; + # This function has O(n^2) performance. + uniqList = {inputList, acc ? []} : + let go = xs : acc : + if xs == [] + then [] + else let x = head xs; + y = if elem x acc then [] else [x]; + in go (y ++ tail xs) (y ++ acc); + in go inputList acc; uniqListExt = {inputList, outputList ? [], getter ? (x : x), compare ? (x: y: x==y)}: @@ -214,16 +215,22 @@ rec { modifySumArgs = f: x: innerModifySumArgs f x {}; - innerClosePropagation = ready: list: if list == [] then ready else - if ! isAttrs (head list) then - /* builtins.trace ("not an attrSet: ${lib.showVal (head list)}") */ - innerClosePropagation ready (tail list) - else - innerClosePropagation - (ready ++ [(head list)]) - ((tail list) - ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list)) - ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list))); + innerClosePropagation = acc : xs : + if xs == [] + then acc + else let y = head xs; + ys = tail xs; + in if ! isAttrs y + then innerClosePropagation acc ys + else let acc' = [y] ++ acc; + in innerClosePropagation + acc' + (uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y) + ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y) + ++ ys; + acc = acc'; + } + ); closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); From 3c167d03400a17a67641004d993972337ab6a011 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 11:35:08 +0200 Subject: [PATCH 0223/1120] Add meta.maintainer to Haskell packages. --- pkgs/development/libraries/haskell/IOSpec/default.nix | 1 + pkgs/development/libraries/haskell/brainfuck/default.nix | 2 +- pkgs/development/libraries/haskell/data-inttrie/default.nix | 1 + .../libraries/haskell/data-memocombinators/default.nix | 2 +- pkgs/development/libraries/haskell/lambdabot-utils/default.nix | 1 + pkgs/development/libraries/haskell/lambdabot/default.nix | 1 + pkgs/development/libraries/haskell/logict/default.nix | 1 + pkgs/development/libraries/haskell/numbers/default.nix | 1 + pkgs/development/libraries/haskell/oeis/default.nix | 1 + pkgs/development/libraries/haskell/show/default.nix | 1 + pkgs/development/libraries/haskell/unlambda/default.nix | 1 + 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix index 46211614c4cf..84b5f6fe6107 100644 --- a/pkgs/development/libraries/haskell/IOSpec/default.nix +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "A pure specification of the IO monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index 6501df584817..a406d1fa5000 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Brainfuck interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) - diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index 6b5f013a7094..926d465065d1 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "A lazy, infinite trie of integers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index d02cdab7110f..25f063c20acf 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Combinators for building memo tables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) - diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 9d2aa186264f..3339e7aa96d8 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index 2af512ef3eaa..926c5acafbab 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -22,5 +22,6 @@ cabal.mkDerivation (self: { description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index f67e82fbfa24..4e67e4ffb4c8 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "A backtracking logic-programming monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 6c9056e140f0..8b57b3d7e968 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Various number types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 48692cd7edf0..c8b9e984eb1c 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Interface to the Online Encyclopedia of Integer Sequences"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 4700a8c17c88..7fe0013d0d29 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "'Show' instances for Lambdabot"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 4bdc11835864..c0cfc72bd9e3 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Unlambda interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From f3aa34893691cc518d0d8a80a7fb5834d94eef5c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 11:43:33 +0200 Subject: [PATCH 0224/1120] haskell-benchpress: fix build with modern versions of GHC --- pkgs/development/libraries/haskell/benchpress/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 8be4478ce635..9d1720541bf8 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.2.2.4"; sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; buildDepends = [ mtl time ]; + patchPhase = '' + sed -i -e 's|base .*,|base,|' -e 's|mtl .*,|mtl,|' benchpress.cabal + ''; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; From 11e260ec74edd60e90354748cc2c1868b3ab4ff2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 11:43:43 +0200 Subject: [PATCH 0225/1120] haskell-language-c-quote: update to version 0.4.0 --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index a765b015a314..503fa8f561fc 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.3.2"; - sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; + version = "0.4.0"; + sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol From 0ed4ac39b6a6c3f031eb00762bf181abb4fbfb8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 11:43:43 +0200 Subject: [PATCH 0226/1120] haskell-mainland-pretty: update to version 0.2.1 --- .../libraries/haskell/mainland-pretty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index d64a6c761800..221a69fa7da7 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,10 +1,10 @@ -{ cabal, srcloc, symbol }: +{ cabal, srcloc, text }: cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.1.3.0"; - sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; - buildDepends = [ srcloc symbol ]; + version = "0.2.1"; + sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h"; + buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; From bf195b742e4a3acbd3119c9b80c2707a3054ad9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 11:43:44 +0200 Subject: [PATCH 0227/1120] haskell-srcloc: update to version 0.2.0 --- pkgs/development/libraries/haskell/srcloc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index d76309bc7956..b4e212f89b25 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,10 +1,11 @@ -{ cabal, syb, symbol }: +{ cabal, syb }: cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.1.2"; - sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; - buildDepends = [ syb symbol ]; + version = "0.2.0"; + sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs"; + buildDepends = [ syb ]; + noHaddock = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; From 597da0864656fcc116341ed7179b255a01550bd3 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 18 Jul 2012 12:42:33 +0200 Subject: [PATCH 0228/1120] Pass docutils from pythonPackages to mercurial --- 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 16dea4ceb663..1bafd16fbc04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7100,7 +7100,7 @@ let mcomix = callPackage ../applications/graphics/mcomix { }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) curses; + inherit (pythonPackages) curses docutils; guiSupport = false; # use mercurialFull to get hgk GUI }; From b6325a72135b875de86e25b7f1e6069349d6e3aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 12:44:34 +0200 Subject: [PATCH 0229/1120] tbb: add version 4.0-u5 --- pkgs/development/libraries/tbb/default.nix | 41 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/tbb/default.nix diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix new file mode 100644 index 000000000000..13ec42f1ba2a --- /dev/null +++ b/pkgs/development/libraries/tbb/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "tbb-4.0-u5"; + + src = fetchurl { + url = "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb40_20120613oss_src.tgz"; + sha256 = "aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192"; + }; + + checkTarget = "test"; + doCheck = false; + + installPhase = '' + mkdir -p $out/{lib,share/doc} + cp "build/"*release*"/"*so* $out/lib/ + mv include $out/ + rm $out/include/index.html + mv doc/html $out/share/doc/tbb + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://threadingbuildingblocks.org/"; + description = "Intel Thread Building Blocks C++ Library"; + license = "LGPLv3+"; + + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bafd16fbc04..a17b51d39c56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2522,6 +2522,8 @@ let swiProlog = callPackage ../development/compilers/swi-prolog { }; + tbb = callPackage ../development/libraries/tbb { }; + tinycc = callPackage ../development/compilers/tinycc { }; urweb = callPackage ../development/compilers/urweb { }; From c6a2a1f8851bc3896a824219dfc5545a642fba45 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jul 2012 13:34:22 +0200 Subject: [PATCH 0230/1120] ffmpeg: Update to latest version 0.11.1. This is needed in order to enable x11grab, as it isn't included in 0.10. --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 3b5e28a2ee7f..9b90d56d4d90 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10"; + name = "ffmpeg-0.11.1"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; + sha256 = "b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that From 05831d3a668361b2948c0185eceb6d7c579c851a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jul 2012 13:35:16 +0200 Subject: [PATCH 0231/1120] ffmpeg: Add option to enable x11grab support. This is especially useful if you want to do screencasts and other sorts of things like that. --- pkgs/development/libraries/ffmpeg/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 9b90d56d4d90..41768c4e313f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -9,6 +9,7 @@ , vdpauSupport ? true, libvdpau ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null +, x11grabSupport ? false, libXext ? null, libXfixes ? null }: assert speexSupport -> speex != null; @@ -19,6 +20,7 @@ assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; +assert x11grabSupport -> libXext != null && libXfixes != null; stdenv.mkDerivation rec { name = "ffmpeg-0.11.1"; @@ -48,7 +50,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame @@ -60,7 +63,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394; + ++ stdenv.lib.optional dc1394Support libdc1394 + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; enableParallelBuilding = true; From 5b0edeb003404f3cd208c1c65ba9b74ad182551b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 14:37:01 +0200 Subject: [PATCH 0232/1120] haskell-HUnit: add version 1.2.5.0 --- .../libraries/haskell/HUnit/1.2.5.0.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix new file mode 100644 index 000000000000..cf5a68b803c3 --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "HUnit"; + version = "1.2.5.0"; + sha256 = "0yxa3clrrjwg9faa3vsqb44xdzhdgwji56lrh7sa7dgq8bv1h6nr"; + buildDepends = [ deepseq ]; + meta = { + homepage = "http://hunit.sourceforge.net/"; + description = "A unit testing framework for Haskell"; + 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 c5fed94209a5..34144c3237da 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); haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok html = self.html_1_0_1_2; # 7.5 ok HTTP = self.HTTP_4000_2_3; # 7.5 ok - HUnit = self.HUnit_1_2_4_3; # 7.5 ok + HUnit = self.HUnit_1_2_5_0; # 7.5 ok mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_0_14; # 7.5 ok OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail @@ -916,7 +916,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit = self.HUnit_1_2_4_3; + HUnit_1_2_5_0 = callPackage ../development/libraries/haskell/HUnit/1.2.5.0.nix {}; + HUnit = self.HUnit_1_2_5_0; hxt = callPackage ../development/libraries/haskell/hxt {}; From 05952b2e37911b272f16ce5e9d1fcf278f312919 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 14:37:07 +0200 Subject: [PATCH 0233/1120] haskell-Hipmunk: update to version 5.2.0.10 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index 770bfa275150..fee714491429 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.9"; - sha256 = "0c0s5spsyp67ajfzck8f29px2xid8aiws12l3dswvp50d74a9mlq"; + version = "5.2.0.10"; + sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95"; buildDepends = [ StateVar transformers ]; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; From 24f7a2b72bb6484690180def975e051e701a25b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 14:37:08 +0200 Subject: [PATCH 0234/1120] haskell-hslogger-template: update to version 2.0.1 --- .../libraries/haskell/hslogger-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index 5351bbb17774..a7b1a51b7057 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hslogger-template"; - version = "2.0.0"; - sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr"; + version = "2.0.1"; + sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj"; buildDepends = [ hslogger mtl ]; meta = { description = "Automatic generation of hslogger functions"; From b9b5a8d7c1a6d841e5012f106e1b5f798bba9ce7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 09:21:33 -0400 Subject: [PATCH 0235/1120] Fix btrfs-progs build http://hydra.nixos.org/build/2842473 --- pkgs/tools/filesystems/btrfsprogs/default.nix | 49 ++++++------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 75f155fd0ddf..861bacd46c2a 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,45 +1,24 @@ -a : -let - fetchurl = a.fetchurl; - fetchgit = a.fetchgit; +{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }: - version = a.lib.attrByPath ["version"] "0.19-20120328" a; - buildInputs = with a; [ - zlib libuuid acl attr e2fsprogs - ]; -in +let version = "0.19-20120328"; in -assert a.libuuid != null; +stdenv.mkDerivation { + name = "btrfs-progs-${version}"; -rec { - srcDrv = fetchgit { - url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ; - rev="1957076ab4fefa47b6efed3da541bc974c83eed7"; - sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; + rev = "1957076ab4fefa47b6efed3da541bc974c83eed7"; + sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; }; - src = srcDrv + "/"; + buildInputs = [ zlib libuuid acl attr e2fsprogs ]; - inherit buildInputs; - configureFlags = []; - makeFlags = ["prefix=$out CFLAGS=-Os"]; + makeFlags = "prefix=$(out)"; - patches = []; - phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"]; - - fixMakefile = a.fullDepEntry '' - sed -e 's@^progs = @progs=@g' -i Makefile - '' ["minInit" "doUnpack"]; - - doEnsureBtrfsImage = a.fullDepEntry ('' - if ! grep 'progs = ' Makefile | grep btrfs-image; then - sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile - fi - '') ["minInit" "doUnpack"]; - - name = "btrfs-progs-" + version; meta = { - description = "BTRFS utilities"; - maintainers = [a.lib.maintainers.raskin]; + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a17b51d39c56..f90e19ac50ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -441,9 +441,7 @@ let bsod = callPackage ../misc/emulators/bsod { }; - btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) { - inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs; - }; + btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; catdoc = callPackage ../tools/text/catdoc { }; From 26fa2425c622ea33606ce52c9d466adca23b3363 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 09:25:58 -0400 Subject: [PATCH 0236/1120] Fix dmraid build http://hydra.nixos.org/build/2842473 --- pkgs/os-specific/linux/dmraid/default.nix | 37 ++++++++----------- .../linux/dmraid/src-for-default.nix | 9 ----- .../linux/dmraid/src-info-for-default.nix | 6 --- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/linux/dmraid/src-for-default.nix delete mode 100644 pkgs/os-specific/linux/dmraid/src-info-for-default.nix diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index aa78a5171964..35efa8533ab1 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,33 +1,26 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - devicemapper - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, devicemapper }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "dmraid-1.0.0.rc15"; + + src = fetchurl { + url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; + }; + + preConfigure = "cd */"; + + buildInputs = [ devicemapper ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - goSrcDir = "cd */"; - meta = { - description = "Old-style RAID configuration utility."; + description = "Old-style RAID configuration utility"; longDescritipn = '' Old RAID configuration utility (still under development, though). It is fully compatible with modern kernels and mdadm recognizes its volumes. May be needed for rescuing an older system or nuking the metadata when reformatting. ''; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dmraid/src-for-default.nix b/pkgs/os-specific/linux/dmraid/src-for-default.nix deleted file mode 100644 index b8f29ce4b5c5..000000000000 --- a/pkgs/os-specific/linux/dmraid/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.0.0.rc15"; - name="dmraid-1.0.0.rc15"; - hash="01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; - url="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; - advertisedUrl="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc15.tar.bz2"; - - -} diff --git a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix b/pkgs/os-specific/linux/dmraid/src-info-for-default.nix deleted file mode 100644 index 12c4ab1e9a7d..000000000000 --- a/pkgs/os-specific/linux/dmraid/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/?C=M;O=D"; - baseName = "dmraid"; - sourceRegexp = "^.*[.]tar[.]bz2\$"; - versionExtractorSedScript = ''s/.*-(.*)[.]tar[.]bz2/\1/''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f90e19ac50ac..1be0f1c38f50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5445,9 +5445,7 @@ let inherit (xlibs) xproto; }; - dmraid = builderDefsPackage ../os-specific/linux/dmraid { - inherit devicemapper; - }; + dmraid = callPackage ../os-specific/linux/dmraid { }; drbd = callPackage ../os-specific/linux/drbd { }; From cca94ee05e5c3bc765bf838782a52ad0af4c030e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 15:37:06 +0200 Subject: [PATCH 0237/1120] lhs2tex: remove myself as maintainer --- pkgs/tools/typesetting/lhs2tex/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index a78feaadb18f..5ac339e92ece 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,10 +18,6 @@ cabal.mkDerivation (self: { description = "Preprocessor for typesetting Haskell sources with LaTeX"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) - From 5750566c2af11d31a705fb687cf6a0ce300b5252 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 09:49:27 -0400 Subject: [PATCH 0238/1120] Fix Pyrex build --- pkgs/development/interpreters/pyrex/0.9.5.nix | 29 +++++++------------ pkgs/development/interpreters/pyrex/0.9.6.nix | 29 +++++++------------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 5ba57dbc1eab..3f6a3c1bfcb2 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl, builderDefs, python }: +{ stdenv, fetchurl, pythonPackages }: -let +let version = "0.9.5.1.1"; in - localDefs = builderDefs.passthru.function { +pythonPackages.buildPythonPackage rec { + name = "pyrex-${version}"; - src = fetchurl { - url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz; - sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; - }; + src = fetchurl { + url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; + }; - buildInputs = [python]; + doCheck = false; - }; - -in with localDefs; - -stdenv.mkDerivation rec { - name = "pyrex-0.9.5.1.1"; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage doForceShare]); meta = { - description = "Python package compiler or something like that"; - inherit src; + homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + description = "A language for writing Python extension modules"; }; } diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index cd2334156157..44e014322ff4 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchurl, builderDefs, python }: +{ stdenv, fetchurl, pythonPackages }: -let +let version = "0.9.6.4"; in - localDefs = builderDefs.passthru.function { - - src = fetchurl { - url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz; - sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; - }; - - buildInputs = [python]; +pythonPackages.buildPythonPackage rec { + name = "pyrex-${version}"; + src = fetchurl { + url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; }; -in with localDefs; - -stdenv.mkDerivation rec { - name = "pyrex-0.9.6.4"; - builder = writeScript (name + "-builder") - (textClosure localDefs [installPythonPackage doForceShare]); + doCheck = false; + meta = { - description = "Python package compiler or something like that"; - inherit src; + homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + description = "A language for writing Python extension modules"; }; } From bdc0530f93b757a1e22eb73a567665d1b08cd583 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2012 16:04:55 +0200 Subject: [PATCH 0239/1120] Revert updates to srcloc, mainland-pretty, and language-c-quote to un-break accelerate-cuda. --- .../libraries/haskell/language-c-quote/default.nix | 4 ++-- .../libraries/haskell/mainland-pretty/default.nix | 8 ++++---- pkgs/development/libraries/haskell/srcloc/default.nix | 9 ++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 503fa8f561fc..a765b015a314 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.4.0"; - sha256 = "1qbl81c8fw2gz96n8505yxhw1d3zhxq436ikv173x1zz0b4z26g1"; + version = "0.3.2"; + sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 221a69fa7da7..d64a6c761800 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,10 +1,10 @@ -{ cabal, srcloc, text }: +{ cabal, srcloc, symbol }: cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.1"; - sha256 = "1pl96m92bsrghkp5ixaqlhi2hybc4hafy64zlmsgjlmdvslxhs3h"; - buildDepends = [ srcloc text ]; + version = "0.1.3.0"; + sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq"; + buildDepends = [ srcloc symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index b4e212f89b25..d76309bc7956 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,11 +1,10 @@ -{ cabal, syb }: +{ cabal, syb, symbol }: cabal.mkDerivation (self: { pname = "srcloc"; - version = "0.2.0"; - sha256 = "1p63gachz8ccv61ih3jb995kcg72g7vkihryb2ak7d8bxxxx3irs"; - buildDepends = [ syb ]; - noHaddock = true; + version = "0.1.2"; + sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9"; + buildDepends = [ syb symbol ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; From 8984139215d5f9c768ba0b092ed8149ac096dc1e Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 18 Jul 2012 16:30:57 +0200 Subject: [PATCH 0240/1120] Fix bug in uniqList. --- pkgs/lib/misc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 17771e1ca7b5..dbf3381f0f4e 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -165,7 +165,7 @@ rec { then [] else let x = head xs; y = if elem x acc then [] else [x]; - in go (y ++ tail xs) (y ++ acc); + in y ++ go (tail xs) (y ++ acc); in go inputList acc; uniqListExt = {inputList, outputList ? [], From eeb09aa1bc2956716883ba5610b722e1cead0ce2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 17:03:55 +0200 Subject: [PATCH 0241/1120] nix: Update to 1.1pre2749_ccc52ad --- pkgs/tools/package-management/nix/unstable.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 3025f0450b86..1ed19bb9b259 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.1pre2742_a7a43ad"; + name = "nix-1.1pre2749_ccc52ad"; src = fetchurl { - url = "http://hydra.nixos.org/build/2799663/download/4/${name}.tar.bz2"; - sha256 = "bad6b3b6177d47cef0be3c81a5e1e876f656e99afeea673613e00656ebf07d3e"; + url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2"; + sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; + doInstallCheck = false; }; From c101d6fd63e7ee678a3a1c7fcc3a6b54eb6cd522 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 11:16:02 -0400 Subject: [PATCH 0242/1120] Fix Nixpkgs evaluation http://hydra.nixos.org/build/2842914 --- pkgs/development/libraries/silgraphite/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/silgraphite/default.nix b/pkgs/development/libraries/silgraphite/default.nix index 2bb38b3781f9..db018cca4656 100644 --- a/pkgs/development/libraries/silgraphite/default.nix +++ b/pkgs/development/libraries/silgraphite/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }: + stdenv.mkDerivation rec { version = "2.3.1"; name = "silgraphite-2.3.1"; @@ -13,8 +14,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; meta = { - description = ''An advanced font engine''; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = with stdenv.lib.maintainers; linux; + description = "An advanced font engine"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } From d9f08cf6f26337efd5a3a4142c38a0963aba31c4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 18 Jul 2012 17:27:24 +0200 Subject: [PATCH 0243/1120] ffmpeg: Add alsaLib to dependencies. As @cillianderoiste pointed out, it makes sense to have this in, not only to record audio while grabbing the display. This is not optional in this case, as it isn't a compile time option either. And on the other hand, having ffmpeg running with OSS doesn't appear reasonable to me, as ffmpeg will fall back to OSS if alsa isn't available anyway. --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 41768c4e313f..ee88fd0145cc 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 ] + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora From 6efd9b24d37d81c947490fe0dba1fc26edebb4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 16 Jul 2012 21:15:54 +0200 Subject: [PATCH 0244/1120] Add xf86-video-nested This does not yet compile. I had a working version from an obsolete github repo, but then found the upstream repo. Perhaps it needs a newer Xorg. --- .../linux/xf86-video-nested/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/xf86-video-nested/default.nix diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix new file mode 100644 index 000000000000..b663a3b3232c --- /dev/null +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext +, libtool, pkgconfig, renderproto, utilmacros, xorgserver +}: + +stdenv.mkDerivation { + name = "xf86-video-nested-2012-06-15"; + + src = fetchgit { + url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4"; + sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c"; + }; + + buildInputs = + [ autoconf automake fontsproto libX11 libXext libtool pkgconfig + renderproto utilmacros xorgserver + ]; + + configureScript = "./autogen.sh"; + + meta = { + homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + description = "driver to run Xorg on top of Xorg or something else"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1be0f1c38f50..1ad69e0290dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6150,6 +6150,10 @@ let xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; + xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { + inherit (xorg) fontsproto renderproto utilmacros xorgserver xproto; + }; + xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto videoproto utilmacros; From 8ebb3093202c7f7482356d6fb072ea17b5313326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 17 Jul 2012 02:11:59 +0200 Subject: [PATCH 0245/1120] Pin xf86-video-nested to a revision that works with Xorg 7.6 --- pkgs/os-specific/linux/xf86-video-nested/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index b663a3b3232c..27522269ea3a 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,14 +3,18 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2012-06-15"; + name = "xf86-video-nested-2011-09-12"; + # Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6 src = fetchgit { url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; - rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4"; - sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c"; + rev = "fceee1716625badf698ca27dd5788a4deb8533bc"; + sha256 = ""; }; + # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77 + patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac"; + buildInputs = [ autoconf automake fontsproto libX11 libXext libtool pkgconfig renderproto utilmacros xorgserver diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad69e0290dd..2470be7eff74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6151,7 +6151,7 @@ let xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { }; xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { - inherit (xorg) fontsproto renderproto utilmacros xorgserver xproto; + inherit (xorg) fontsproto renderproto utilmacros xorgserver; }; xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau { From 933205acaf820393fc0ae8b20f4d24363f89a9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 18 Jul 2012 23:04:00 +0200 Subject: [PATCH 0246/1120] Add the sha256 for xf86-video-nested --- pkgs/os-specific/linux/xf86-video-nested/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 27522269ea3a..95a9a4589f93 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; rev = "fceee1716625badf698ca27dd5788a4deb8533bc"; - sha256 = ""; + sha256 = "6b3544ddcf40602364fd0e528f6e677c37ef8d08f6c4e756caea7e29abf200f7"; }; # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77 From 70298ba42c5071cd6118645069eb0efbe1f79404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 18 Jul 2012 23:35:20 +0200 Subject: [PATCH 0247/1120] Fix style: The meta.description field should be capitalised (niksnut) --- pkgs/os-specific/linux/xf86-video-nested/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 95a9a4589f93..6ed04f490c03 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; - description = "driver to run Xorg on top of Xorg or something else"; + description = "Driver to run Xorg on top of Xorg or something else"; maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; } From d077a98e77479659c27af926c3c6dc18dbcf0fe8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jul 2012 21:50:41 -0400 Subject: [PATCH 0248/1120] nix: Update to 1.1 --- pkgs/tools/package-management/nix/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 79f73ebb8c3e..e433aa605799 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0"; + name = "nix-1.1"; src = fetchurl { - url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2"; - sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17"; + url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2"; + sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; + doInstallCheck = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2470be7eff74..be57d1b6ce11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8529,10 +8529,14 @@ let stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; + nixUnstable = nix; + + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; + */ nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { From fe42f8add91b1616de94f878351f3dd5b44dbcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 19 Jul 2012 04:37:33 +0200 Subject: [PATCH 0249/1120] ffmpeg: Add optional Jack audio support. The author of this commit is @cillianderoiste because he made the patch and I'm just committing it. This change adds support for Jack audio "while we're at it", see discussion at pull request #54. --- pkgs/development/libraries/ffmpeg/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index ee88fd0145cc..53868950598a 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +, jackSupport ? false, jackaudio ? null , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -12,6 +13,7 @@ , x11grabSupport ? false, libXext ? null, libXfixes ? null }: +assert jackSupport -> jackaudio != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert vorbisSupport -> libvorbis != null; @@ -54,6 +56,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + ++ stdenv.lib.optional jackSupport jackaudio ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora From 7bb60c640da5fe0fad420ef83eb41521e10925aa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 19 Jul 2012 09:07:57 +0400 Subject: [PATCH 0250/1120] LMMath: add Latin Modern Math font --- pkgs/data/fonts/lmodern/lmmath.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/data/fonts/lmodern/lmmath.nix diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix new file mode 100644 index 000000000000..651a84726af6 --- /dev/null +++ b/pkgs/data/fonts/lmodern/lmmath.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "lmmath-0.903"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf"; + sha256 = "ee96cb14f5c746d6c6b9ecfbdf97dafc2f535be3dd277e15e8ea6fb594995d64"; + name = "lmmath-0.903.zip"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/texmf/fonts/opentype + mkdir -p $out/share/fonts/opentype + + cp *.{OTF,otf} $out/texmf/fonts/opentype/lmmath-regular.otf + cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf + + ln -s $out/texmf* $out/share/ + ''; + + meta = { + description = "Latin Modern font"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be57d1b6ce11..f0609d6a66cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6243,6 +6243,8 @@ let inherit fontforge; }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; + lmodern = callPackage ../data/fonts/lmodern { }; manpages = callPackage ../data/documentation/man-pages { }; From 196f5cb265db8ab2fc0539d9fa4530ec71265d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 19 Jul 2012 11:42:40 +0200 Subject: [PATCH 0251/1120] Fix broadcom_sta for linux-3.4 and clean nix source. Idea from Kevin Quick, implementation from Gentoo. Also cleaned and added a minor license patch from Gentoo. Builds for many x86_64 kernels. --- pkgs/os-specific/linux/broadcom-sta/default.nix | 12 +++++------- pkgs/os-specific/linux/broadcom-sta/license.patch | 12 ++++++++++++ pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch | 12 ++++++++++++ pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch | 12 ------------ 4 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 pkgs/os-specific/linux/broadcom-sta/license.patch create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch delete mode 100644 pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index ff21b5d5254b..041141cdad25 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { name = "broadcom-sta-${version}-${kernel.version}"; - + src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; sha256 = if bits == "32" @@ -16,12 +16,10 @@ stdenv.mkDerivation { }; buildInputs = [ kernel ]; - patches = [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch ]; - #++ stdenv.lib.optional - #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) - #[ ./mutex-sema.patch ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + patches = + [ ./makefile.patch ./linux-2.6.39.patch ./linux-3.2.patch + ./linux-3.4.patch ./license.patch + ]; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/broadcom-sta/license.patch b/pkgs/os-specific/linux/broadcom-sta/license.patch new file mode 100644 index 000000000000..b320d977e8b0 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/license.patch @@ -0,0 +1,12 @@ +diff -Naur hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c +--- hybrid-portsrc-x86_32-v5_10_91_9.orig/src/wl/sys/wl_linux.c 2009-04-23 02:48:59.000000000 +0900 ++++ hybrid-portsrc-x86_32-v5_10_91_9/src/wl/sys/wl_linux.c 2009-05-08 00:48:20.000000000 +0900 +@@ -163,6 +163,8 @@ + static void wl_free_if(wl_info_t *wl, wl_if_t *wlif); + static void wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info); + ++MODULE_LICENSE("MIXED/Proprietary"); ++ + static struct pci_device_id wl_id_table[] = { + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch b/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch new file mode 100644 index 000000000000..854131c641b2 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-3.4.patch @@ -0,0 +1,12 @@ +--- broadcom-sta.orig/src/wl/sys/wl_linux.c ++++ broadcom-sta.new/src/wl/sys/wl_linux.c +@@ -40,7 +40,9 @@ + #include + #define WLC_MAXBSSCFG 1 + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) + #include ++#endif + #include + #include + #include diff --git a/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch b/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch deleted file mode 100644 index 922c8f2d22dd..000000000000 --- a/pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c ---- old/src/wl/sys/wl_linux.c 2010-12-25 18:17:33.333343048 +0100 -+++ new/src/wl/sys/wl_linux.c 2010-12-25 18:21:05.856676376 +0100 -@@ -483,7 +483,7 @@ - #ifdef WL_ALL_PASSIVE - spin_lock_init(&wl->txq_lock); - #endif -- init_MUTEX(&wl->sem); -+ sema_init(&wl->sem, 1); - } - - if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, From 03d98589e29d0eed775d178aca64876f162f2d83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Jul 2012 12:18:40 +0200 Subject: [PATCH 0252/1120] haskell-cabal2nix: update to version 1.38 --- 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 091417cb8a39..b5983dec6fb5 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.37"; - sha256 = "0gd20nzr3bqscd4pn0j3vsmnhxiypbv5ppncmi0ck5n4ii8c6m94"; + version = "1.38"; + sha256 = "1kybxrkddbzr1cqpqplbflhakf9njb9hvamhdwvlanlk8985h8jg"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 62f698dfd36ee3137add0fc69c8d0b2ff2adf898 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 19 Jul 2012 14:07:11 +0200 Subject: [PATCH 0253/1120] give pkgs a reference to itself. As discussed on nix-dev, this allows me to create a separate package repository which can be used like all-packages.nix (callPackage), without the need to run from a forked tree. --- 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 f0609d6a66cf..14c4273e2669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -131,7 +131,7 @@ let # `__overrides' is a magic attribute that causes the attributes in # its value to be added to the surrounding `rec'. We'll remove this # eventually. - inherit __overrides; + inherit __overrides pkgs; # We use `callPackage' to be able to omit function arguments that From b5ff5d0371a95f302f383f6f08d3ff59669b3718 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 19 Jul 2012 15:36:22 +0200 Subject: [PATCH 0254/1120] pythonPackages.larch: Update to 1.20120527 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c12903b2cb..4a8760a8e763 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2800,11 +2800,11 @@ let pythonPackages = python.modules // rec { }; larch = buildPythonPackage rec { - name = "larch-0.31"; + name = "larch-1.20120527"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_0.31.orig.tar.gz"; - sha256 = "18c243a45b35974c304c9b3d8b05718f1272f14c29cd3c9010800cf821064444"; + url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20120527.orig.tar.gz"; + sha256 = "2865a1bfa6bd276bf746e8e7cb73d5199d0b6d00045d8c92e158626687d3bbe1"; }; buildInputs = [ sphinx ]; From 28a76a96bee8438de15f4c8abfb115d51e7ba0ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jul 2012 10:25:56 -0400 Subject: [PATCH 0255/1120] libcap: Update to 2.22 Systemd requires the recent CAP_SYSLOG capability. --- pkgs/os-specific/linux/libcap/default.nix | 17 +++++++++++------ pkgs/os-specific/linux/libcap/pam.nix | 2 +- pkgs/os-specific/linux/libcap/progs.nix | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index c279393d7a40..667fe63bba78 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, attr, perl}: +{ stdenv, fetchurl, attr, perl }: assert stdenv.isLinux; stdenv.mkDerivation rec { name = "libcap-${version}"; - version = "2.19"; + version = "2.22"; src = fetchurl { - url = "mirror://kernel/linux/libs/security/linux-privs/kernel-2.6/${name}.tar.gz"; - sha256 = "0fdsz9j741npvh222f8p1y6l516z9liibiwdpdr3a4zg53m0pw45"; + url = "mirror://gentoo/distfiles/${name}.tar.bz2"; + sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk"; }; - buildNativeInputs = [perl]; - propagatedBuildInputs = [attr]; + buildNativeInputs = [ perl ]; + propagatedBuildInputs = [ attr ]; preConfigure = "cd libcap"; @@ -26,4 +26,9 @@ stdenv.mkDerivation rec { }; postInstall = passthru.postinst name; + + meta = { + description = "Library for working with POSIX capabilities"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix index 4cefa825c8a7..b78f32dccbb4 100644 --- a/pkgs/os-specific/linux/libcap/pam.nix +++ b/pkgs/os-specific/linux/libcap/pam.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "cap_pam.so-${libcap.version}"; + name = "libcap-pam-${libcap.version}"; inherit (libcap) src; diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix index 1b38848e77ef..1902b4acb1a4 100644 --- a/pkgs/os-specific/linux/libcap/progs.nix +++ b/pkgs/os-specific/linux/libcap/progs.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd progs"; + installFlags = "RAISE_SETFCAP=no"; + postInstall = libcap.postinst name; } From bfc2de46d1cf4f765e5772f3a33884b3d335ee99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 19 Jul 2012 12:46:39 -0400 Subject: [PATCH 0256/1120] sysklogd: Support systemd socket-based activation Syslogd cannot open /dev/log directly but must receive syslog messages from systemd (http://www.freedesktop.org/wiki/Software/systemd/syslog). The patch adds support for that. --- pkgs/os-specific/linux/sysklogd/builder.sh | 13 - pkgs/os-specific/linux/sysklogd/default.nix | 17 +- pkgs/os-specific/linux/sysklogd/systemd.patch | 850 ++++++++++++++++++ 3 files changed, 866 insertions(+), 14 deletions(-) delete mode 100644 pkgs/os-specific/linux/sysklogd/builder.sh create mode 100644 pkgs/os-specific/linux/sysklogd/systemd.patch diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh deleted file mode 100644 index d466f075652c..000000000000 --- a/pkgs/os-specific/linux/sysklogd/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -prefix=$out -export prefix - -installFlags="BINDIR=$out/sbin MANDIR=$out/share/man INSTALL=install" -patchPhase="sed -e 's@-o \${MAN_USER} -g \${MAN_GROUP} -m \${MAN_PERMS} @@' -i Makefile" - -mkdir -p "$out/share/man/man8/" -mkdir -p "$out/share/man/man5/" -mkdir -p "$out/sbin" - -genericBuild diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 2fe27add5bfb..979bfa1d0bf3 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -2,9 +2,24 @@ stdenv.mkDerivation { name = "sysklogd-1.5"; - builder = ./builder.sh; + src = fetchurl { url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.tar.gz; sha256 = "0wxpkrznqwz4dy11k90s2sqszwp7d4mlc0ag8288wa193plvhsb1"; }; + + patches = [ ./systemd.patch ]; + + installFlags = "BINDIR=$(out)/sbin MANDIR=$(out)/share/man INSTALL=install"; + + preConfigure = + '' + sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile + ''; + + preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; + + meta = { + description = "A system logging daemon"; + }; } diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/os-specific/linux/sysklogd/systemd.patch new file mode 100644 index 000000000000..ecdf2b57ebf2 --- /dev/null +++ b/pkgs/os-specific/linux/sysklogd/systemd.patch @@ -0,0 +1,850 @@ +Based on http://ftp.free.org/mirrors/rsync.frugalware.org/frugalware-testing/source/apps-extra/sysklogd/sysklogd-1.5-systemd.diff + +diff --git a/Makefile b/Makefile +index 9a114b8..aef1fd6 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ + CC= gcc + #SKFLAGS= -g -DSYSV -Wall + #LDFLAGS= -g +-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce ++SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I. + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + # -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # $(shell getconf LFS_SKFLAGS) +@@ -79,8 +79,8 @@ test: syslog_tst ksym oops.ko tsyslogd + + install: install_man install_exec + +-syslogd: syslogd.o pidfile.o +- ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o ${LIBS} ++syslogd: syslogd.o pidfile.o sd-daemon.o ++ ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o sd-daemon.o ${LIBS} + + klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o + ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \ +@@ -101,6 +101,9 @@ syslogd.o: syslogd.c version.h + syslog.o: syslog.c + ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c syslog.c + ++sd-daemon.o: sd-daemon.c sd-daemon.h ++ ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c sd-daemon.c ++ + klogd.o: klogd.c klogd.h version.h + ${CC} ${SKFLAGS} ${KLOGD_FLAGS} $(DEB) -c klogd.c + +diff --git a/sd-daemon.c b/sd-daemon.c +new file mode 100644 +index 0000000..6d1eebf +--- /dev/null ++++ b/sd-daemon.c +@@ -0,0 +1,436 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "sd-daemon.h" ++ ++int sd_listen_fds(int unset_environment) { ++ ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ int r, fd; ++ const char *e; ++ char *p = NULL; ++ unsigned long l; ++ ++ if (!(e = getenv("LISTEN_PID"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p || l <= 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ /* Is this for us? */ ++ if (getpid() != (pid_t) l) { ++ r = 0; ++ goto finish; ++ } ++ ++ if (!(e = getenv("LISTEN_FDS"))) { ++ r = 0; ++ goto finish; ++ } ++ ++ errno = 0; ++ l = strtoul(e, &p, 10); ++ ++ if (errno != 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (!p || *p) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) { ++ int flags; ++ ++ if ((flags = fcntl(fd, F_GETFD)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ if (flags & FD_CLOEXEC) ++ continue; ++ ++ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ } ++ ++ r = (int) l; ++ ++finish: ++ if (unset_environment) { ++ unsetenv("LISTEN_PID"); ++ unsetenv("LISTEN_FDS"); ++ } ++ ++ return r; ++#endif ++} ++ ++int sd_is_fifo(int fd, const char *path) { ++ struct stat st_fd; ++ ++ if (fd < 0) ++ return -EINVAL; ++ ++ memset(&st_fd, 0, sizeof(st_fd)); ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISFIFO(st_fd.st_mode)) ++ return 0; ++ ++ if (path) { ++ struct stat st_path; ++ ++ memset(&st_path, 0, sizeof(st_path)); ++ if (stat(path, &st_path) < 0) { ++ ++ if (errno == ENOENT || errno == ENOTDIR) ++ return 0; ++ ++ return -errno; ++ } ++ ++ return ++ st_path.st_dev == st_fd.st_dev && ++ st_path.st_ino == st_fd.st_ino; ++ } ++ ++ return 1; ++} ++ ++static int sd_is_socket_internal(int fd, int type, int listening) { ++ struct stat st_fd; ++ ++ if (fd < 0 || type < 0) ++ return -EINVAL; ++ ++ if (fstat(fd, &st_fd) < 0) ++ return -errno; ++ ++ if (!S_ISSOCK(st_fd.st_mode)) ++ return 0; ++ ++ if (type != 0) { ++ int other_type = 0; ++ socklen_t l = sizeof(other_type); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(other_type)) ++ return -EINVAL; ++ ++ if (other_type != type) ++ return 0; ++ } ++ ++ if (listening >= 0) { ++ int accepting = 0; ++ socklen_t l = sizeof(accepting); ++ ++ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0) ++ return -errno; ++ ++ if (l != sizeof(accepting)) ++ return -EINVAL; ++ ++ if (!accepting != !listening) ++ return 0; ++ } ++ ++ return 1; ++} ++ ++union sockaddr_union { ++ struct sockaddr sa; ++ struct sockaddr_in in4; ++ struct sockaddr_in6 in6; ++ struct sockaddr_un un; ++ struct sockaddr_storage storage; ++}; ++ ++int sd_is_socket(int fd, int family, int type, int listening) { ++ int r; ++ ++ if (family < 0) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ if (family > 0) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ return sockaddr.sa.sa_family == family; ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if (family != 0 && family != AF_INET && family != AF_INET6) ++ return -EINVAL; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_INET && ++ sockaddr.sa.sa_family != AF_INET6) ++ return 0; ++ ++ if (family > 0) ++ if (sockaddr.sa.sa_family != family) ++ return 0; ++ ++ if (port > 0) { ++ if (sockaddr.sa.sa_family == AF_INET) { ++ if (l < sizeof(struct sockaddr_in)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in4.sin_port; ++ } else { ++ if (l < sizeof(struct sockaddr_in6)) ++ return -EINVAL; ++ ++ return htons(port) == sockaddr.in6.sin6_port; ++ } ++ } ++ ++ return 1; ++} ++ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) { ++ union sockaddr_union sockaddr; ++ socklen_t l; ++ int r; ++ ++ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0) ++ return r; ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ l = sizeof(sockaddr); ++ ++ if (getsockname(fd, &sockaddr.sa, &l) < 0) ++ return -errno; ++ ++ if (l < sizeof(sa_family_t)) ++ return -EINVAL; ++ ++ if (sockaddr.sa.sa_family != AF_UNIX) ++ return 0; ++ ++ if (path) { ++ if (length <= 0) ++ length = strlen(path); ++ ++ if (length <= 0) ++ /* Unnamed socket */ ++ return l == offsetof(struct sockaddr_un, sun_path); ++ ++ if (path[0]) ++ /* Normal path socket */ ++ return ++ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) && ++ memcmp(path, sockaddr.un.sun_path, length+1) == 0; ++ else ++ /* Abstract namespace socket */ ++ return ++ (l == offsetof(struct sockaddr_un, sun_path) + length) && ++ memcmp(path, sockaddr.un.sun_path, length) == 0; ++ } ++ ++ return 1; ++} ++ ++int sd_notify(int unset_environment, const char *state) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC) ++ return 0; ++#else ++ int fd = -1, r; ++ struct msghdr msghdr; ++ struct iovec iovec; ++ union sockaddr_union sockaddr; ++ const char *e; ++ ++ if (!state) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if (!(e = getenv("NOTIFY_SOCKET"))) ++ return 0; ++ ++ /* Must be an abstract socket, or an absolute path */ ++ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) { ++ r = -EINVAL; ++ goto finish; ++ } ++ ++ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ memset(&sockaddr, 0, sizeof(sockaddr)); ++ sockaddr.sa.sa_family = AF_UNIX; ++ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); ++ ++ if (sockaddr.un.sun_path[0] == '@') ++ sockaddr.un.sun_path[0] = 0; ++ ++ memset(&iovec, 0, sizeof(iovec)); ++ iovec.iov_base = (char*) state; ++ iovec.iov_len = strlen(state); ++ ++ memset(&msghdr, 0, sizeof(msghdr)); ++ msghdr.msg_name = &sockaddr; ++ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e); ++ ++ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) ++ msghdr.msg_namelen = sizeof(struct sockaddr_un); ++ ++ msghdr.msg_iov = &iovec; ++ msghdr.msg_iovlen = 1; ++ ++ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { ++ r = -errno; ++ goto finish; ++ } ++ ++ r = 1; ++ ++finish: ++ if (unset_environment) ++ unsetenv("NOTIFY_SOCKET"); ++ ++ if (fd >= 0) ++ close(fd); ++ ++ return r; ++#endif ++} ++ ++int sd_notifyf(int unset_environment, const char *format, ...) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ va_list ap; ++ char *p = NULL; ++ int r; ++ ++ va_start(ap, format); ++ r = vasprintf(&p, format, ap); ++ va_end(ap); ++ ++ if (r < 0 || !p) ++ return -ENOMEM; ++ ++ r = sd_notify(unset_environment, p); ++ free(p); ++ ++ return r; ++#endif ++} ++ ++int sd_booted(void) { ++#if defined(DISABLE_SYSTEMD) || !defined(__linux__) ++ return 0; ++#else ++ ++ struct stat a, b; ++ ++ /* We simply test whether the systemd cgroup hierarchy is ++ * mounted */ ++ ++ if (lstat("/sys/fs/cgroup", &a) < 0) ++ return 0; ++ ++ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) ++ return 0; ++ ++ return a.st_dev != b.st_dev; ++#endif ++} +diff --git a/sd-daemon.h b/sd-daemon.h +new file mode 100644 +index 0000000..d0a0a94 +--- /dev/null ++++ b/sd-daemon.h +@@ -0,0 +1,265 @@ ++/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ ++ ++#ifndef foosddaemonhfoo ++#define foosddaemonhfoo ++ ++/*** ++ Copyright 2010 Lennart Poettering ++ ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation files ++ (the "Software"), to deal in the Software without restriction, ++ including without limitation the rights to use, copy, modify, merge, ++ publish, distribute, sublicense, and/or sell copies of the Software, ++ and to permit persons to whom the Software is furnished to do so, ++ subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE. ++***/ ++ ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ Reference implementation of a few systemd related interfaces for ++ writing daemons. These interfaces are trivial to implement. To ++ simplify porting we provide this reference implementation. ++ Applications are welcome to reimplement the algorithms described ++ here if they do not want to include these two source files. ++ ++ The following functionality is provided: ++ ++ - Support for logging with log levels on stderr ++ - File descriptor passing for socket-based activation ++ - Daemon startup and status notification ++ - Detection of systemd boots ++ ++ You may compile this with -DDISABLE_SYSTEMD to disable systemd ++ support. This makes all those calls NOPs that are directly related to ++ systemd (i.e. only sd_is_xxx() will stay useful). ++ ++ Since this is drop-in code we don't want any of our symbols to be ++ exported in any case. Hence we declare hidden visibility for all of ++ them. ++ ++ You may find an up-to-date version of these source files online: ++ ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h ++ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c ++ ++ This should compile on non-Linux systems, too, but with the ++ exception of the sd_is_xxx() calls all functions will become NOPs. ++ ++ See sd-daemon(7) for more information. ++*/ ++ ++#ifndef _sd_printf_attr_ ++#if __GNUC__ >= 4 ++#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) ++#else ++#define _sd_printf_attr_(a,b) ++#endif ++#endif ++ ++#ifndef _sd_hidden_ ++#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS) ++#define _sd_hidden_ __attribute__ ((visibility("hidden"))) ++#else ++#define _sd_hidden_ ++#endif ++#endif ++ ++/* ++ Log levels for usage on stderr: ++ ++ fprintf(stderr, SD_NOTICE "Hello World!\n"); ++ ++ This is similar to printk() usage in the kernel. ++*/ ++#define SD_EMERG "<0>" /* system is unusable */ ++#define SD_ALERT "<1>" /* action must be taken immediately */ ++#define SD_CRIT "<2>" /* critical conditions */ ++#define SD_ERR "<3>" /* error conditions */ ++#define SD_WARNING "<4>" /* warning conditions */ ++#define SD_NOTICE "<5>" /* normal but significant condition */ ++#define SD_INFO "<6>" /* informational */ ++#define SD_DEBUG "<7>" /* debug-level messages */ ++ ++/* The first passed file descriptor is fd 3 */ ++#define SD_LISTEN_FDS_START 3 ++ ++/* ++ Returns how many file descriptors have been passed, or a negative ++ errno code on failure. Optionally, removes the $LISTEN_FDS and ++ $LISTEN_PID file descriptors from the environment (recommended, but ++ problematic in threaded environments). If r is the return value of ++ this function you'll find the file descriptors passed as fds ++ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative ++ errno style error code on failure. This function call ensures that ++ the FD_CLOEXEC flag is set for the passed file descriptors, to make ++ sure they are not passed on to child processes. If FD_CLOEXEC shall ++ not be set, the caller needs to unset it after this call for all file ++ descriptors that are used. ++ ++ See sd_listen_fds(3) for more information. ++*/ ++int sd_listen_fds(int unset_environment) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a FIFO in the file system stored under the ++ specified path, 0 otherwise. If path is NULL a path name check will ++ not be done and the call only verifies if the file descriptor ++ refers to a FIFO. Returns a negative errno style error code on ++ failure. ++ ++ See sd_is_fifo(3) for more information. ++*/ ++int sd_is_fifo(int fd, const char *path) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is a socket of the specified family (AF_INET, ++ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If ++ family is 0 a socket family check will not be done. If type is 0 a ++ socket type check will not be done and the call only verifies if ++ the file descriptor refers to a socket. If listening is > 0 it is ++ verified that the socket is in listening mode. (i.e. listen() has ++ been called) If listening is == 0 it is verified that the socket is ++ not in listening mode. If listening is < 0 no listening mode check ++ is done. Returns a negative errno style error code on failure. ++ ++ See sd_is_socket(3) for more information. ++*/ ++int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an Internet socket, of the specified family ++ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, ++ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version ++ check is not done. If type is 0 a socket type check will not be ++ done. If port is 0 a socket port check will not be done. The ++ listening flag is used the same way as in sd_is_socket(). Returns a ++ negative errno style error code on failure. ++ ++ See sd_is_socket_inet(3) for more information. ++*/ ++int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_; ++ ++/* ++ Helper call for identifying a passed file descriptor. Returns 1 if ++ the file descriptor is an AF_UNIX socket of the specified type ++ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 ++ a socket type check will not be done. If path is NULL a socket path ++ check will not be done. For normal AF_UNIX sockets set length to ++ 0. For abstract namespace sockets set length to the length of the ++ socket name (including the initial 0 byte), and pass the full ++ socket path in path (including the initial 0 byte). The listening ++ flag is used the same way as in sd_is_socket(). Returns a negative ++ errno style error code on failure. ++ ++ See sd_is_socket_unix(3) for more information. ++*/ ++int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_; ++ ++/* ++ Informs systemd about changed daemon state. This takes a number of ++ newline separated environment-style variable assignments in a ++ string. The following variables are known: ++ ++ READY=1 Tells systemd that daemon startup is finished (only ++ relevant for services of Type=notify). The passed ++ argument is a boolean "1" or "0". Since there is ++ little value in signalling non-readiness the only ++ value daemons should send is "READY=1". ++ ++ STATUS=... Passes a single-line status string back to systemd ++ that describes the daemon state. This is free-from ++ and can be used for various purposes: general state ++ feedback, fsck-like programs could pass completion ++ percentages and failing programs could pass a human ++ readable error message. Example: "STATUS=Completed ++ 66% of file system check..." ++ ++ ERRNO=... If a daemon fails, the errno-style error code, ++ formatted as string. Example: "ERRNO=2" for ENOENT. ++ ++ BUSERROR=... If a daemon fails, the D-Bus error-style error ++ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut" ++ ++ MAINPID=... The main pid of a daemon, in case systemd did not ++ fork off the process itself. Example: "MAINPID=4711" ++ ++ Daemons can choose to send additional variables. However, it is ++ recommened to prefix variable names not listed above with X_. ++ ++ Returns a negative errno-style error code on failure. Returns > 0 ++ if systemd could be notified, 0 if it couldn't possibly because ++ systemd is not running. ++ ++ Example: When a daemon finished starting up, it could issue this ++ call to notify systemd about it: ++ ++ sd_notify(0, "READY=1"); ++ ++ See sd_notifyf() for more complete examples. ++ ++ See sd_notify(3) for more information. ++*/ ++int sd_notify(int unset_environment, const char *state) _sd_hidden_; ++ ++/* ++ Similar to sd_notify() but takes a format string. ++ ++ Example 1: A daemon could send the following after initialization: ++ ++ sd_notifyf(0, "READY=1\n" ++ "STATUS=Processing requests...\n" ++ "MAINPID=%lu", ++ (unsigned long) getpid()); ++ ++ Example 2: A daemon could send the following shortly before ++ exiting, on failure: ++ ++ sd_notifyf(0, "STATUS=Failed to start up: %s\n" ++ "ERRNO=%i", ++ strerror(errno), ++ errno); ++ ++ See sd_notifyf(3) for more information. ++*/ ++int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_; ++ ++/* ++ Returns > 0 if the system was booted with systemd. Returns < 0 on ++ error. Returns 0 if the system was not booted with systemd. Note ++ that all of the functions above handle non-systemd boots just ++ fine. You should NOT protect them with a call to this function. Also ++ note that this function checks whether the system, not the user ++ session is controlled by systemd. However the functions above work ++ for both user and system services. ++ ++ See sd_booted(3) for more information. ++*/ ++int sd_booted(void) _sd_hidden_; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/syslogd.c b/syslogd.c +index acfd8f1..9bfa8c7 100644 +--- a/syslogd.c ++++ b/syslogd.c +@@ -551,6 +551,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; + + #if defined(__linux__) + #include ++#include + #endif + + #ifndef UTMP_FILE +@@ -965,8 +966,11 @@ int main(argc, argv) + } + signal (SIGTERM, SIG_DFL); + num_fds = getdtablesize(); +- for (i= 0; i < num_fds; i++) +- (void) close(i); ++#if defined(__linux__) ++ if (sd_listen_fds(0) <= 0) ++#endif ++ for (i = 0; i < num_fds; i++) ++ (void) close(i); + untty(); + } + else +@@ -1253,6 +1257,60 @@ static int create_unix_socket(const char *path) + if (path[0] == '\0') + return -1; + ++#if defined(__linux__) ++ if (strcmp(path, _PATH_LOG) == 0) { ++ int r; ++ ++ /* Check whether an FD was passed in from systemd. If ++ * so, it's the /dev/log socket, so use it. */ ++ ++ r = sd_listen_fds(0); ++ if (r < 0) { ++ logerror("Failed to acquire systemd socket"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ ++ if (r > 1) { ++ logerror("Wrong number of systemd sockets passed"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (r == 1) { ++ fd = SD_LISTEN_FDS_START; ++ r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/syslog", 0); ++ if (r < 0) { ++ logerror("Failed to verify systemd socket type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ if (!r) { ++ logerror("Passed systemd socket of wrong type"); ++#ifndef SYSV ++ dienow(); ++#else ++ return -1; ++#endif ++ } ++ ++ dprintf("Using systemd socket (%d).\n", fd); ++ return fd; ++ } ++ } ++#endif ++ + (void) unlink(path); + + memset(&sunx, 0, sizeof(sunx)); +@@ -2254,7 +2311,12 @@ void die(sig) + if (InetInuse) close(inetm); + + /* Clean-up files. */ +- for (i = 0; i < nfunix; i++) ++ i = 0; ++#if defined(__linux__) ++ if (sd_listen_fds(0) > 0) ++ i = 1; ++#endif ++ for (; i < nfunix; i++) + if (funixn[i] && funix[i] != -1) + (void)unlink(funixn[i]); + #ifndef TESTING From 8ded076ac0ff9a76d870d75befb53dbb9d9cf5ce Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Jul 2012 01:45:49 +0200 Subject: [PATCH 0257/1120] Add new package netrw, version 1.3.2. The upstream URL unfortunately wasn't available at this time, so I provided an alternate mirror. I checksummed the file against the hashes from various distributions in order to make sure it's the right one. --- pkgs/tools/networking/netrw/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/netrw/default.nix diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix new file mode 100644 index 000000000000..c90546393598 --- /dev/null +++ b/pkgs/tools/networking/netrw/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "netrw-${version}"; + version = "1.3.2"; + + src = fetchurl { + urls = [ + "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" + "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" + ]; + sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; + }; + + meta = { + description = "A simple tool for transporting data over the network."; + homepage = "http://mamuti.net/netrw/index.en.html"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64d2b986cc1c..46ee8c6bbbc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1120,6 +1120,8 @@ let netpbm = callPackage ../tools/graphics/netpbm { }; + netrw = callPackage ../tools/networking/netrw { }; + netselect = callPackage ../tools/networking/netselect { }; networkmanager = callPackage ../tools/networking/network-manager { }; From 8bd81bc3d6191b8176f95dd68e9013bc8e02704a Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 20 Jul 2012 01:49:47 +0200 Subject: [PATCH 0258/1120] netrw: Allow to specify checksum hash library. Within netrw the only checksum algorithm that is available is MD5. We thus make it possible for users to override this, so algorithms from other libraries such as OpenSSL and MHash can used. --- pkgs/tools/networking/netrw/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index c90546393598..eb03377fc52f 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -1,9 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl +, checksumType ? "built-in" +, libmhash ? null +, openssl ? null +}: + +assert checksumType == "mhash" -> libmhash != null; +assert checksumType == "openssl" -> openssl != null; stdenv.mkDerivation rec { name = "netrw-${version}"; version = "1.3.2"; + configureFlags = [ + "--with-checksum=${checksumType}" + ]; + + buildInputs = stdenv.lib.optional (checksumType == "mhash") libmhash + ++ stdenv.lib.optional (checksumType == "openssl") openssl; + src = fetchurl { urls = [ "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" From a2762b5254c9904db67fefba7e574187ef6fc17a Mon Sep 17 00:00:00 2001 From: Daniel Santa Cruz Date: Thu, 19 Jul 2012 22:37:21 -0400 Subject: [PATCH 0259/1120] Haskell libraries required for Snap development --- .../haskell/comonad-transformers/default.nix | 19 +++++++++++++ .../libraries/haskell/comonad/default.nix | 14 ++++++++++ .../haskell/configurator/default.nix | 18 ++++++++++++ .../haskell/contravariant/default.nix | 14 ++++++++++ .../haskell/data-lens-template/default.nix | 14 ++++++++++ .../libraries/haskell/data-lens/default.nix | 17 +++++++++++ .../haskell/distributive/default.nix | 14 ++++++++++ .../libraries/haskell/heist/default.nix | 21 ++++++++++++++ .../haskell/semigroupoids/default.nix | 14 ++++++++++ .../libraries/haskell/snap/loader-static.nix | 13 +++++++++ .../libraries/haskell/snap/snap.nix | 28 +++++++++++++++++++ .../libraries/haskell/xmlhtml/default.nix | 17 +++++++++++ pkgs/top-level/haskell-packages.nix | 24 ++++++++++++++++ 13 files changed, 227 insertions(+) create mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix create mode 100644 pkgs/development/libraries/haskell/comonad/default.nix create mode 100644 pkgs/development/libraries/haskell/configurator/default.nix create mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix create mode 100644 pkgs/development/libraries/haskell/distributive/default.nix create mode 100644 pkgs/development/libraries/haskell/heist/default.nix create mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix create mode 100644 pkgs/development/libraries/haskell/snap/loader-static.nix create mode 100644 pkgs/development/libraries/haskell/snap/snap.nix create mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix new file mode 100644 index 000000000000..1dd7c212c714 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, contravariant, distributive, semigroupoids +, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "comonad-transformers"; + version = "2.1.2"; + sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis"; + buildDepends = [ + comonad contravariant distributive semigroupoids semigroups + transformers + ]; + meta = { + homepage = "http://github.com/ekmett/comonad-transformers/"; + description = "Comonad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix new file mode 100644 index 000000000000..53e014fb8ac9 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "1.1.1.6"; + sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; + buildDepends = [ semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/comonad/"; + description = "Haskell 98 compatible comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix new file mode 100644 index 000000000000..0c4c610106ef --- /dev/null +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, hashable, text, unixCompat +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "configurator"; + version = "0.2.0.0"; + sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la"; + buildDepends = [ + attoparsec hashable text unixCompat unorderedContainers + ]; + meta = { + homepage = "http://github.com/bos/configurator"; + description = "Configuration management"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix new file mode 100644 index 000000000000..526b9e1f9973 --- /dev/null +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "contravariant"; + version = "0.2.0.2"; + sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/contravariant/"; + description = "Haskell 98 contravariant functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix new file mode 100644 index 000000000000..fc058b92e547 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -0,0 +1,14 @@ +{ cabal, dataLens }: + +cabal.mkDerivation (self: { + pname = "data-lens-template"; + version = "2.1.5"; + sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc"; + buildDepends = [ dataLens ]; + meta = { + homepage = "http://github.com/ekmett/data-lens-template/"; + description = "Utilities for Data.Lens"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix new file mode 100644 index 000000000000..42e6c9f1518b --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -0,0 +1,17 @@ +{ cabal, comonad, comonadTransformers, semigroupoids, transformers +}: + +cabal.mkDerivation (self: { + pname = "data-lens"; + version = "2.10.0"; + sha256 = "0y3rl9axakvz6kwmh08aabbz1z7y38wyrygmg4m6xby02cqbq5gk"; + buildDepends = [ + comonad comonadTransformers semigroupoids transformers + ]; + meta = { + homepage = "http://github.com/roconnor/data-lens/"; + description = "Haskell 98 Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix new file mode 100644 index 000000000000..a8b07c608d8a --- /dev/null +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "distributive"; + version = "0.2.2"; + sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/distributive/"; + description = "Haskell 98 Distributive functors -- Dual to Traversable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix new file mode 100644 index 000000000000..44ba8ba15ee5 --- /dev/null +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree +, filepath, MonadCatchIOTransformers, mtl, random, text, time +, transformers, unorderedContainers, vector, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "heist"; + version = "0.8.1.1"; + sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + buildDepends = [ + aeson attoparsec blazeBuilder blazeHtml directoryTree filepath + MonadCatchIOTransformers mtl random text time transformers + unorderedContainers vector xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "An (x)html templating system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix new file mode 100644 index 000000000000..776e452eafe7 --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, contravariant, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "semigroupoids"; + version = "1.3.4"; + sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph"; + buildDepends = [ comonad contravariant semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Haskell 98 semigroupoids: Category sans id"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix new file mode 100644 index 000000000000..a9dcbf10810e --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/loader-static.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "snap-loader-static"; + version = "0.9.0"; + sha256 = "1blchmg0qfng7bw235z1gqkwyi764j78bc29vd5p6xxhmq111ys7"; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: static loader"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix new file mode 100644 index 000000000000..c20ee0318ede --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -0,0 +1,28 @@ +{ cabal, aeson, attoparsec, cereal, clientsession, configurator +, dataLens, dataLensTemplate, directoryTree, filepath, hashable +, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, snapCore, snapServer, stm, syb, text, time +, transformers, unorderedContainers, utf8String, vector +, vectorAlgorithms, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "snap"; + version = "0.9.0.1"; + sha256 = "0n3qmyvqqcds3c56ml77d2cr0ghs1c7wwd20m44zzmxxmpbnfmgh"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec cereal clientsession configurator dataLens + dataLensTemplate directoryTree filepath hashable heist logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore + snapServer stm syb text time transformers unorderedContainers + utf8String vector vectorAlgorithms xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix new file mode 100644 index 000000000000..654da2e76b52 --- /dev/null +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "xmlhtml"; + version = "0.2.0.2"; + sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2"; + buildDepends = [ + blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers + ]; + meta = { + description = "XML parser and renderer with HTML 5 quirks mode"; + 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 34144c3237da..d0a4e2e4e938 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -532,18 +532,26 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; + comonad = callPackage ../development/libraries/haskell/comonad {}; + + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; + configurator = callPackage ../development/libraries/haskell/configurator {}; + convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; + contravariant = callPackage ../development/libraries/haskell/contravariant {}; + converge = callPackage ../development/libraries/haskell/converge {}; cookie = callPackage ../development/libraries/haskell/cookie {}; @@ -588,6 +596,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; + dataLens = callPackage ../development/libraries/haskell/data-lens {}; + + dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -616,6 +628,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; + dlist = callPackage ../development/libraries/haskell/dlist {}; dotgen = callPackage ../development/libraries/haskell/dotgen {}; @@ -841,6 +855,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + heist = callPackage ../development/libraries/haskell/heist {}; + HFuse = callPackage ../development/libraries/haskell/hfuse {}; HGL = callPackage ../development/libraries/haskell/HGL {}; @@ -1291,6 +1307,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; @@ -1299,8 +1317,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {}; + snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; socks = callPackage ../development/libraries/haskell/socks {}; @@ -1571,6 +1593,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; From f3b43a268d4b80c0351e00e59c5a789eb866ea40 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 20 Jul 2012 13:37:02 +0200 Subject: [PATCH 0260/1120] linux-3.4: update to 3.4.6 --- 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 5cbde5651538..b51154d0ca21 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.5"; + version = "3.4.6"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "17m58d2mc2mgr49hlwhic03s0z1mjyp7lhfvfmpqi3qszrz3xij3"; + sha256 = "0302q8m4xq0pidsd8ga0568sb620pk4il2kb8gi7dhsq615himjh"; }; config = configWithPlatform stdenv.platform; From 44cf3d5808dda2391cc8a8af18bea7598ad1b224 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jul 2012 10:44:19 -0400 Subject: [PATCH 0261/1120] systemd: Update to 187 --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 80ce415ca80f..dbf877ebaebd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -3,12 +3,14 @@ , glib, kbd }: +assert stdenv.gcc.libc or null != null; + stdenv.mkDerivation rec { - name = "systemd-186"; + name = "systemd-187"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0zmj8r7a1xb5f3lvyfgw7095rq3yvr0ibw1730j54blm07sh3hmj"; + sha256 = "1m7fzcqqgwqdjrrdp41i81q6y0cgjbknrznsvjqwh7nc027k6fqs"; }; buildInputs = @@ -47,6 +49,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; + makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # Get rid of configuration-specific data. From 892c2e04134ff561754854e6495187adcc43a53f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 20 Jul 2012 20:07:52 +0200 Subject: [PATCH 0262/1120] virtualenv: readline and sqlite --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a8760a8e763..d9e1b774f2aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2541,6 +2541,8 @@ let pythonPackages = python.modules // rec { patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; + propagatedBuildInputs = [ python.modules.readline python.modules.sqlite3 ]; + doCheck = false; meta = with stdenv.lib; { From c043cd2d26ddaf8b61c50cd2c119bdb88303d1a5 Mon Sep 17 00:00:00 2001 From: System administrator Date: Wed, 27 Jun 2012 14:39:29 +0200 Subject: [PATCH 0263/1120] added new version --- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 8cfc26d70cc3..268cc194d73b 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wget, bash, coreutils}: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "bb832557fca3be838838a87d790cb535974ea70bd2393818201676212f0f3b5a"; + sha256 = "0niv1wpj2xhn40c3hffj1fklx5rmnl67jzd872487gm3zibjb0xv"; }; # currently zsh-autocompletion support is not installed From c6452f372cb1d22e46cec7dd1c8706d718d98513 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 20 Jul 2012 22:17:21 +0000 Subject: [PATCH 0264/1120] added urlgrabber-3.9.1 and removed one python/.pth related code segment --- pkgs/top-level/python-packages.nix | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9e1b774f2aa..35c265fffd88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2067,11 +2067,6 @@ let pythonPackages = python.modules // rec { doCheck = false; - postInstall = '' - find $out -name easy-install.pth | xargs rm -v - find $out -name 'site.py*' | xargs rm -v - ''; - meta = { description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; homepage = http://www.rdflib.net/; @@ -2513,6 +2508,30 @@ let pythonPackages = python.modules // rec { }; }; + + urlgrabber = buildPythonPackage rec { + name = "urlgrabber-3.9.1"; + + src = fetchurl { + url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz"; + sha256 = "4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pycurl ]; + + PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; + + meta = { + homepage = "urlgrabber.baseurl.org"; + license = "LGPLv2+"; + description = "Python module for downloading files"; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; + }; + + urwid = buildPythonPackage (rec { name = "urwid-1.0.1"; From 538b17a791bc38e6cbd16a144832858504ce7da6 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 20 Jul 2012 23:27:24 +0000 Subject: [PATCH 0265/1120] fixed most virt-manager issues! --- .../virt-manager/custom_runner.py | 13 ++ .../virtualization/virt-manager/default.nix | 127 ++++++++++-------- .../virtualization/virtinst/default.nix | 8 -- .../gnome-2/bindings/gnome-python/default.nix | 7 +- pkgs/desktops/gnome-2/default.nix | 4 +- pkgs/top-level/all-packages.nix | 5 +- pkgs/top-level/python-packages.nix | 2 - 7 files changed, 94 insertions(+), 72 deletions(-) create mode 100644 pkgs/applications/virtualization/virt-manager/custom_runner.py diff --git a/pkgs/applications/virtualization/virt-manager/custom_runner.py b/pkgs/applications/virtualization/virt-manager/custom_runner.py new file mode 100644 index 000000000000..5322c20dd329 --- /dev/null +++ b/pkgs/applications/virtualization/virt-manager/custom_runner.py @@ -0,0 +1,13 @@ +#!/usr/bin/python -t +# this script was written to use /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh +# which already automates python executable wrapping by extending the PATH/pythonPath + +# from http://docs.python.org/library/subprocess.html +# Warning Invoking the system shell with shell=True can be a security hazard if combined with untrusted input. See the warning under Frequently Used Arguments for details. + +from subprocess import Popen, PIPE, STDOUT + +cmd = 'PYTHON_EXECUTABLE_PATH -t THE_CUSTOM_PATH/share/virt-manager/THE_CUSTOM_PROGRAM.py' +p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True) +output = p.stdout.read() +print output diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index c41db3f58c56..79ea777eeadd 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,70 +1,85 @@ -x@{builderDefsPackage - , gnome, gtk, glib, libxml2, libvirt, gtkvnc, cyrus_sasl, libtasn1, makeWrapper - , intltool, python, pygtk, libxml2Python - # virtinst is required, but it breaks when building - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["gnome"]; +{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl, python, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc}: - buildInputs = (map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames))) - ++ [gnome.libglade intltool python libvirt]; - sourceInfo = rec { - baseName="virt-manager"; +with stdenv.lib; - version = "0.9.1"; - name = "virt-manager-${version}"; +let version = "0.9.1"; in + +stdenv.mkDerivation rec { + name = "virt-manager-${version}"; + + src = fetchurl { url = "http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${version}.tar.gz"; - hash = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a"; }; - patchPhase = a.fullDepEntry '' - substituteInPlace "src/virt-manager.in" --replace "exec /usr/bin/python" "exec ${python}/bin/python" - sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ - -i src/virtManager/util.py - sed -e '/import libxml2/i import sys\ - sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ - -i src/virtManager/libvirtobject.py - '' ["minInit"]; + pythonPath = with pythonPackages; + [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes + paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + distutils_extra simplejson readline glance cheetah lockfile httplib2 + # !!! should libvirt be a build-time dependency? Note that + # libxml2Python is a dependency of libvirt.py. + libvirt libxml2Python urlgrabber virtinst pyGtkGlade pythonDBus gnome_python gtkvnc + ]; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = + [ pythonPackages.python + pythonPackages.wrapPython + pythonPackages.mox + pythonPackages.urlgrabber + intltool + pyGtkGlade + pythonDBus + gnome_python + gtkvnc + ] ++ pythonPath; - /* doConfigure should be removed if not needed */ - phaseNames = [ "doUnpack" "patchPhase" "doConfigure" "doMakeInstall" "installPhase" ]; + buildPhase = "make"; + + buildNativeInputs = [ makeWrapper pythonPackages.wrapPython ]; - installPhase = a.fullDepEntry '' - wrapProgram $out/bin/virt-manager --set PYTHONPATH $PYTHONPATH - '' ["minInit"]; + # patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall + # example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix + customRunner = ./custom_runner.py; - #NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + # TODO + # virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade + # -> import gconf -> ImportError: No module named gconf + # -> pfad um gtk-2.0 erweitern in virt-manger runner -> /nix/store/hnyxc9i4yz2mc42n44ms13mn8n486s5h-gnome-python-2.28.1/lib/python2.7/site-packages/gtk-2.0 + # -> Error starting Virtual Machine Manager: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - 1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files) + +#Traceback (most recent call last): +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 383, in +# main() +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virt-manager.py", line 315, in main +# config = virtManager.config.vmmConfig(appname, appversion, glade_dir) +# File "/nix/store/y9rcdiv6686sqcv4r39p575s37jzc2cz-virt-manager-0.9.1/share/virt-manager/virtManager/config.py", line 98, in __init__ +# self.conf.add_dir(self.conf_dir, gconf.CLIENT_PRELOAD_NONE) +#GError: Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - 1: GetIOR failed: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.GConf was not provided by any .service files) +# -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart + # virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen + + patchPhase = '' + cat ${customRunner} > src/virt-manager.in + substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PATH" "$out" + substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager" + substituteInPlace "src/virt-manager.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" + + cat ${customRunner} > src/virt-manager-tui.in + substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PATH" "$out" + substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager-tui" + substituteInPlace "src/virt-manager-tui.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python" + ''; + + # /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh + installPhase = '' + make install + wrapPythonPrograms + ''; meta = { homepage = http://virt-manager.org; description = "The 'Virtual Machine Manager' application (virt-manager for short package name) is a desktop user interface for managing virtual machines."; - - maintainers = with a.lib.maintainers; - [ - qknight - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [qknight]; }; - passthru = { - updateInfo = { - downloadPage = "http://virt-manager.org/download.html"; - }; - }; -}) x - +} diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 0c574db23911..2bb2adaa00ac 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -30,19 +30,11 @@ stdenv.mkDerivation rec { buildPhase = "python setup.py build"; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - -# substituteInPlace nova/api/ec2/cloud.py \ -# --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh -# ''; - installPhase = '' python setup.py install --prefix="$out"; ''; - #checkPhase = "python setup.py test"; - meta = { homepage = http://virt-manager.org; license = "GPLv2+"; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 3d47ed567873..c65c8b98c6ac 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation rec { phases = "unpackPhase configurePhase buildPhase installPhase"; - # You should be using WAF instead; see the file INSTALL.WAF + # WAF is probably the biggest crap on this planet, btw i removed the /gtk-2.0 path thingy configurePhase = '' - python waf configure --prefix=$out + sed -e "s@{PYTHONDIR}/gtk-2.0@{PYTHONDIR}/@" -i gconf/wscript + python waf configure --prefix=$out ''; buildPhase = '' @@ -35,4 +36,4 @@ stdenv.mkDerivation rec { description = "Python wrapper for gconf"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; -} \ No newline at end of file +} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 943dbc9a5008..36d0860caa5d 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -44,6 +44,8 @@ gnome_mime_data = callPackage ./platform/gnome-mime-data { }; + gnome_python = callPackage ./bindings/gnome-python { }; + gnome_vfs = callPackage ./platform/gnome-vfs { }; gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { }; @@ -115,6 +117,4 @@ libglademm = callPackage ./bindings/libglademm { }; - gnome_python = callPackage ./bindings/gnome-python { }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14c4273e2669..88effa9ccdf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7609,7 +7609,10 @@ let }; virtviewer = callPackage ../applications/virtualization/virt-viewer {}; - virtmanager = callPackage ../applications/virtualization/virt-manager {}; + virtmanager = callPackage ../applications/virtualization/virt-manager { + inherit (gnome) gnome_python; + }; + virtinst = callPackage ../applications/virtualization/virtinst {}; virtualgl = callPackage ../tools/X11/virtualgl { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c265fffd88..b8327ddaaae4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2521,8 +2521,6 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ pycurl ]; - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - meta = { homepage = "urlgrabber.baseurl.org"; license = "LGPLv2+"; From 19bd2da96ee4205c14c5c820b666a88255096224 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sat, 21 Jul 2012 09:17:12 +0000 Subject: [PATCH 0266/1120] fixed the hash, which was wrong --- pkgs/tools/text/wgetpaste/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 268cc194d73b..63313872ede9 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -4,7 +4,7 @@ name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "0niv1wpj2xhn40c3hffj1fklx5rmnl67jzd872487gm3zibjb0xv"; + sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e"; }; # currently zsh-autocompletion support is not installed From 172f29cc3cd39f4a3ef5bad0d7cb072b08573c02 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 21 Jul 2012 13:39:55 +0200 Subject: [PATCH 0267/1120] netrw: Add missing license to meta attributes. --- pkgs/tools/networking/netrw/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index eb03377fc52f..23ff6ddba55a 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool for transporting data over the network."; + license = stdenv.lib.licenses.gpl2; homepage = "http://mamuti.net/netrw/index.en.html"; }; } From 7bf4ec13f91a75011194c49d275750aa65bf9733 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 14:08:34 +0200 Subject: [PATCH 0268/1120] RealPlayer needs callPackage_i686 --- 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 88effa9ccdf3..33792696149d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7369,7 +7369,7 @@ let rdesktop = callPackage ../applications/networking/remote/rdesktop { }; - RealPlayer = callPackage ../applications/video/RealPlayer { + RealPlayer = callPackage_i686 ../applications/video/RealPlayer { libstdcpp5 = gcc33.gcc; }; From a78098451ec494a391fdc65a7f7c88bce63a5305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Jul 2012 15:45:29 +0200 Subject: [PATCH 0269/1120] webkit-1.4: fix build (perl versions) Setting perl 5.10 later on buildInputs so it detects this 5.10 perl instead of the 5.14 that comes through some propagatedBuildInputs. I don't know what one. --- pkgs/development/libraries/webkit/gtk2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 76a9b90b411c..5c755c193a52 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -13,8 +13,8 @@ rec { buildInputs = [gtk glib atk cairo curl fontconfig freetype gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue + intltool pkgconfig libsoup gtkdoc libXt libproxy + enchant python ruby which renderproto libXrender geoclue perl ]; propagatedBuildInputs = [ From d652ae4253619bec1752441059a536554f4fc4cd Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 21 Jul 2012 19:56:44 +0200 Subject: [PATCH 0270/1120] rdiff-backup: upgrade to 1.2.8 --- pkgs/tools/backup/rdiff-backup/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 2460573310c6..f108e6a50634 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, python, librsync, gnused }: stdenv.mkDerivation { - name = "rdiff-backup-1.1.14"; + name = "rdiff-backup-1.2.8"; src = fetchurl { - url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.14.tar.gz; - sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h"; + url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz; + sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; }; phases = "unpackPhase installPhase"; installPhase = '' python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ - "/import sys/ asys.path += [ \"$out/lib/python2.4/site-packages/\" ]" + "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; buildInputs = [python librsync gnused ]; From 2547e0e96aa7923b18826f9fe71d0d107e5faf90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Jul 2012 15:41:37 -0400 Subject: [PATCH 0271/1120] systemd: Use an interface version, just like we have for Upstart --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index dbf877ebaebd..a6889e3e4403 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -70,6 +70,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; + meta = { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; From 0435f39008f106b5b29e7706889aaea693e36f21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 22 Jul 2012 01:17:54 -0400 Subject: [PATCH 0272/1120] wine: Update to 1.5.9 --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index acfe794dc4f8..a0b9f9eccb01 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,11 +7,11 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-1.5.5"; + name = "wine-1.5.9"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e"; + sha256 = "1lwwi53fccl2ckaq5vjj23yvhrajsr6rk2gc3yj13v4g1mymxhkv"; }; gecko = fetchurl { From 305eb0a30fcc87661d4dc3d1422d4cadda1e869e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2012 10:24:15 +0200 Subject: [PATCH 0273/1120] yafc: making the derivation name include the version --- pkgs/applications/networking/yafc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 7089c7507db0..9b1c9892cbfa 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,10 +1,9 @@ {stdenv, fetchurl, readline, libssh, intltool}: stdenv.mkDerivation rec { - name = "yafc"; - version = "1.2.0"; + name = "yafc-1.2.0"; src = fetchurl { - url = "https://github.com/downloads/sebastinas/yafc/${name}-${version}.tar.xz"; + url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz"; sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58"; }; From d23b81b6ee4f29c4fac47e1cfe701b2eb18e6df6 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 20 Jul 2012 21:26:49 +0200 Subject: [PATCH 0274/1120] libextractor: Fixing about videoSupport builtInputs. I don't know how could I commit the weird lines I fix. --- pkgs/development/libraries/libextractor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index d2cbdf841b00..a6b670eedb62 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgsf rpm pkgconfig ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] - ++ stdenv.lib.optionals videoSupport [ ffmpeg gtkSupport ]; + ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " From 053f641d16ace8a67c2a668651b13757153f983f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 22 Jul 2012 11:33:00 -0400 Subject: [PATCH 0275/1120] Add linux-3.5 --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 263 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 + 2 files changed, 276 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.5.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix new file mode 100644 index 000000000000..42ebd8c3943d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -0,0 +1,263 @@ +args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +, perl, mktemp, module_init_tools +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # Power management and debugging for powertop. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + CIFS_XATTR y + CIFS_POSIX y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM m + BT_RFCOMM_TTY y # RFCOMM TTY support + CRASH_DUMP n + DMAR? n # experimental + DVB_DYNAMIC_MINORS y # we use udev + EFI_STUB y # EFI bootloader in the bzImage itself + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + CGROUP_MEM_RES_CTLR? y + CGROUP_MEM_RES_CTLR_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.5"; + modDirVersion = "3.5.0"; + testing = false; + + preConfigure = '' + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" + ''; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "0hmkzlk1y93q0r19phm8mhkq60lr92l9jk4dk06r9z8c7wwcx1dr"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + features.efiBootStub = true; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33792696149d..73686743d39c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5701,6 +5701,18 @@ let ]; }; + linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + #kernelPatches.aufs3_4 + ] ++ lib.optionals (platform.kernelArch == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5821,6 +5833,7 @@ let linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); + linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); # The current default kernel / kernel modules. linux = linuxPackages.kernel; From 72e07c2940036c066cfe3cf0b03942ebb573b9fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 18:54:50 +0200 Subject: [PATCH 0276/1120] bison: add version 2.6 --- .../tools/parsing/bison/bison-2.6.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/tools/parsing/bison/bison-2.6.nix diff --git a/pkgs/development/tools/parsing/bison/bison-2.6.nix b/pkgs/development/tools/parsing/bison/bison-2.6.nix new file mode 100644 index 000000000000..96fa7dc8ca53 --- /dev/null +++ b/pkgs/development/tools/parsing/bison/bison-2.6.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "bison-2.6"; + + src = fetchurl { + url = "mirror://gnu/bison/${name}.tar.xz"; + sha256 = "6dde6668484acb66267c74174f0cf850bd1be01f6e94850b9bd86ea2046a87a1"; + }; + + buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + propagatedBuildInputs = [ m4 ]; + + doCheck = true; + # M4 = "${m4}/bin/m4"; + + meta = { + homepage = "http://www.gnu.org/software/bison/"; + description = "GNU Bison, a Yacc-compatible parser generator"; + license = "GPLv3+"; + + longDescription = '' + Bison is a general-purpose parser generator that converts an + annotated context-free grammar into an LALR(1) or GLR parser for + that grammar. Once you are proficient with Bison, you can use + it to develop a wide range of language parsers, from those used + in simple desk calculators to complex programming languages. + + Bison is upward compatible with Yacc: all properly-written Yacc + grammars ought to work with Bison with no change. Anyone + familiar with Yacc should be able to use Bison with little + trouble. You need to be fluent in C or C++ programming in order + to use Bison. + ''; + + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.unix; + }; + + passthru = { glrSupport = true; }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73686743d39c..de17034eb887 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2896,6 +2896,8 @@ let bison25 = callPackage ../development/tools/parsing/bison/bison-2.5.nix { }; + bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; + buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted; }; From 201bdd1b6c2ff470798e177c199fc01cf8f39214 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 18:55:02 +0200 Subject: [PATCH 0277/1120] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de17034eb887..4a79bb045aaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7625,7 +7625,7 @@ let virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { - inherit (gnome) gnome_python; + inherit (gnome) gnome_python; }; virtinst = callPackage ../applications/virtualization/virtinst {}; From 2c867c6c04a614ce413dc192fc3f0c4c9c1977d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 18:56:21 +0200 Subject: [PATCH 0278/1120] nbd: update to version 3.2 --- pkgs/tools/networking/nbd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 97ef0080de21..9e2d14c64ff5 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.1.1"; + name = "nbd-3.2"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "5cd150b874f966aacf4a9dfe1e9de9b2139b295241ce89bae9f70f9aa844220b"; + sha256 = "e297c1883133f04a55d8e9527a2e4344e577a54046cf81694ffabe13f73793db"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp README "$out/share/doc/${name}/README" ''; - # The test suite doesn't succeed on Hydra. + # The test suite doesn't succeed in chroot builds. doCheck = false; # Glib calls `clock_gettime', which is in librt. Linking that library From c750a667176aa6121c4910ef5e68b1d3a6e73595 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 22 Jul 2012 19:50:31 +0200 Subject: [PATCH 0279/1120] bup: update to latest git version. why the git version? 0.24b (in nixpkgs) was broken. using 0.25rc1 gave the same error (gcc 4.6 related) Both these versions are over a year old and lots of commits were made after that, including something that fixed building on nix. --- pkgs/tools/backup/bup/default.nix | 17 +++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index e08ea1e03f4b..6d4555d34e56 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, python, unzip, perl }: +{ stdenv, fetchgit, python, git, perl, pandoc }: stdenv.mkDerivation { - name = "bup-0.24b"; - src = fetchurl { - url = "https://github.com/apenwarr/bup/zipball/bup-0.24b"; - sha256 = "0l50i8mrg43ahd8fn1n6pwa0xslxr07pvkh0r4qyywv55172ip8v"; - name = "bup-0.24b.zip"; + name = "bup-0.25git20120722"; + src = fetchgit { + url = "https://github.com/apenwarr/bup.git"; + sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa"; + rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a"; }; - buildInputs = [ unzip python perl ]; + buildNativeInputs = [ pandoc perl ]; + buildInputs = [ python git ]; patchPhase = '' for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" @@ -15,7 +16,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" substituteInPlace lib/bup/csetup.py --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" ''; - makeFlags = "MANDIR=$(out)/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup"; + makeFlags = "MANDIR=$(out)/share/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup"; meta = { description = "Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images."; homepage = "https://github.com/apenwarr/bup"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a79bb045aaa..7498fb7638c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -487,7 +487,9 @@ let btar = callPackage ../tools/backup/btar { }; - bup = callPackage ../tools/backup/bup { }; + bup = callPackage ../tools/backup/bup { + pandoc = haskellPackages.pandoc; + }; bzip2 = callPackage ../tools/compression/bzip2 { }; From b400d48a99600a516f5ea0843e17e752b48c03e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:37:23 +0200 Subject: [PATCH 0280/1120] haskell-HUnit: update to version 1.2.5.1 --- .../libraries/haskell/HUnit/{1.2.5.0.nix => 1.2.5.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/HUnit/{1.2.5.0.nix => 1.2.5.1.nix} (80%) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix similarity index 80% rename from pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix rename to pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix index cf5a68b803c3..06ac5fa1bbf6 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HUnit"; - version = "1.2.5.0"; - sha256 = "0yxa3clrrjwg9faa3vsqb44xdzhdgwji56lrh7sa7dgq8bv1h6nr"; + version = "1.2.5.1"; + sha256 = "0wa4yqgfyrfxzhdyd04xvzi4qaswbg0rrbywz8sxzkp71v91a35w"; buildDepends = [ deepseq ]; meta = { homepage = "http://hunit.sourceforge.net/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 34144c3237da..a295b8fd6544 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); haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok html = self.html_1_0_1_2; # 7.5 ok HTTP = self.HTTP_4000_2_3; # 7.5 ok - HUnit = self.HUnit_1_2_5_0; # 7.5 ok + HUnit = self.HUnit_1_2_5_1; # 7.5 ok mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_0_14; # 7.5 ok OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail @@ -916,8 +916,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {}; - HUnit_1_2_5_0 = callPackage ../development/libraries/haskell/HUnit/1.2.5.0.nix {}; - HUnit = self.HUnit_1_2_5_0; + HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {}; + HUnit = self.HUnit_1_2_5_1; hxt = callPackage ../development/libraries/haskell/hxt {}; From 974fcebd7ffd363f5f6d24d2e047d17033c7b997 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0281/1120] haskell-AspectAG: update to version 0.3.5 --- pkgs/development/libraries/haskell/AspectAG/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 3b2df825a73b..50bceea9cb42 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "AspectAG"; - version = "0.3.4.1"; - sha256 = "12iaf27crynwnnd7qm1zvvaj6zw6i6c05mb4dsq55dnhph2l356g"; + version = "0.3.5"; + sha256 = "1gqblgd0js2nliad1gryg8a3sibw5xsp577c8h3vhdfssf2bwggs"; buildDepends = [ HList mtl ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; From f110ebe38e483a473fc967761b455253863db6f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0282/1120] haskell-benchpress: update to version 0.2.2.5 --- pkgs/development/libraries/haskell/benchpress/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 9d1720541bf8..4d4b145bb08a 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "benchpress"; - version = "0.2.2.4"; - sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf"; + version = "0.2.2.5"; + sha256 = "0md66nnn9ad8f3y0dd411plnza59fvhfd6nibag3a556bpfa0kgs"; buildDepends = [ mtl time ]; patchPhase = '' - sed -i -e 's|base .*,|base,|' -e 's|mtl .*,|mtl,|' benchpress.cabal + sed -i -e 's|mtl .*,|mtl,|' benchpress.cabal ''; meta = { homepage = "http://github.com/tibbe/benchpress"; From 4bfa404d7568a9300a83d0e03f62371a4812ac7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0283/1120] haskell-directory-tree: update to version 0.10.1 --- pkgs/development/libraries/haskell/directory-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index f99e043cf9e3..65148f10a22d 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.10.0"; - sha256 = "08b0w9j55x6c06pri7yvv84n24inhpb4miybdnkyjkjy7r3yy7m4"; + version = "0.10.1"; + sha256 = "02acmfdw1yjb0h9dpjy04xxclsasm1p0m6w1dvccd4x2aqc6ybbw"; buildDepends = [ filepath ]; meta = { homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/"; From 17c2d161d8578fc85f32eb32d2e6fa6623704c56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0284/1120] haskell-process-extras: update to version 0.1.1 --- pkgs/development/libraries/haskell/process-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index 16c1b96f0425..437347749baf 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "process-extras"; - version = "0.1.0"; - sha256 = "0bq8nz2iapmngmkx2vlyk4ffw20b34yw5q7h7j6r3zrjzq42prsp"; + version = "0.1.1"; + sha256 = "0qnkclmjd5y0jpdxp4y2ynqlcdlsvck65269k0j4hy5zkyydbpv6"; buildDepends = [ text ]; meta = { homepage = "https://github.com/davidlazar/process-extras"; From 0909580c5134714f2bf43a3cb472ff242806705c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0285/1120] haskell-shakespeare-css: update to version 1.0.1.3 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 1fd00e5e08a4..3c48a51ea9b7 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.2"; - sha256 = "055nzffn5zlbwilm8624iaqzxchi247rwpca8adbxai1n2ja9fh7"; + version = "1.0.1.3"; + sha256 = "1jj609fcp14b7nzjzsiiy0apbdmap2wi7vlyzdhadirjskxvsvc1"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 49a87bc72b7b213dd449248156986b92123266c0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0286/1120] haskell-shakespeare-js: update to version 1.0.0.4 --- 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 aa759a240c7c..fee4d9013501 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.0.0.3"; - sha256 = "00x5xvjlaivl42q75cvbwbh055kgvk9i8s4y3xcmk4h7lnpfyzd6"; + version = "1.0.0.4"; + sha256 = "19v5jas2lcbya1x3mm3fhvhwk643vyy8vpfx0zk3gsw91h34pkyf"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 3c92eb2e668b55bb9bf9fe824eeb2c01c91c28df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0287/1120] haskell-shakespeare-text: update to version 1.0.0.3 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 04f9a1006198..9f4548d39bf6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.2"; - sha256 = "1dnw6aipx68cd832vs5rwxv2hr7kfk1y83mzd1xl2b3am1g0izfc"; + version = "1.0.0.3"; + sha256 = "0rwdlx7926gjkjymn3h6fdw1ic6s44nn5h8r8791gxknz668ydd7"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 7ffb4c1471ec4e3ccf4515000137f7c8eac79433 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0288/1120] haskell-shakespeare: update to version 1.0.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index c5fd290f08de..0e569d835fbb 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.0.2"; - sha256 = "04nk9l7c5wk3rbkk57s5as30zvsa7wzrsmhdak59i6v30ww22c9f"; + version = "1.0.1"; + sha256 = "1qs2n16ncrw4c98lqzgxhxa5mi7aiq1q0gwq7m9mr32jv7qzwgcv"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 176e44ab69c286087c0c4d20267356ac8505d1b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0289/1120] haskell-terminfo: update to version 0.3.2.4 --- pkgs/development/libraries/haskell/terminfo/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index ea105935cea6..0072dde1e6ef 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -1,10 +1,9 @@ -{ cabal, extensibleExceptions, ncurses }: +{ cabal, ncurses }: cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.3"; - sha256 = "06y2vx7d4hl55p3p1c7yj2lx8yaw14c5h2qclj8m5xg2wkifnf5f"; - buildDepends = [ extensibleExceptions ]; + version = "0.3.2.4"; + sha256 = "06kwyp8maf9ylhz8rypy086dfdfs1k1h1b8xyyfvz1bzxsw63k7y"; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; From 1e9adc147dec193817ed7eb2fa7c34a9af605341 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 11:56:21 +0200 Subject: [PATCH 0290/1120] haskell-tls: update to version 0.9.7 --- 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 9a89c082959d..60fa129d9d42 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 = "0.9.6"; - sha256 = "0bcmq7pvdbgnc8ls949m3x9sxj5svsrdpagjns1iq575jg38jx3g"; + version = "0.9.7"; + sha256 = "0px34l6lw6nv3cbnrgf8ajwja7ifd1pckddmbvrbwk6q459w1pjh"; isLibrary = true; isExecutable = true; buildDepends = [ From 8686b20bec1dcdcdb94882f2ce2056c04f188090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 23 Jul 2012 16:09:30 +0200 Subject: [PATCH 0291/1120] opencv: update from 2.4.1 to 2.4.2 --- pkgs/development/libraries/opencv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 009935e14c07..d40b253df2f4 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg , pkgconfig, gstreamer, xineLib, glib }: -let v = "2.4.1"; in +let v = "2.4.2"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/OpenCV-${v}.tar.bz2"; - sha256 = "1wxijbz1jfsg4695fls83825ppiacxfn5x07al0qkkx5rm7spdi9"; + sha256 = "0a1c4ys78k670dsk1fapylpf8hwfyzy944r9jvwivqh33s0j6039"; }; buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer ]; From 113016af86fecd915040b8a5ecb7e8457ec8ca1b Mon Sep 17 00:00:00 2001 From: Phreedom Date: Mon, 23 Jul 2012 17:21:25 +0300 Subject: [PATCH 0292/1120] ClamAV: package. --- pkgs/tools/security/clamav/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/security/clamav/default.nix diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix new file mode 100644 index 000000000000..bccf0cc77c5b --- /dev/null +++ b/pkgs/tools/security/clamav/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, zlib, bzip2, libiconv }: +stdenv.mkDerivation rec { + name = "clamav-${version}"; + version = "0.97.5"; + + src = fetchurl { + url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz"; + sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; + }; + + buildInputs = [ zlib bzip2 libiconv ]; + + configureFlags = [ + "--with-zlib=${zlib}" + "--with-libbz2-prefix=${bzip2}" + "--with-iconv-dir=${libiconv}" + "--disable-clamav" ]; + + meta = with stdenv.lib; { + homepage = http://www.clamav.net; + description = "an open source (GPL) antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats."; + license = licenses.gpl2; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7498fb7638c7..5c1d630b88b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -529,6 +529,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + clamav = callPackage ../tools/security/clamav { }; + cloog = callPackage ../development/libraries/cloog { }; cloogppl = callPackage ../development/libraries/cloog-ppl { }; From 16d2d9acab99a2132bafea2e28474e73bc1a2c5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jul 2012 13:46:50 -0400 Subject: [PATCH 0293/1120] php: Update to 5.3.15 Includes fixes for CVE-2012-2688 and CVE-2012-3365. --- pkgs/development/interpreters/php/5.3.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 48eb8ac5ee9d..b4f00ab1f7d4 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -8,7 +8,7 @@ in composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.14"; + version = "5.3.15"; name = "php-${version}"; @@ -149,15 +149,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { installPhase = '' unset installPhase; installPhase; - cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0 - then "recommended" /* < PHP 5.3 */ - else "production" /* >= PHP 5.3 */ - } $iniFile + cp php.ini-production $iniFile ''; src = args.fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "1cqw0knkrb7wn49ki5kcly4i0hjnd12sf9l4rhk0vny5hdp5n1y8"; + sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr"; name = "php-${version}.tar.bz2"; }; From bcd8fded1aac3382b438ac49208111b716a1acd5 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sun, 15 Jul 2012 21:48:17 +0200 Subject: [PATCH 0294/1120] In ghc 7.2.2 (and 7.2.1) deepseq is not yet part of the core set. --- pkgs/top-level/haskell-defaults.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 64291854a03e..1c0f065884ec 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -27,9 +27,14 @@ binary = null; # now a core package }; - ghc722Prefs = ghc741Prefs; + ghc722Prefs = + self : self.haskellPlatformArgs_2012_2_0_0 self // { + haskellPlatform = self.haskellPlatform_2012_2_0_0; + binary = null; # a core package + deepseq = self.deepseq_1_1_0_2; + }; - ghc721Prefs = ghc741Prefs; + ghc721Prefs = ghc722Prefs; ghc704Prefs = self : self.haskellPlatformArgs_2011_4_0_0 self // { From afada80a4fc43ab257cedb4aa294b44df0d8b2f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 23 Jul 2012 20:29:08 +0200 Subject: [PATCH 0295/1120] Haskell Platform 2012.2.0.0 mandates deepseq 1.3.x, so let's use that for ghc 7.2.x, too. --- pkgs/top-level/haskell-defaults.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 1c0f065884ec..579b20fcc230 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -31,7 +31,7 @@ self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; binary = null; # a core package - deepseq = self.deepseq_1_1_0_2; + deepseq = self.deepseq_1_3_0_0; }; ghc721Prefs = ghc722Prefs; From e29c284926c2ba3b239c4ee3aaa21aa9396f046a Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Fri, 13 Jul 2012 21:32:32 +0200 Subject: [PATCH 0296/1120] Update RPM to 4.10.0. --- pkgs/tools/package-management/rpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index b35d3b66ad83..8ed7a2daba5b 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }: stdenv.mkDerivation rec { - name = "rpm-4.7.2"; + name = "rpm-4.10.0"; src = fetchurl { - url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2"; - sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; + url = "http://rpm.org/releases/rpm-4.10.x/${name}.tar.bz2"; + sha256 = "1ag4pz51npiwf6vcksipjxaypm5afzmy8lj19bp0fk5n6mr26bhf"; }; buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ]; From e1c172ab6b3c787a166a3e345798f10045cabb6a Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 14 Jul 2012 08:20:33 +0200 Subject: [PATCH 0297/1120] Call rpm -U instead of rpm -i to test package installation. --- pkgs/build-support/release/rpm-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 9ec9ace07573..241e90f2f4aa 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -36,7 +36,7 @@ vmTools.buildRPM ( done echo "installing ''${rpms[*]}..." - rpm -ip ''${rpms[*]} --excludepath /nix/store + rpm -Up ''${rpms[*]} --excludepath /nix/store eval "$postRPMInstall" From 1eb5450bd4a60ac302f86d7609311c1c096b187f Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Sat, 14 Jul 2012 08:27:09 +0200 Subject: [PATCH 0298/1120] Add --nodeps to rpm when test-uninstalling after a rpmBuild. --- pkgs/build-support/release/rpm-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 241e90f2f4aa..5eace575366f 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -41,7 +41,7 @@ vmTools.buildRPM ( eval "$postRPMInstall" echo "uninstalling ''${rpmNames[*]}..." - rpm -e ''${rpmNames[*]} + rpm -e ''${rpmNames[*]} --nodeps for i in $out/rpms/*/*.src.rpm; do echo "file srpm $i" >> $out/nix-support/hydra-build-products From ce77a5ceec8d4f241bec049a3af9d9626b74b6dc Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Fri, 13 Jul 2012 20:58:39 +0200 Subject: [PATCH 0299/1120] Factor out repeated scriptlets from build-support/release/*.nix. --- pkgs/build-support/release/ant-build.nix | 9 ++------- pkgs/build-support/release/binary-tarball.nix | 7 +------ pkgs/build-support/release/debian-build.nix | 15 ++++----------- pkgs/build-support/release/functions.sh | 14 ++++++++++++++ pkgs/build-support/release/nix-build.nix | 8 ++------ pkgs/build-support/release/rpm-build.nix | 14 ++++---------- 6 files changed, 27 insertions(+), 40 deletions(-) create mode 100644 pkgs/build-support/release/functions.sh diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index fe15f93a8fe2..696f179a2ed0 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -100,15 +100,10 @@ stdenv.mkDerivation ( postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system + . ${./functions.sh} - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - + src=$(findTarballs $src | head -1) ''; } ) diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 6901c9f5555f..93331707ceef 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -36,13 +36,8 @@ stdenv.mkDerivation ( mkdir -p $out/nix-support echo "$system" > $out/nix-support/system - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi + src=$(findTarballs $src | head -1) if test -e $origSrc/nix-support/hydra-release-name; then releaseName=$(cat $origSrc/nix-support/hydra-release-name) diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 0095a2ff8818..feb15267f592 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -30,17 +30,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( # !!! cut&paste from rpm-build.nix postHook = '' - mkdir -p $out/nix-support - cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name - - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. - echo $src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - ''; # */ + . ${./functions.sh} + propagateImageName + src=$(findTarballs $src | head -1) # Find a tarball. + ''; installExtraDebsPhase = '' for i in $extraDebs; do diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh new file mode 100644 index 000000000000..9f2d03519c8c --- /dev/null +++ b/pkgs/build-support/release/functions.sh @@ -0,0 +1,14 @@ +findTarballs() { + local suffix + test -d "$1/tarballs/" && { + for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do + ls $1/tarballs/*.$suffix 2> /dev/null + done | sort + } + echo "$1" +} + +propagateImageName() { + ensureDir $out/nix-support + cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name +} diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 8abbca978750..336563ae285f 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -58,13 +58,9 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. + . ${./functions.sh} origSrc=$src - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz $src/tarballs/*.tar.xz | sort | head -1) - fi + src=$(findTarballs $src | head -1) # Set GCC flags for coverage analysis, if desired. if test -n "${toString doCoverageAnalysis}"; then diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 5eace575366f..708b62302d57 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -14,16 +14,10 @@ vmTools.buildRPM ( name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); preBuild = '' - mkdir -p $out/nix-support - cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name - - # If `src' is the result of a call to `makeSourceTarball', then it - # has a subdirectory containing the actual tarball(s). If there are - # multiple tarballs, just pick the first one. - if test -d $src/tarballs; then - src=$(ls $src/tarballs/*.tar.bz2 $src/tarballs/*.tar.gz | sort | head -1) - fi - ''; # */ + . ${./functions.sh} + propagateImageName + src=$(findTarballs $src | head -1) # Pick the first tarball. + ''; postInstall = '' declare -a rpms rpmNames From db6b88a50b68aeae7a9967df3c261753aff7c6bd Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Tue, 24 Jul 2012 00:41:58 +0200 Subject: [PATCH 0300/1120] attempt on Nix expression for xbmc configure fails while trying to lookup the sonames of some libraries. --- pkgs/applications/multimedia/xbmc/default.nix | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/applications/multimedia/xbmc/default.nix diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix new file mode 100644 index 000000000000..081d61087936 --- /dev/null +++ b/pkgs/applications/multimedia/xbmc/default.nix @@ -0,0 +1,25 @@ +{ + stdenv, fetchurl, boost, mesa, glew, mysql, libass, libmpeg2, libmad, + libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt, + bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng, + pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus, + libbluray +}: + +stdenv.mkDerivation { + buildInputs = [ + boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg + libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig + fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer + SDL_image alsaLib dbus libbluray + ]; + name = "xbmc-11.0"; + src = fetchurl { + url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz; + sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z"; + }; + configurePhase = '' + ./configure || cat config.log + exit 1 + ''; +} From 8c9bef04a6d8253d48a98880dea51bd3fe914395 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Jul 2012 02:26:04 +0000 Subject: [PATCH 0301/1120] linux-3.5: Enable XEN_DOM0 support --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 42ebd8c3943d..364d0545583a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -205,6 +205,7 @@ let USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling X86_CHECK_BIOS_CORRUPTION y X86_MCE y + XEN_DOM0 y # Linux Containers RT_GROUP_SCHED? y From 0b112cb4897cc9dea3f5fd2dcd984afff0a15357 Mon Sep 17 00:00:00 2001 From: Phreedom Date: Tue, 24 Jul 2012 10:47:37 +0300 Subject: [PATCH 0302/1120] F-Prot: package --- pkgs/tools/security/fprot/default.nix | 41 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/security/fprot/default.nix diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix new file mode 100644 index 000000000000..95f7140b9180 --- /dev/null +++ b/pkgs/tools/security/fprot/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + + name = "f-prot-${version}"; + version = "6.2.1"; + + src = fetchurl { + url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz; + sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; + }; + + installPhase = '' + ensureDir $out/bin + cp fpscan $out/bin + + ensureDir $out/opt/f-prot + cp fpupdate $out/opt/f-prot + cp product.data.default $out/opt/f-prot/product.data + cp license.key $out/opt/f-prot/ + cp f-prot.conf.default $out/opt/f-prot/f-prot.conf + ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate + + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate + + ensureDir $out/share/man/ + ensureDir $out/share/man/man1 + cp doc/man/fpscan.1 $out/share/man/man1 + ensureDir $out/share/man/man5 + cp doc/man/f-prot.conf.5 $out/share/man/man5 + ensureDir $out/share/man/man8 + cp doc/man/fpupdate.8 $out/share/man/man8 + ''; + + meta = with stdenv.lib; { + homepage = http://www.f-prot.com; + description = "a popular proprietary antivirus, Linux workstation edition."; + license = licenses.proprietary; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1626ca7802e5..7ca671eb59d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -718,6 +718,8 @@ let fortune = callPackage ../tools/misc/fortune { }; + fprot = callPackage ../tools/security/fprot { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { From 471a9615a22a420738141c30055483a91e735b9f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 24 Jul 2012 14:16:22 +0200 Subject: [PATCH 0303/1120] fix mpich2 and mplayer --- pkgs/applications/video/MPlayer/default.nix | 2 +- pkgs/development/libraries/mpich2/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 3c1cd2ff4472..566089201cda 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype zlib pkgconfig ] - ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 967abe500e26..0ad2d4e47490 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = "--enable-shared --enable-sharedlib"; buildInputs = [ python perl gfortran ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ]; + propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc; patchPhase = '' for i in $(find -type f -not -name Makefile.\*) From bf4c4d7a3627c74c604e26cd6ec4a851d68d1e8f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 11:43:24 -0400 Subject: [PATCH 0304/1120] Revert "ffmpeg: Add optional Jack audio support." This reverts commit fe42f8add91b1616de94f878351f3dd5b44dbcdd. --- pkgs/development/libraries/ffmpeg/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 53868950598a..ee88fd0145cc 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib -, jackSupport ? false, jackaudio ? null , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -13,7 +12,6 @@ , x11grabSupport ? false, libXext ? null, libXfixes ? null }: -assert jackSupport -> jackaudio != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert vorbisSupport -> libvorbis != null; @@ -56,7 +54,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] - ++ stdenv.lib.optional jackSupport jackaudio ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora From 605f9bec529f0fd2e8458883a3be2633b07c9aa8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 11:43:29 -0400 Subject: [PATCH 0305/1120] Revert "ffmpeg: Add alsaLib to dependencies." This reverts commit d9f08cf6f26337efd5a3a4142c38a0963aba31c4. --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index ee88fd0145cc..41768c4e313f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 , mp3Support ? true, lame ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; - buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ] + buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora From bb8ac70291bd7a936bcac1db1ff898de4e964289 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 11:43:30 -0400 Subject: [PATCH 0306/1120] Revert "ffmpeg: Add option to enable x11grab support." This reverts commit 05831d3a668361b2948c0185eceb6d7c579c851a. --- pkgs/development/libraries/ffmpeg/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 41768c4e313f..9b90d56d4d90 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -9,7 +9,6 @@ , vdpauSupport ? true, libvdpau ? null , faacSupport ? false, faac ? null , dc1394Support ? false, libdc1394 ? null -, x11grabSupport ? false, libXext ? null, libXfixes ? null }: assert speexSupport -> speex != null; @@ -20,7 +19,6 @@ assert x264Support -> x264 != null; assert xvidSupport -> xvidcore != null; assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; -assert x11grabSupport -> libXext != null && libXfixes != null; stdenv.mkDerivation rec { name = "ffmpeg-0.11.1"; @@ -50,8 +48,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" - ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" - ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"; + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; buildInputs = [ pkgconfig lame yasm zlib bzip2 ] ++ stdenv.lib.optional mp3Support lame @@ -63,8 +60,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport xvidcore ++ stdenv.lib.optional vdpauSupport libvdpau ++ stdenv.lib.optional faacSupport faac - ++ stdenv.lib.optional dc1394Support libdc1394 - ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]; + ++ stdenv.lib.optional dc1394Support libdc1394; enableParallelBuilding = true; From 63b257e0e1a910ce187028b9af6d26184d5b1958 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 11:43:31 -0400 Subject: [PATCH 0307/1120] Revert "ffmpeg: Update to latest version 0.11.1." This reverts commit c6a2a1f8851bc3896a824219dfc5545a642fba45. --- pkgs/development/libraries/ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 9b90d56d4d90..3b5e28a2ee7f 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.11.1"; + name = "ffmpeg-0.10"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96"; + sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that From e198f4b237c1fcd77608c53c8bfc52316da2e3dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 24 Jul 2012 21:57:18 +0200 Subject: [PATCH 0308/1120] Revert "Update RPM to 4.10.0." Commit e29c284926c2ba3b239c4ee3aaa21aa9396f046a breaks some builds, i.e. . --- pkgs/tools/package-management/rpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 8ed7a2daba5b..b35d3b66ad83 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4, xz }: stdenv.mkDerivation rec { - name = "rpm-4.10.0"; + name = "rpm-4.7.2"; src = fetchurl { - url = "http://rpm.org/releases/rpm-4.10.x/${name}.tar.bz2"; - sha256 = "1ag4pz51npiwf6vcksipjxaypm5afzmy8lj19bp0fk5n6mr26bhf"; + url = "http://rpm.org/releases/rpm-4.7.x/${name}.tar.bz2"; + sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 xz ]; From 912440dae8952f36b17f993f2770fc8e3d2a84e4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 24 Jul 2012 18:34:19 -0400 Subject: [PATCH 0309/1120] dovecot2: Bump to 2.1.8 --- pkgs/servers/mail/dovecot/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/2.x.nix index 294a58b4f24b..d500e5c9bd5d 100644 --- a/pkgs/servers/mail/dovecot/2.x.nix +++ b/pkgs/servers/mail/dovecot/2.x.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, openssl, pam, bzip2, zlib}: stdenv.mkDerivation rec { - name = "dovecot-2.1.7"; + name = "dovecot-2.1.8"; buildInputs = [openssl pam bzip2 zlib]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; - sha256 = "0lpldhs0nvy6rxabqkp14wzcwf1cx4jvnbp1xcm74izrzxhvrdym"; + sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028"; }; # It will hardcode this for /var/lib/dovecot. From 99413d3e3c25b57b96353ac7edb5863b9812fcf7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 13:10:53 -0400 Subject: [PATCH 0310/1120] kbd: Hard-code the path to gzip/bzip2 This is necessary for systemd-vconsole-setup.service in systemd. --- pkgs/os-specific/linux/kbd/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index da45b39cee1e..c9ca75b563df 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, autoconf, automake }: +{ stdenv, fetchurl, bison, flex, autoconf, automake, gzip, bzip2 }: stdenv.mkDerivation rec { name = "kbd-1.15.2"; @@ -10,13 +10,19 @@ stdenv.mkDerivation rec { buildNativeInputs = [ bison flex autoconf automake ]; - # We get a warning in armv5tel-linux and the fuloong2f, - # so we disable -Werror in it - patchPhase = if (stdenv.isArm || - stdenv.system == "mips64el-linux") - then '' - sed -i s/-Werror// src/Makefile.am - '' else ""; + patchPhase = + '' + # Fix the path to gzip/bzip2. + substituteInPlace src/findfile.c \ + --replace gzip ${gzip}/bin/gzip \ + --replace bzip2 ${bzip2}/bin/bzip2 \ + + # We get a warning in armv5tel-linux and the fuloong2f, so we + # disable -Werror in it. + ${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") '' + sed -i s/-Werror// src/Makefile.am + ''} + ''; # Grrr, kbd 1.15.1 doesn't include a configure script. preConfigure = "autoreconf"; From ddb5bd38bb637673a162ede04e96cf7486a936e1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 15:18:21 -0400 Subject: [PATCH 0311/1120] kbd: Update to 1.15.3 --- pkgs/os-specific/linux/kbd/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index c9ca75b563df..4d04b75b3b02 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, bison, flex, autoconf, automake, gzip, bzip2 }: +{ stdenv, fetchurl, gzip, bzip2 }: stdenv.mkDerivation rec { - name = "kbd-1.15.2"; + name = "kbd-1.15.3"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "0ff674y6d3b6ix08b9l2yzv8igns768biyp5y92vip7iz4xv2p2j"; + sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46"; }; - buildNativeInputs = [ bison flex autoconf automake ]; + configureFlags = "--disable-nls"; patchPhase = '' @@ -24,9 +24,6 @@ stdenv.mkDerivation rec { ''} ''; - # Grrr, kbd 1.15.1 doesn't include a configure script. - preConfigure = "autoreconf"; - makeFlags = "setowner= "; meta = { From 6262db94a91a83e1154c4f675f2983edb84ab5d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 22:27:36 -0400 Subject: [PATCH 0312/1120] grub: Update to 2.00 --- pkgs/tools/misc/grub/{1.9x.nix => 2.0x.nix} | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 13 insertions(+), 11 deletions(-) rename pkgs/tools/misc/grub/{1.9x.nix => 2.0x.nix} (88%) diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/2.0x.nix similarity index 88% rename from pkgs/tools/misc/grub/1.9x.nix rename to pkgs/tools/misc/grub/2.0x.nix index 49cc4884e636..ef9d939ed47b 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -2,12 +2,16 @@ , EFIsupport ? false }: let - prefix = "grub${if EFIsupport then "-efi" else ""}"; - version = "1.99"; - unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; + + prefix = "grub${if EFIsupport then "-efi" else ""}"; + + version = "2.00"; + + unifont_bdf = fetchurl { + url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; + sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; + }; + in stdenv.mkDerivation rec { @@ -15,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/grub/grub-${version}.tar.xz"; - sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k"; + sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; }; buildNativeInputs = [ flex bison ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ca671eb59d9..0712efad828e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -830,11 +830,9 @@ let buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; }; - grub19x = callPackage ../tools/misc/grub/1.9x.nix { }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2 = grub19x; - - grub2_efi = callPackage ../tools/misc/grub/1.9x.nix { EFIsupport = true; }; + grub2_efi = grub2.override { EFIsupport = true; }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; From 0d5f1fd833b8856ff90babb31a1b88d043c1c41a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 24 Jul 2012 22:45:26 -0400 Subject: [PATCH 0313/1120] upower: Update to 0.9.17 --- 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 4a8cfbdbc515..71a05486b482 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.16"; + name = "upower-0.9.17"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212"; + sha256 = "0a1j2pg44r6ljj9jgzlw8i5fzabpm2b2jk058kxsr77ciz96i7yg"; }; buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; From d6e12aa1f62788a00f8560be984a755c674b2cd3 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 25 Jul 2012 15:43:34 +0200 Subject: [PATCH 0314/1120] more progress on XBMC build --- pkgs/applications/multimedia/xbmc/default.nix | 51 +++++++++++++++---- pkgs/development/tools/misc/autoconf/2.67.nix | 48 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/tools/misc/autoconf/2.67.nix diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix index 081d61087936..0647652f2c4a 100644 --- a/pkgs/applications/multimedia/xbmc/default.nix +++ b/pkgs/applications/multimedia/xbmc/default.nix @@ -3,23 +3,56 @@ libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt, bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng, pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus, - libbluray + libbluray, libmicrohttpd, libXmu, samba, udev, libusb, python, cmake, hal, + gperf, unzip, avahi, zip, nasm, pulseaudio, ftgl, + + # TODO: Check which of these are actually necessary. + + autoconf, automake, libtool, gettext }: +# TODO: Check whether unzip is actually needed. + stdenv.mkDerivation { - buildInputs = [ - boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg - libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig - fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer - SDL_image alsaLib dbus libbluray - ]; name = "xbmc-11.0"; + src = fetchurl { url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz; sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z"; }; + + buildInputs = [ + boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg + libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig + fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer + SDL_image alsaLib dbus libbluray libmicrohttpd libXmu samba udev libusb + python cmake hal gperf unzip avahi zip nasm pulseaudio ftgl + + autoconf automake libtool gettext + ]; + + # TODO: Can we leave out some of these options? + + dontFixCmake = true; + dontUseCmakeBuildDir = true; + dontUseCmakeConfigure = true; + + # configure performs a SONAME check for some libraries by + # + # > $CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null + # + # The $2 is the library name under inspection, e.g. bluray. However, the + # option -o /dev/null raises an error. Since this doesn't appear to be + # necessary, we can simply remove this option. Note that ./configure is + # generated by ./bootstrap. + + patchPhase = '' + sed -i 's@CC -nostdlib -o /dev/null@CC -nostdlib@g' configure.in + ''; + configurePhase = '' - ./configure || cat config.log - exit 1 + ./bootstrap + ./configure --prefix="$out" ''; } + diff --git a/pkgs/development/tools/misc/autoconf/2.67.nix b/pkgs/development/tools/misc/autoconf/2.67.nix new file mode 100644 index 000000000000..71e67b1f21cc --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/2.67.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, m4, perl }: + +stdenv.mkDerivation rec { + name = "autoconf-2.67"; + + src = fetchurl { + url = "mirror://gnu/autoconf/${name}.tar.xz"; + sha256 = "80c6bda1dd6ab04510d42f594c69a06f98dc5e589683b03c11abd89270502ac1"; + }; + + buildInputs = [ m4 perl ]; + + # Work around a known issue in Cygwin. See + # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for + # details. + # There are many test failures on `i386-pc-solaris2.11'. + # doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + # doCheck = false; + # TODO: Enable tests again. + + # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the + # "fixed" path in generated files! + dontPatchShebangs = true; + + enableParallelBuilding = true; + + preCheck = + # Make the Autotest test suite run in parallel. + '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" + ''; + + meta = { + homepage = http://www.gnu.org/software/autoconf/; + description = "GNU Autoconf, a part of the GNU Build System"; + + longDescription = '' + GNU Autoconf is an extensible package of M4 macros that produce + shell scripts to automatically configure software source code + packages. These scripts can adapt the packages to many kinds of + UNIX-like systems without manual user intervention. Autoconf + creates a configuration script for a package from a template + file that lists the operating system features that the package + can use, in the form of M4 macro calls. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7498fb7638c7..6d782e04fad2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2848,6 +2848,8 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; + autoconf267 = callPackage ../development/tools/misc/autoconf/2.67.nix { }; + automake = automake112x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; @@ -8752,4 +8754,8 @@ let bullet = callPackage ../development/libraries/bullet {}; + xbmc = callPackage ../applications/multimedia/xbmc { + #autoconf = autoconf267; + }; + }; in pkgs From d4d1f785dbf309d4284f1205a3ec9cf41d5a2d48 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 25 Jul 2012 15:45:17 +0200 Subject: [PATCH 0315/1120] removed unofficial autoconf-2.67 from xbmc branch --- pkgs/development/tools/misc/autoconf/2.67.nix | 48 ------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 54 deletions(-) delete mode 100644 pkgs/development/tools/misc/autoconf/2.67.nix diff --git a/pkgs/development/tools/misc/autoconf/2.67.nix b/pkgs/development/tools/misc/autoconf/2.67.nix deleted file mode 100644 index 71e67b1f21cc..000000000000 --- a/pkgs/development/tools/misc/autoconf/2.67.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, m4, perl }: - -stdenv.mkDerivation rec { - name = "autoconf-2.67"; - - src = fetchurl { - url = "mirror://gnu/autoconf/${name}.tar.xz"; - sha256 = "80c6bda1dd6ab04510d42f594c69a06f98dc5e589683b03c11abd89270502ac1"; - }; - - buildInputs = [ m4 perl ]; - - # Work around a known issue in Cygwin. See - # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for - # details. - # There are many test failures on `i386-pc-solaris2.11'. - # doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); - # doCheck = false; - # TODO: Enable tests again. - - # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the - # "fixed" path in generated files! - dontPatchShebangs = true; - - enableParallelBuilding = true; - - preCheck = - # Make the Autotest test suite run in parallel. - '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" - ''; - - meta = { - homepage = http://www.gnu.org/software/autoconf/; - description = "GNU Autoconf, a part of the GNU Build System"; - - longDescription = '' - GNU Autoconf is an extensible package of M4 macros that produce - shell scripts to automatically configure software source code - packages. These scripts can adapt the packages to many kinds of - UNIX-like systems without manual user intervention. Autoconf - creates a configuration script for a package from a template - file that lists the operating system features that the package - can use, in the form of M4 macro calls. - ''; - - license = "GPLv2+"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d782e04fad2..7498fb7638c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2848,8 +2848,6 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; - autoconf267 = callPackage ../development/tools/misc/autoconf/2.67.nix { }; - automake = automake112x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; @@ -8754,8 +8752,4 @@ let bullet = callPackage ../development/libraries/bullet {}; - xbmc = callPackage ../applications/multimedia/xbmc { - #autoconf = autoconf267; - }; - }; in pkgs From 96fd0e446ae701ea48a6a8f1f3889d4e07f35da2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:10 +0200 Subject: [PATCH 0316/1120] haskell-HsOpenSSL: update to version 0.10.3.2 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 202130516948..3a4c94e33a25 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.1"; - sha256 = "0dilmaibx18mfg4c8g96c1svhynhkrq4i5zzv3wg0a550g3xc0py"; + version = "0.10.3.2"; + sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { From acd0cdbe727dd8d6293e3af5d3b0d6383e4e93ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:10 +0200 Subject: [PATCH 0317/1120] haskell-comonad-transformers: update to version 3.0 --- .../libraries/haskell/comonad-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 1dd7c212c714..bc378235b91a 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonad-transformers"; - version = "2.1.2"; - sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis"; + version = "3.0"; + sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers From 1d5c4851a0bd51bb3fb28a8080ae43faf46471b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:10 +0200 Subject: [PATCH 0318/1120] haskell-comonad: update to version 3.0.0.1 --- pkgs/development/libraries/haskell/comonad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 53e014fb8ac9..b73e29fc1e0c 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "comonad"; - version = "1.1.1.6"; - sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; + version = "3.0.0.1"; + sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz"; buildDepends = [ semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/comonad/"; From 2cadf555b09e924910b08acb57287c00c13a8b53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:11 +0200 Subject: [PATCH 0319/1120] haskell-data-lens: update to version 2.10.1 --- pkgs/development/libraries/haskell/data-lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 42e6c9f1518b..48d49324bb54 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "data-lens"; - version = "2.10.0"; - sha256 = "0y3rl9axakvz6kwmh08aabbz1z7y38wyrygmg4m6xby02cqbq5gk"; + version = "2.10.1"; + sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh"; buildDepends = [ comonad comonadTransformers semigroupoids transformers ]; From 6d7f1e10adde61abe482b395ee94575376a5a8a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:11 +0200 Subject: [PATCH 0320/1120] haskell-semigroupoids: update to version 3.0 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 776e452eafe7..4ffc3c2badce 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "1.3.4"; - sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph"; + version = "3.0"; + sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; From 99903896a8aab74dbbe978ca3d0ca7a0ef43fcb7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:11 +0200 Subject: [PATCH 0321/1120] haskell-snap: update to version 0.9.1.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index c20ee0318ede..505c9bcb0cc3 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.9.0.1"; - sha256 = "0n3qmyvqqcds3c56ml77d2cr0ghs1c7wwd20m44zzmxxmpbnfmgh"; + version = "0.9.1.1"; + sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z"; isLibrary = true; isExecutable = true; buildDepends = [ From 076d0635b3e20d6c2fcae1f94d7f4bf0f2e895e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:12 +0200 Subject: [PATCH 0322/1120] haskell-tls: update to version 0.9.8 --- 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 60fa129d9d42..3a225361fb32 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 = "0.9.7"; - sha256 = "0px34l6lw6nv3cbnrgf8ajwja7ifd1pckddmbvrbwk6q459w1pjh"; + version = "0.9.8"; + sha256 = "022hak5wy47j4zpf2f89zvz4j2586s3d0a5jkxvz54dkqimy63r6"; isLibrary = true; isExecutable = true; buildDepends = [ From 2302e45632424aae16c780d8ca7211fd0e91f778 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 25 Jul 2012 15:48:12 +0200 Subject: [PATCH 0323/1120] haskell-vector-space: update to version 0.8.2 --- pkgs/development/libraries/haskell/vector-space/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index d24dc536da1f..2957959f005b 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.1"; - sha256 = "0khbi46i9q585nhxhf842wsdifcj1i1dqm84hj0r36474rfh55z5"; + version = "0.8.2"; + sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { homepage = "http://haskell.org/haskellwiki/vector-space"; From a9cd20e601a7bccc4c19434bc7dc379cf9a78e39 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 10:26:34 -0400 Subject: [PATCH 0324/1120] v8: Update to 3.11.10.15 --- pkgs/development/libraries/v8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index a7630ee5d692..de1c9074208d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,14 +5,14 @@ assert readline != null; let system = stdenv.system; arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; - version = "3.6.6.25"; + version = "3.11.10.15"; in assert arch != ""; stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "2a097cbea29a8488419840245bf7bf85513941ceb22c5ef0a3825bfe5edaa045"; + sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi"; }; buildInputs = [python scons readline makeWrapper]; From 6a3ea47c4e7515e4d7469b1af3ea4060f5531597 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 10:45:04 -0400 Subject: [PATCH 0325/1120] node: Update to 0.8.3 --- pkgs/development/web/nodejs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index ef45825a5848..980423598575 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false }: +{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }: stdenv.mkDerivation rec { - version = "0.6.19"; + version = "0.8.3"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1frgnl7i111b8x3fr43lh3zybwsszn0daa661gszq7dhfwj2jcsf"; + sha256 = "0dgcw6qpgvsxcvcbkmvpjz2i9f2r286zcrcg0jnxnds9fj41s2k0"; }; configureFlags = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch; prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} + sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure ''; postInstall = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node ''; - buildInputs = [ python openssl v8 zlib ]; + buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux; meta = with stdenv.lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; From 7f4b27f46416f7a7cc68d43ac5869ed643443be6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 10:55:49 -0400 Subject: [PATCH 0326/1120] Add gyp python package --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8327ddaaae4..0b2139a8c68e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -848,6 +848,27 @@ let pythonPackages = python.modules // rec { }; + gyp = buildPythonPackage rec { + rev = "1435"; + name = "gyp-r${rev}"; + + src = fetchsvn { + url = "http://gyp.googlecode.com/svn/trunk"; + inherit rev; + sha256 = "1wmd1svx5344alb8ff9vzdam1ccqdl0h7shp1xnsk843hqwc0fz0"; + }; + + doCheck = false; + + postUnpack = "find . -print0 | xargs -0 touch"; + + meta = { + homepage = http://code.google.com/p/gyp; + description = "Generate Your Projects"; + }; + }; + + httplib2 = buildPythonPackage rec { name = "httplib2-0.6.0"; From 3a37f47fd41763dd405482ba04b759ebe36a6660 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 11:42:15 -0400 Subject: [PATCH 0327/1120] v8: build with gyp. The scons build has been deprecated --- pkgs/development/libraries/v8/default.nix | 32 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index de1c9074208d..d8518f3bb4dc 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, python, scons, readline, makeWrapper }: +{ stdenv, fetchsvn, gyp, readline, python }: assert readline != null; @@ -7,7 +7,9 @@ let arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else ""; version = "3.11.10.15"; in + assert arch != ""; + stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { @@ -15,22 +17,26 @@ stdenv.mkDerivation rec { sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi"; }; - buildInputs = [python scons readline makeWrapper]; - - buildPhase = '' - export CXX=`type -p g++` - export CPPPATH=${readline}/include - export LIBPATH=${readline}/lib - scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8 + configurePhase = '' + mkdir build/gyp + ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; + buildInputs = [ readline python ]; + + buildFlags = [ + "library=shared" + "console=readline" + "${arch}.release" + ]; + + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin mkdir -p $out/lib - - cp -v libv8.* $out/lib - cp -v d8 $out/bin/d8 - cp -vR include $out/ - wrapProgram $out/bin/d8 --set ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} $out/lib + mv -v out/${arch}.release/d8 $out/bin + mv -v out/${arch}.release/lib.target/libv8.so $out/lib + mv -v include $out/ ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0712efad828e..4f3d4b4c0d7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5004,7 +5004,7 @@ let inherit (gnome) libsoup; }; - v8 = callPackage ../development/libraries/v8 { }; + v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; }; xalanj = xalanJava; xalanJava = callPackage ../development/libraries/java/xalanj { From 003ea37724749c813d500f7e0145040119fdd04a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 25 Jul 2012 18:03:09 +0200 Subject: [PATCH 0328/1120] ipython: Update to 0.13. --- pkgs/shells/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 8e430df52904..a64c20520561 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages }: buildPythonPackage rec { - name = "ipython-0.11"; + name = "ipython-0.13"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - md5 = "efc899e752a4a4a67a99575cea1719ef"; + sha256 = "1m4m0zf3llnicfgrbnl2h08p3662px7v2pzbhq4fq24vnyz6x5w2"; }; propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 ]; From beb64d1bea51719fb3e592e9c4a0cf9ac2a1db67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 25 Jul 2012 18:12:59 +0200 Subject: [PATCH 0329/1120] readline: picking more patches from upstream I'm particularly interested in 003, which solves a copy-paste trouble I have copying matrices into octave, having enabled fltk. --- pkgs/development/libraries/readline/readline-6.2-patches.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix index 4e0ff2135271..719face21355 100644 --- a/pkgs/development/libraries/readline/readline-6.2-patches.nix +++ b/pkgs/development/libraries/readline/readline-6.2-patches.nix @@ -3,4 +3,6 @@ patch: [ (patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") (patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") +(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb") +(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89") ] From 830aa1a2f063593fe799f17846ee2d7bd67c818a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 14:31:21 -0400 Subject: [PATCH 0330/1120] ipw2100-fw: Drop runtime dependency on binutils etc. --- pkgs/os-specific/linux/firmware/ipw2100/default.nix | 5 +++-- pkgs/os-specific/linux/firmware/ipw2200/default.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix index 617a6cc38dda..abc6bf08dac9 100644 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "ipw2100-fw-1.3"; + src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz; sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471"; @@ -13,7 +14,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "mkdir -p $out; cp * $out"; + installPhase = "mkdir -p $out; cp ipw* LICENSE $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index ec1607ff2f73..5c4989b878a6 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "ipw2200-fw-3.1"; + src = fetchurl { url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz; sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6"; From 7bfdeb102bdeadb683e583275a9c71b7bc13d936 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 14:49:16 -0400 Subject: [PATCH 0331/1120] kde-workspace: Disable parallel building Maybe this fixes this build failure: In file included from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.h:28:0, from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.cpp:20: /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner_config.h:24:34: fatal error: ui_killrunner_config.h: No such file or directory compilation terminated. http://hydra.nixos.org/build/2837527 --- pkgs/desktops/kde-4.7/kde-workspace.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 20fc5b564554..8116f4bb6b59 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -27,6 +27,8 @@ kde { --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 ''; + enableParallelBuilding = false; + meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; license = "GPLv2"; From c516517656064e21404385b1dd3ca3856abaa013 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 17:46:21 -0400 Subject: [PATCH 0332/1120] Add empty node-packages.nix using build-node-package.nix from npm2nix. buildNodePackage is a function to build npm packages. npm2nix (https://bitbucket.org/shlevy/npm2nix) can be used to generate subexpressions to go in node-packages.nix --- .../web/nodejs/build-node-package.nix | 35 +++++++++++++++++++ pkgs/top-level/node-packages.nix | 12 +++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/web/nodejs/build-node-package.nix create mode 100644 pkgs/top-level/node-packages.nix diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix new file mode 100644 index 000000000000..56941ddf27e7 --- /dev/null +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -0,0 +1,35 @@ +{ stdenv, nodejs }: + +args @ { src, deps, ... }: + +stdenv.mkDerivation ({ + unpackPhase = "true"; + + configurePhase = '' + runHook preConfigure + mkdir node_modules + ${stdenv.lib.concatStrings (map (dep: '' + ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/ + '') deps)} + export HOME=$(pwd) + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + ${nodejs}/bin/npm --registry http://www.example.com install ${src} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + mv node_modules $out + if [ -d "$out/node_modules/.bin" ]; then + ln -sv node_modules/.bin $out/bin + find -L $out/node_modules/.bin/* -type f -print0 | \ + xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@' + fi + runHook postInstall + ''; +} // args) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix new file mode 100644 index 000000000000..ae9ddad09ef0 --- /dev/null +++ b/pkgs/top-level/node-packages.nix @@ -0,0 +1,12 @@ +{ pkgs, stdenv, nodejs }: + +let buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs; +}; in + +with pkgs; + +let self = { +}; + +in self From e2576899c16f389d27410f47db79d3340a04140a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 17:51:19 -0400 Subject: [PATCH 0333/1120] Add coffee-script node package --- pkgs/top-level/node-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ae9ddad09ef0..1787b2e31d88 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -7,6 +7,18 @@ let buildNodePackage = import ../development/web/nodejs/build-node-package.nix { with pkgs; let self = { + "coffee-script" = self."coffee-script-1.3.3"; + + "coffee-script-1.3.3" = buildNodePackage rec { + name = "coffee-script-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; + }; + deps = [ + + ]; + }; }; in self From 6a4887475b4917e4a803a2acbc9596fd6e945cd3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 17:51:33 -0400 Subject: [PATCH 0334/1120] Add nodePackages attr to all-packages --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f3d4b4c0d7b..1ceb8dceb347 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -973,6 +973,10 @@ let nodejs = callPackage ../development/web/nodejs {}; + nodePackages = recurseIntoAttrs (import ./node-packages.nix { + inherit pkgs stdenv nodejs; + }); + ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; @@ -5020,7 +5024,6 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; - ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; From 42da3759a21c64306fc17b658cf7052a5fca97a6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 17:53:02 -0400 Subject: [PATCH 0335/1120] Remove the 'with pkgs;' from node-packages.nix. Packages depending on non-node packages should refer to their deps with pkgs.name --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/node-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ceb8dceb347..fe8604fbed07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -974,7 +974,7 @@ let nodejs = callPackage ../development/web/nodejs {}; nodePackages = recurseIntoAttrs (import ./node-packages.nix { - inherit pkgs stdenv nodejs; + inherit pkgs stdenv nodejs fetchurl; }); ldns = callPackage ../development/libraries/ldns { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 1787b2e31d88..d263e68981ad 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,11 +1,9 @@ -{ pkgs, stdenv, nodejs }: +{ pkgs, stdenv, nodejs, fetchurl }: let buildNodePackage = import ../development/web/nodejs/build-node-package.nix { inherit stdenv nodejs; }; in -with pkgs; - let self = { "coffee-script" = self."coffee-script-1.3.3"; From b0552eb9ca9b3b3097087271a8b60f8e49ae72b1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 25 Jul 2012 18:11:57 -0400 Subject: [PATCH 0336/1120] Add npm2nix --- .../tools/node/npm2nix/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/node/npm2nix/default.nix diff --git a/pkgs/development/tools/node/npm2nix/default.nix b/pkgs/development/tools/node/npm2nix/default.nix new file mode 100644 index 000000000000..8300a7e2bc33 --- /dev/null +++ b/pkgs/development/tools/node/npm2nix/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, coffeescript }: + +let version = "0.1"; in + +stdenv.mkDerivation rec { + name = "npm2nix-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/shlevy/npm2nix/get/${version}.tar.bz2"; + sha256 = "14rfs114k02yc9gx0bcjqy67f9cqgkrr1dccwlzl09q9b6qs1k3k"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + sed 's|#!/usr/bin/env coffee|#!${coffeescript}/bin/coffee|' npm2nix.coffee \ + > $out/bin/npm2nix + chmod +x $out/bin/npm2nix + ''; + + meta = { + description = "A tool to generate nix expressions from npm packages"; + maintainer = stdenv.lib.maintainers.shlevy; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe8604fbed07..292900b242bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -977,6 +977,10 @@ let inherit pkgs stdenv nodejs fetchurl; }); + npm2nix = callPackage ../development/tools/node/npm2nix { + coffeescript = nodePackages."coffee-script"; + }; + ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; From 403e59420710d8221a3d3ce47be1d15b4d9dcb3d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 15:35:51 -0400 Subject: [PATCH 0337/1120] ec2-ami-tools: Update to 1.6.0.0 --- .../{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix | 4 ++-- .../writable.patch | 0 .../{amazon-ec2-api-tools => ec2-api-tools}/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/default.nix (93%) rename pkgs/tools/virtualization/{amazon-ec2-ami-tools => ec2-ami-tools}/writable.patch (100%) rename pkgs/tools/virtualization/{amazon-ec2-api-tools => ec2-api-tools}/default.nix (75%) diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix similarity index 93% rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix rename to pkgs/tools/virtualization/ec2-ami-tools/default.nix index b05596ed50ac..1420ab5eeeb0 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ec2-ami-tools-1.4.0.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; + url = "http://nixos.org/tarballs/${name}.zip"; sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip"; }; diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/ec2-ami-tools/writable.patch similarity index 100% rename from pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch rename to pkgs/tools/virtualization/ec2-ami-tools/writable.patch diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix similarity index 75% rename from pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix rename to pkgs/tools/virtualization/ec2-api-tools/default.nix index a85d4223b714..22669c67b121 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "ec2-api-tools-1.5.3.0"; +stdenv.mkDerivation rec { + name = "ec2-api-tools-1.6.0.0"; src = fetchurl { - url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip; - sha256 = "15mxjay8pr6cvlmp9hdsg5z7zc15bicjrc30f27rknq72zyhxi8h"; + url = "http://nixos.org/tarballs/${name}.zip"; + sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292900b242bd..bf3e058b30dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -383,9 +383,9 @@ let }; }; - ec2apitools = callPackage ../tools/virtualization/amazon-ec2-api-tools { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; - ec2amitools = callPackage ../tools/virtualization/amazon-ec2-ami-tools { }; + ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; altermime = callPackage ../tools/networking/altermime {}; From 03f9026ac5ce7568c4b5c28d30552f869e229c63 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 16:24:18 -0400 Subject: [PATCH 0338/1120] buildEnv: don't warn about collisions in propagated packages This mimicks buildenv in Nix more closely. --- pkgs/build-support/buildenv/builder.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 71502c9f6683..08331b178f4f 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -66,7 +66,7 @@ sub findFiles { unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { if ($ignoreCollisions) { - warn "collision between `$target' and `$oldTarget'"; + warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1; return; } else { die "collision between `$target' and `$oldTarget'"; @@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) { my @pkgDirs = keys %postponed; %postponed = (); foreach my $pkgDir (sort @pkgDirs) { - addPkg($pkgDir, 1); + addPkg($pkgDir, 2); } } From d3fb3157d125cdf9ca107d36b632c84060c32e6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 16:28:58 -0400 Subject: [PATCH 0339/1120] autossh: Fix indentation and add to the channel --- pkgs/tools/networking/autossh/default.nix | 43 +++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 2cf17f296031..0c32b1c12400 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -1,23 +1,28 @@ {stdenv, fetchurl, openssh}: stdenv.mkDerivation { - name="autossh-1.4b"; - src = fetchurl { - url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz"; - md5 = "8f9aa006f6f69e912d3c2f504622d6f7"; - }; - buildInputs = [ openssh ]; - installPhase = '' -install -D -m755 autossh $out/bin/autossh || return 1 -install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 -install -D -m644 README $out/share/doc/autossh/README || return 1 -install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1 -install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 -install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 - ''; - meta = { - homepage = http://www.harding.motd.ca/autossh/; - description = "Automatically restart SSH sessions and tunnels"; - }; + name = "autossh-1.4b"; + + src = fetchurl { + url = "http://www.harding.motd.ca/autossh/autossh-1.4b.tgz"; + md5 = "8f9aa006f6f69e912d3c2f504622d6f7"; + }; + + buildInputs = [ openssh ]; + + installPhase = + '' + install -D -m755 autossh $out/bin/autossh || return 1 + install -D -m644 CHANGES $out/share/doc/autossh/CHANGES || return 1 + install -D -m644 README $out/share/doc/autossh/README || return 1 + install -D -m644 autossh.host $out/share/autossh/examples/autossh.host || return 1 + install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 + install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 + ''; + + meta = { + homepage = http://www.harding.motd.ca/autossh/; + description = "Automatically restart SSH sessions and tunnels"; + platforms = stdenv.lib.platforms.linux; + }; } - From 732ea6382ae159971c1ce23352555f7b8f6fbe87 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 17:30:01 -0400 Subject: [PATCH 0340/1120] shadow: Update to 4.1.5.1 Fixes CVE-2005-4890 and CVE-2011-0721. --- pkgs/os-specific/linux/shadow/default.nix | 16 ++++++++------ pkgs/os-specific/linux/shadow/keep-path.patch | 21 ++++++++----------- .../linux/shadow/no-sanitize-env.patch | 16 -------------- pkgs/os-specific/linux/shadow/su-name.patch | 20 ------------------ 4 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 pkgs/os-specific/linux/shadow/no-sanitize-env.patch delete mode 100644 pkgs/os-specific/linux/shadow/su-name.patch diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index f14b249d5144..e673a7e30881 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchurl, pam ? null, glibcCross ? null }: let - glibc = if stdenv ? cross - then glibcCross - else assert stdenv ? glibc; stdenv.glibc; + + glibc = + if stdenv ? cross + then glibcCross + else assert stdenv ? glibc; stdenv.glibc; + in + stdenv.mkDerivation rec { - name = "shadow-4.1.4.2"; + name = "shadow-4.1.5.1"; src = fetchurl { url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2"; - sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p"; + sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; - patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ]; + patches = [ ./keep-path.patch ]; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/os-specific/linux/shadow/keep-path.patch index 4b8406b53b08..99fd17c27bc9 100644 --- a/pkgs/os-specific/linux/shadow/keep-path.patch +++ b/pkgs/os-specific/linux/shadow/keep-path.patch @@ -1,18 +1,15 @@ -Don't reset $PATH to /bin:/usr/bin. This is consistent with `su' in -coreutils and important on NixOS. - -diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c ---- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200 -+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:23:11.000000000 +0200 -@@ -827,6 +827,7 @@ - (void) signal (SIGINT, SIG_DFL); - (void) signal (SIGQUIT, SIG_DFL); +diff -ru shadow-4.1.5.1-orig/src/su.c shadow-4.1.5.1/src/su.c +--- shadow-4.1.5.1-orig/src/su.c 2012-05-25 07:51:55.000000000 -0400 ++++ shadow-4.1.5.1/src/su.c 2012-07-25 17:22:57.013547930 -0400 +@@ -879,6 +879,7 @@ + } + } +#if 0 - cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); + cp = getdef_str ((pw->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); if (NULL == cp) { - addenv ("PATH=/bin:/usr/bin", NULL); -@@ -835,6 +836,7 @@ + addenv ((pw->pw_uid == 0) ? "PATH=/sbin:/bin:/usr/sbin:/usr/bin" : "PATH=/bin:/usr/bin", NULL); +@@ -887,6 +888,7 @@ } else { addenv ("PATH", cp); } diff --git a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch b/pkgs/os-specific/linux/shadow/no-sanitize-env.patch deleted file mode 100644 index 902706d137eb..000000000000 --- a/pkgs/os-specific/linux/shadow/no-sanitize-env.patch +++ /dev/null @@ -1,16 +0,0 @@ -Don't remove environment variables such as PATH or SHELL. - -http://bugs.gentoo.org/show_bug.cgi?id=301957 -https://alioth.debian.org/scm/browser.php?group_id=30580 - ---- a/src/su.c -+++ b/src/su.c -@@ -342,7 +342,7 @@ - #endif - #endif /* !USE_PAM */ - -- sanitize_env (); -+ /* sanitize_env (); */ - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/pkgs/os-specific/linux/shadow/su-name.patch b/pkgs/os-specific/linux/shadow/su-name.patch deleted file mode 100644 index 5873c9342748..000000000000 --- a/pkgs/os-specific/linux/shadow/su-name.patch +++ /dev/null @@ -1,20 +0,0 @@ -When su is invoked with command line arguments for the shell (e.g. "su -- -c 'cmd'"), set argv[0] in the shell to "-su" or "-" (as -determined by the SU_NAME option in /etc/login.defs). This is -necessary to make Bash compiled with the NON_INTERACTIVE_LOGIN_SHELLS -option to read startup files. It is also consistent with the -behaviour of `su' in coreutils, and with the case where there are no -arguments ("su -"). - -diff -ru -x '*~' shadow-4.1.4.2-orig/src/su.c shadow-4.1.4.2/src/su.c ---- shadow-4.1.4.2-orig/src/su.c 2009-07-23 22:38:56.000000000 +0200 -+++ shadow-4.1.4.2/src/su.c 2010-06-04 13:02:24.000000000 +0200 -@@ -983,7 +983,7 @@ - * Use the shell and create an argv - * with the rest of the command line included. - */ -- argv[-1] = shellstr; -+ argv[-1] = cp; - #ifndef USE_PAM - execve_shell (shellstr, &argv[-1], environ); - err = errno; From 60a63886f037d29dcd2d1850aa50a42c45d95c9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 17:36:34 -0400 Subject: [PATCH 0341/1120] =?UTF-8?q?shadow:=20Don't=20install=20=E2=80=98?= =?UTF-8?q?groups=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Coreutils already provides this command. --- pkgs/os-specific/linux/shadow/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e673a7e30881..d401a04e6b92 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd ''; + # Don't install ‘groups’, since coreutils already provides it. + postInstall = + '' + rm $out/bin/groups $out/share/man/man1/groups.* + ''; + meta = { homepage = http://pkg-shadow.alioth.debian.org/; description = "Suite containing authentication-related tools such as passwd and su"; From b044cac2fc360740f9d11f01257b6d7986e06513 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 17:43:50 -0400 Subject: [PATCH 0342/1120] sysvinit: Don't install mountpoint and wall These are already provided by util-linux. --- pkgs/os-specific/linux/sysvinit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index c088d3c5b1b2..7b3ea62ea2df 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { rm -rf $out/include rm -rf $out/share/man/man5 rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5') + rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1} ''; meta = { From 7bd3cf21a5cb77d4f4aa8767b59b9ad29862752f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 22:04:43 -0400 Subject: [PATCH 0343/1120] ntfs-3g: Update to 2012.1.15 --- pkgs/tools/filesystems/ntfs-3g/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 2a8bef6c6edd..cedb8df39d14 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "ntfs-3g_ntfsprogs"; - version = "2011.4.12"; + version = "2012.1.15"; name = "${pname}-${version}"; buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://tuxera.com/opensource/${name}.tgz"; - sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a"; + sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg"; }; patchPhase = '' From 1d44578b48e7a9afe1ecc982bc3bf94fc28bd591 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 23:16:57 -0400 Subject: [PATCH 0344/1120] Add ciopfs --- pkgs/tools/filesystems/ciopfs/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/filesystems/ciopfs/default.nix diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix new file mode 100644 index 000000000000..f944e591a126 --- /dev/null +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, fuse, glib, attr }: + +stdenv.mkDerivation rec { + name = "ciopfs-0.4"; + + src = fetchurl { + url = "http://www.brain-dump.org/projects/ciopfs/${name}.tar.gz"; + sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; + }; + + buildInputs = [ pkgconfig fuse glib attr ]; + + makeFlags = "DESTDIR=$(out) PREFIX="; + + meta = { + homepage = http://www.brain-dump.org/projects/ciopfs/; + description = "A case-insensitive filesystem layered on top of any other filesystem"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf3e058b30dc..88d62eb5ffad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -519,6 +519,8 @@ let cksfv = callPackage ../tools/networking/cksfv { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; + colordiff = callPackage ../tools/text/colordiff { }; convertlit = callPackage ../tools/text/convertlit { }; From da63b3d2e7da3e21c4dccefa5bf6c580c1372318 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Jul 2012 11:06:46 +0200 Subject: [PATCH 0345/1120] haskell-benchpress: update to version 0.2.2.6 --- pkgs/development/libraries/haskell/benchpress/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 4d4b145bb08a..c80f04f966db 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "benchpress"; - version = "0.2.2.5"; - sha256 = "0md66nnn9ad8f3y0dd411plnza59fvhfd6nibag3a556bpfa0kgs"; + version = "0.2.2.6"; + sha256 = "19ygaf2g4yqkfbc6bw6fmf9jsymbj1iallzvl0zw3vjx860rchfg"; buildDepends = [ mtl time ]; - patchPhase = '' - sed -i -e 's|mtl .*,|mtl,|' benchpress.cabal - ''; meta = { homepage = "http://github.com/tibbe/benchpress"; description = "Micro-benchmarking with detailed statistics"; From 932574a52938c933540ce2ba572dd1a73cb45c97 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 26 Jul 2012 12:17:26 +0200 Subject: [PATCH 0346/1120] Add package haskell-snap and dependencies comonad-1.1.1.6 comonad-3.0.0.1 configurator-0.2.0.0 contravariant-0.2.0.2 data-lens-2.10.1 data-lens-template-2.1.5 distributive-0.2.2 heist-0.8.1.1 semigroupoids-1.3.4 snap-0.9.1.1 xmlhtml-0.2.0.0 --- .../haskell/comonad-transformers/default.nix | 19 +++++++++++++ .../libraries/haskell/comonad/1.1.1.6.nix | 14 ++++++++++ .../libraries/haskell/comonad/default.nix | 14 ++++++++++ .../haskell/configurator/default.nix | 18 ++++++++++++ .../haskell/contravariant/default.nix | 14 ++++++++++ .../haskell/data-lens-template/default.nix | 14 ++++++++++ .../libraries/haskell/data-lens/default.nix | 17 +++++++++++ .../haskell/distributive/default.nix | 14 ++++++++++ .../libraries/haskell/heist/default.nix | 21 ++++++++++++++ .../haskell/semigroupoids/default.nix | 14 ++++++++++ .../libraries/haskell/snap/snap.nix | 28 +++++++++++++++++++ .../libraries/haskell/xmlhtml/default.nix | 17 +++++++++++ pkgs/top-level/haskell-packages.nix | 26 +++++++++++++++++ 13 files changed, 230 insertions(+) create mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix create mode 100644 pkgs/development/libraries/haskell/comonad/1.1.1.6.nix create mode 100644 pkgs/development/libraries/haskell/comonad/default.nix create mode 100644 pkgs/development/libraries/haskell/configurator/default.nix create mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix create mode 100644 pkgs/development/libraries/haskell/distributive/default.nix create mode 100644 pkgs/development/libraries/haskell/heist/default.nix create mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix create mode 100644 pkgs/development/libraries/haskell/snap/snap.nix create mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix new file mode 100644 index 000000000000..1dd7c212c714 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, contravariant, distributive, semigroupoids +, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "comonad-transformers"; + version = "2.1.2"; + sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis"; + buildDepends = [ + comonad contravariant distributive semigroupoids semigroups + transformers + ]; + meta = { + homepage = "http://github.com/ekmett/comonad-transformers/"; + description = "Comonad transformers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix new file mode 100644 index 000000000000..53e014fb8ac9 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "1.1.1.6"; + sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; + buildDepends = [ semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/comonad/"; + description = "Haskell 98 compatible comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix new file mode 100644 index 000000000000..b73e29fc1e0c --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "3.0.0.1"; + sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz"; + buildDepends = [ semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/comonad/"; + description = "Haskell 98 compatible comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix new file mode 100644 index 000000000000..0c4c610106ef --- /dev/null +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, hashable, text, unixCompat +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "configurator"; + version = "0.2.0.0"; + sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la"; + buildDepends = [ + attoparsec hashable text unixCompat unorderedContainers + ]; + meta = { + homepage = "http://github.com/bos/configurator"; + description = "Configuration management"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix new file mode 100644 index 000000000000..526b9e1f9973 --- /dev/null +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "contravariant"; + version = "0.2.0.2"; + sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/contravariant/"; + description = "Haskell 98 contravariant functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix new file mode 100644 index 000000000000..fc058b92e547 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -0,0 +1,14 @@ +{ cabal, dataLens }: + +cabal.mkDerivation (self: { + pname = "data-lens-template"; + version = "2.1.5"; + sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc"; + buildDepends = [ dataLens ]; + meta = { + homepage = "http://github.com/ekmett/data-lens-template/"; + description = "Utilities for Data.Lens"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix new file mode 100644 index 000000000000..48d49324bb54 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -0,0 +1,17 @@ +{ cabal, comonad, comonadTransformers, semigroupoids, transformers +}: + +cabal.mkDerivation (self: { + pname = "data-lens"; + version = "2.10.1"; + sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh"; + buildDepends = [ + comonad comonadTransformers semigroupoids transformers + ]; + meta = { + homepage = "http://github.com/roconnor/data-lens/"; + description = "Haskell 98 Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix new file mode 100644 index 000000000000..a8b07c608d8a --- /dev/null +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "distributive"; + version = "0.2.2"; + sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/distributive/"; + description = "Haskell 98 Distributive functors -- Dual to Traversable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix new file mode 100644 index 000000000000..44ba8ba15ee5 --- /dev/null +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree +, filepath, MonadCatchIOTransformers, mtl, random, text, time +, transformers, unorderedContainers, vector, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "heist"; + version = "0.8.1.1"; + sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + buildDepends = [ + aeson attoparsec blazeBuilder blazeHtml directoryTree filepath + MonadCatchIOTransformers mtl random text time transformers + unorderedContainers vector xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "An (x)html templating system"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix new file mode 100644 index 000000000000..776e452eafe7 --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -0,0 +1,14 @@ +{ cabal, comonad, contravariant, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "semigroupoids"; + version = "1.3.4"; + sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph"; + buildDepends = [ comonad contravariant semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Haskell 98 semigroupoids: Category sans id"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix new file mode 100644 index 000000000000..505c9bcb0cc3 --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -0,0 +1,28 @@ +{ cabal, aeson, attoparsec, cereal, clientsession, configurator +, dataLens, dataLensTemplate, directoryTree, filepath, hashable +, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, snapCore, snapServer, stm, syb, text, time +, transformers, unorderedContainers, utf8String, vector +, vectorAlgorithms, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "snap"; + version = "0.9.1.1"; + sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec cereal clientsession configurator dataLens + dataLensTemplate directoryTree filepath hashable heist logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore + snapServer stm syb text time transformers unorderedContainers + utf8String vector vectorAlgorithms xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix new file mode 100644 index 000000000000..654da2e76b52 --- /dev/null +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "xmlhtml"; + version = "0.2.0.2"; + sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2"; + buildDepends = [ + blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers + ]; + meta = { + description = "XML parser and renderer with HTML 5 quirks mode"; + 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 a295b8fd6544..f808b0feb7fb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -532,12 +532,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; + comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; + + comonad = callPackage ../development/libraries/haskell/comonad/default.nix {}; + + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; + configurator = callPackage ../development/libraries/haskell/configurator {}; + + contravariant = callPackage ../development/libraries/haskell/contravariant {}; + convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; @@ -588,6 +598,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; + dataLens = callPackage ../development/libraries/haskell/data-lens {}; + + dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -616,6 +630,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; + dlist = callPackage ../development/libraries/haskell/dlist {}; dotgen = callPackage ../development/libraries/haskell/dotgen {}; @@ -841,6 +857,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + heist = callPackage ../development/libraries/haskell/heist {}; + HFuse = callPackage ../development/libraries/haskell/hfuse {}; HGL = callPackage ../development/libraries/haskell/HGL {}; @@ -1289,6 +1307,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); sendfile = callPackage ../development/libraries/haskell/sendfile {}; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids { + comonad = self.comonad_1_1_1_6; + }; + semigroups = callPackage ../development/libraries/haskell/semigroups {}; shelly = callPackage ../development/libraries/haskell/shelly {}; @@ -1299,6 +1321,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; @@ -1571,6 +1595,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; From eea626a6b34398464d2801c7295711073dd56194 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 26 Jul 2012 12:32:38 +0200 Subject: [PATCH 0347/1120] fixed some dependencies --- pkgs/top-level/haskell-packages.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6470cea43611..c8ec5b2bad15 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -536,7 +536,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); comonad = callPackage ../development/libraries/haskell/comonad {}; - comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix {}; + comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { + comonad = self.comonad_1_1_1_6; + semigroupoids = self.semigroupoids_1_3_4; + }; comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; @@ -600,7 +603,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; - dataLens = callPackage ../development/libraries/haskell/data-lens {}; + dataLens = callPackage ../development/libraries/haskell/data-lens { + comonadTransformers = self.comonadTransformers_2_1_2; + semigroupoids = self.semigroupoids_1_3_4; + }; dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; @@ -1312,7 +1318,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix { - comonad = self.comonad_1_1_16; + comonad = self.comonad_1_1_1_6; }; semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; From a992abd00c3b65adb784b5f8a3fc1d13acb5a744 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 26 Jul 2012 12:39:51 +0200 Subject: [PATCH 0348/1120] Removed bogus XBMC build not belonging here --- pkgs/applications/multimedia/xbmc/default.nix | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100644 pkgs/applications/multimedia/xbmc/default.nix diff --git a/pkgs/applications/multimedia/xbmc/default.nix b/pkgs/applications/multimedia/xbmc/default.nix deleted file mode 100644 index 0647652f2c4a..000000000000 --- a/pkgs/applications/multimedia/xbmc/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - stdenv, fetchurl, boost, mesa, glew, mysql, libass, libmpeg2, libmad, - libjpeg, libsamplerate, libogg, libvorbis, libmodplug, curl, flac, libgcrypt, - bzip2, libtiff, lzo, yajl, pkgconfig, fontconfig, fribidi, sqlite, libpng, - pcre, libcdio, freetype, jasper, SDL, SDL_mixer, SDL_image, alsaLib, dbus, - libbluray, libmicrohttpd, libXmu, samba, udev, libusb, python, cmake, hal, - gperf, unzip, avahi, zip, nasm, pulseaudio, ftgl, - - # TODO: Check which of these are actually necessary. - - autoconf, automake, libtool, gettext -}: - -# TODO: Check whether unzip is actually needed. - -stdenv.mkDerivation { - name = "xbmc-11.0"; - - src = fetchurl { - url = http://mirrors.xbmc.org/releases/source/xbmc-11.0.tar.gz; - sha256 = "068bgg6h593xwwinyqy8wsn4hpz90ib59g0k5dpg4f31q48d7r8z"; - }; - - buildInputs = [ - boost mesa glew mysql libass libmpeg2 libmad libjpeg libsamplerate libogg - libvorbis libmodplug curl flac libgcrypt bzip2 libtiff lzo yajl pkgconfig - fontconfig fribidi sqlite libpng pcre libcdio freetype jasper SDL SDL_mixer - SDL_image alsaLib dbus libbluray libmicrohttpd libXmu samba udev libusb - python cmake hal gperf unzip avahi zip nasm pulseaudio ftgl - - autoconf automake libtool gettext - ]; - - # TODO: Can we leave out some of these options? - - dontFixCmake = true; - dontUseCmakeBuildDir = true; - dontUseCmakeConfigure = true; - - # configure performs a SONAME check for some libraries by - # - # > $CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null - # - # The $2 is the library name under inspection, e.g. bluray. However, the - # option -o /dev/null raises an error. Since this doesn't appear to be - # necessary, we can simply remove this option. Note that ./configure is - # generated by ./bootstrap. - - patchPhase = '' - sed -i 's@CC -nostdlib -o /dev/null@CC -nostdlib@g' configure.in - ''; - - configurePhase = '' - ./bootstrap - ./configure --prefix="$out" - ''; -} - From 1786bef686f068ccddfa355fb2b5ad753ee14d46 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 26 Jul 2012 17:02:36 +0200 Subject: [PATCH 0349/1120] trayer: Update to 1.1.5 --- pkgs/applications/window-managers/trayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index ce66f7d9bcc0..b8ecf81f7fc7 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }: stdenv.mkDerivation rec { - name = "trayer-1.1.3"; + name = "trayer-1.1.5"; buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; src = fetchurl { url = "https://github.com/sargon/trayer-srg/tarball/${name}"; name = "${name}.tar.gz"; - sha256 = "03be5ea47278ecdb6ffb1d3b5115a855a6eccd6aa6702b84e89ee047ddd76558"; + sha256 = "98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757"; }; makeFlags = [ "PREFIX=$(out)" ]; From 1b0abce6de89fe49f11bbb30542eeaee79841020 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Jul 2012 11:32:25 -0400 Subject: [PATCH 0350/1120] linux: Update to 3.2.24 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ab1ec38ba523..811c75a344a1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.23"; + version = "3.2.24"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1fmxr9qdz239aqf63j1648rvfngysqqk8qzwb1wjsn5hzrahsxmw"; + sha256 = "1vg8wr8qd2hm40izx53iyfj97j6z02swx9skjy1a8spvix2ihwvs"; }; config = configWithPlatform stdenv.platform; From 1c307015dcff4552dd3975ba1e253e1af51d33a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Jul 2012 11:44:08 -0400 Subject: [PATCH 0351/1120] DBD::Pg: update to 2.19.2 Fixes CVE-2012-1151. --- pkgs/development/perl-modules/DBD-Pg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 29a1da9c7acb..02c436404078 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,15 +1,15 @@ { fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { - name = "DBD-Pg-2.18.1"; + name = "DBD-Pg-2.19.2"; src = fetchurl { url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz"; - sha256 = "10nrmi0hgc9h8c0jbpd9bbbzkdb1riymnlk7a86537c0d4gfqcpm"; + sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9"; }; - buildInputs = [postgresql] ; - propagatedBuildInputs = [DBI]; + buildInputs = [ postgresql ]; + propagatedBuildInputs = [ DBI ]; makeMakerFlags = "POSTGRES_HOME=${postgresql}"; } From 4e7df1423fb948e10f0fb720e00205a4746ab63d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Jul 2012 11:44:34 -0400 Subject: [PATCH 0352/1120] dhcp: Update to 4.1-ESV-R6 Fixes several security problems. --- pkgs/tools/networking/dhcp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 7fa1fce66a5e..2dac54577b8b 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nettools, iputils, iproute, makeWrapper, coreutils, gnused }: stdenv.mkDerivation rec { - name = "dhcp-4.1.2-P1"; + name = "dhcp-4.1-ESV-R6"; src = fetchurl { - url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz"; - sha256 = "1kcdsylyx0ai0wlmc6rc6b1qi2fsndqh1pvgvddd3i4hmbhi6vmz"; + url = http://ftp.isc.org/isc/dhcp/4.1-ESV-R6/dhcp-4.1-ESV-R6.tar.gz; + sha256 = "17md1vml07szl9dx4875gfg4sgnb3z73glpbq1si7p82mfhnddny"; }; patches = From 263a55eda3d60f4a50e425f0b7c87aba1ea68f6c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 26 Jul 2012 14:00:52 -0400 Subject: [PATCH 0353/1120] perlPackages.XMLLibXML: Bump --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9008459c63eb..280be2139e7b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4009,10 +4009,10 @@ rec { }; XMLLibXML = buildPerlPackage rec { - name = "XML-LibXML-1.86"; + name = "XML-LibXML-2.0001"; src = fetchurl { url = "mirror://cpan/modules/by-module/XML/${name}.tar.gz"; - sha256 = "0wgf9898vmjac4mr2k4zvz6aw7nx0yvfv8f093y6w44vv6prxchp"; + sha256 = "1zx4fqi531yzaf1c5cw1qwb9vy37fksz35a7pp6pic9v8jvz09x6"; }; SKIP_SAX_INSTALL = 1; buildInputs = [ pkgs.libxml2 ]; From 50e173755b56828a838add330b1022bba62f0420 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 26 Jul 2012 00:48:17 +0200 Subject: [PATCH 0354/1120] grive: upgrade to 0.3.0 --- pkgs/tools/filesystems/grive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index a2a8bc572c0d..67c6d2f85819 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, cmake, libgcrypt, json_c, curl, expat, boost, binutils }: stdenv.mkDerivation rec { - name = "grive-0.2.0"; + name = "grive-0.3.0"; src = fetchgit { url = "https://github.com/Grive/grive.git"; - rev = "34cb3705288aa83283b370118776ac89393ae5fc"; - sha256 = "a30ea886bdc159e1004d1207fcac30c277f1177a3b846bdd82326eebff7a0bbe"; + rev = "51e42914f3666ee6e0bc16a4c78f60b117265c24"; + sha256 = "f2b978cc93a2d16262c7b78c62019b2a58044eaef4ca95feaa74dfd4dfcbfa36"; }; buildInputs = [cmake libgcrypt json_c curl expat stdenv binutils boost]; From c0fda4da9be7dcd57c736170828532041b1729a5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 26 Jul 2012 20:45:39 +0200 Subject: [PATCH 0355/1120] v8: depend on which during i686-linux build --- pkgs/development/libraries/v8/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index d8518f3bb4dc..af0e6426b811 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, gyp, readline, python }: +{ stdenv, fetchsvn, gyp, readline, python, which }: assert readline != null; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ln -sv ${gyp}/bin/gyp build/gyp/gyp ''; + buildNativeInputs = stdenv.lib.optional (system == "i686-linux") which; buildInputs = [ readline python ]; buildFlags = [ From 02e6a689bef285271dec45cd1d87911fc9038f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 26 Jul 2012 23:02:29 +0200 Subject: [PATCH 0356/1120] nvidia-legacy-173: Updating to 173.14.35 I also add gdk_pixbuf; otherwise nvidia-settings does not start. --- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 4b30137f5b64..0112270f3bf3 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib}: +{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}: let - versionNumber = "173.14.31"; + versionNumber = "173.14.35"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "090rkl1psmcsx3mxb6lnirqipka8vp78y2j7pzqyzl592qpscmg8"; + sha256 = "16kjxj2bn78cgyb4xq39zajjv1hx1z5dw50n9r17w14ifq7i09id"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "0hs4fd61iha7b2936wj5w5fj3rxmw60jnkgf6l1pl3va7sfw30d2"; + sha256 = "0mk7pj7in090dx2v5yzkd7qkaf0qvz3jv4cmpiflpmzmg9p15x8n"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib xlibs.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; From 84b4a086dd616035d9c0cd40c95695eebd354efd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Jul 2012 18:58:20 -0400 Subject: [PATCH 0357/1120] nvidia-x11: Update to 304.22 Now with glorious Xrandr 1.2/1.3 support! No more need to nvidia-settings! --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 99e5ebe7be7b..b9cb0de57dab 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "295.53"; in +let versionNumber = "304.22"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "185hy1d4yixc9drz4r3wgya30zbqcyh2949wfjaqcvxc2ri0jh00"; + sha256 = "1nyyirimpmifr7ka83q5i4wld9zpb5a7ib6vssnlq8rz825fcjqp"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "06fdx3iwqcscwkl14rdb5n1wzscm0gvdxfywr5bzf7y591w4yl7y"; + sha256 = "1jhrb9b2x8l3fy25miyyp5h11ajnj4nf45889dkxj3acrdz3z4zs"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 3acaeefabd42671decae74dffac280bf5443b0a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 01:21:50 +0200 Subject: [PATCH 0358/1120] esniper: remedy some impurities --- pkgs/applications/networking/esniper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index dda0755a7383..0a136014a3e0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl }: +{ stdenv, fetchurl, openssl, curl, coreutils, gawk }: stdenv.mkDerivation { name = "esniper-2.27.0"; @@ -11,7 +11,9 @@ stdenv.mkDerivation { buildInputs = [openssl curl]; postInstall = '' - sed -e "2i export PATH=\"$out/bin:\$PATH\"" <"frontends/snipe" >"$out/bin/snipe" + sed <"frontends/snipe" >"$out/bin/snipe" \ + -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin\"" \ + -e "2i alias which='type -p'" chmod 555 "$out/bin/snipe" ''; @@ -24,5 +26,3 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.simons ]; }; } - - From 54cf26ad8d9fc27ca0dc072c112ae168f6605474 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 01:30:48 +0200 Subject: [PATCH 0359/1120] esniper: fix more impurities --- pkgs/applications/networking/esniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 0a136014a3e0..76c2768c5fbf 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin\"" \ + -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin\"" \ -e "2i alias which='type -p'" chmod 555 "$out/bin/snipe" ''; From 48bce09773b20787ffc31f856099eeec8b2046fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 01:34:54 +0200 Subject: [PATCH 0360/1120] esniper: man, this is more difficult than I would have thought --- pkgs/applications/networking/esniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 76c2768c5fbf..a2a64ead5086 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk }: +{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash }: stdenv.mkDerivation { name = "esniper-2.27.0"; From af6c1c5ef34b958acfcc871050057b96271f8d9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 01:50:50 +0200 Subject: [PATCH 0361/1120] esniper: the 'which' alias won't work when run in a subshell; we need the real thing --- pkgs/applications/networking/esniper/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index a2a64ead5086..8dedd4013b9a 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash }: +{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { name = "esniper-2.27.0"; @@ -12,8 +12,7 @@ stdenv.mkDerivation { postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin\"" \ - -e "2i alias which='type -p'" + -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\"" chmod 555 "$out/bin/snipe" ''; From a636d4b13a543758d3968b698a8a2528bd93b195 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 27 Jul 2012 06:23:28 +0200 Subject: [PATCH 0362/1120] Add package haskell-digestive-functors-snap Add dependency haskell-digestive-functors. --- .../haskell/digestive-functors-snap/default.nix | 14 ++++++++++++++ .../haskell/digestive-functors/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/haskell/digestive-functors-snap/default.nix create mode 100644 pkgs/development/libraries/haskell/digestive-functors/default.nix diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix new file mode 100644 index 000000000000..3d5725e603ff --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -0,0 +1,14 @@ +{ cabal, digestiveFunctors, filepath, mtl, snapCore, text }: + +cabal.mkDerivation (self: { + pname = "digestive-functors-snap"; + version = "0.5.0.0"; + sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x"; + buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "Snap backend for the digestive-functors library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix new file mode 100644 index 000000000000..d6d4710f3060 --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "digestive-functors"; + version = "0.5.0.2"; + sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0"; + buildDepends = [ mtl text ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "A practical formlet library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 181771de2898..1e4016f9ded6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -624,6 +624,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (pkgs) zlib; }; + digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; + + + digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {}; + dimensional = callPackage ../development/libraries/haskell/dimensional {}; directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; From a5ec3d71d0b2ece5a8a21ece4c3cfbb0037b3f2a Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 27 Jul 2012 06:26:53 +0200 Subject: [PATCH 0363/1120] Remove blank line in haskell-packages.nix --- pkgs/top-level/haskell-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1e4016f9ded6..97b1782f6b00 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -626,7 +626,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; - digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {}; dimensional = callPackage ../development/libraries/haskell/dimensional {}; From 5c924ed7c5384bd92e9e1392ee617c2c0a49fbf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 10:25:06 +0200 Subject: [PATCH 0364/1120] ikiwiki: fix test suite in the presence of enabled Git support --- pkgs/applications/misc/ikiwiki/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index f3fb575c6e57..35ce5478d90f 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -70,6 +70,11 @@ stdenv.mkDerivation { done ''; + preCheck = '' + # Git needs some help figuring this out during test suite run. + export EMAIL="nobody@example.org" + ''; + checkTarget = "test"; doCheck = true; From 1dacb511e29d47662d881bd9bd7e3ec331e60c68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Jul 2012 11:21:32 +0200 Subject: [PATCH 0365/1120] esniper: add support for CURL_CA_BUNDLE variable to fix SSL authentication errors --- .../networking/esniper/default.nix | 3 +++ .../networking/esniper/find-ca-bundle.patch | 26 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/networking/esniper/find-ca-bundle.patch diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 8dedd4013b9a..327e4c4a9c52 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -10,6 +10,9 @@ stdenv.mkDerivation { buildInputs = [openssl curl]; + # Add support for CURL_CA_BUNDLE variable. + patches = [ ./find-ca-bundle.patch ]; + postInstall = '' sed <"frontends/snipe" >"$out/bin/snipe" \ -e "2i export PATH=\"$out/bin:${coreutils}/bin:${gawk}/bin:${bash}/bin:${which}/bin:\$PATH\"" diff --git a/pkgs/applications/networking/esniper/find-ca-bundle.patch b/pkgs/applications/networking/esniper/find-ca-bundle.patch new file mode 100644 index 000000000000..e4df272a0c9a --- /dev/null +++ b/pkgs/applications/networking/esniper/find-ca-bundle.patch @@ -0,0 +1,26 @@ +diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c +--- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100 ++++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200 +@@ -200,6 +200,9 @@ + int + initCurlStuff(void) + { ++ /* Path to OpenSSL bundle file. */ ++ const char *ssl_capath=NULL; ++ + /* list for custom headers */ + struct curl_slist *slist=NULL; + +@@ -241,6 +244,12 @@ + if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, ""))) + return initCurlStuffFailed(); + ++ /* If the environment variable CURL_CA_BUNDLE is set, pass through its ++ * contents to curl. */ ++ if ((ssl_capath = getenv("CURL_CA_BUNDLE"))) ++ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath))) ++ return initCurlStuffFailed(); ++ + slist = curl_slist_append(slist, "Accept: text/*"); + slist = curl_slist_append(slist, "Accept-Language: en"); + slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8"); From 54146ea1918ff8b0b5c9a9db9806b939397e7b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 27 Jul 2012 16:11:08 +0200 Subject: [PATCH 0366/1120] octave: updating to 3.6.2 (bugfix release) I don't know what they fixed. --- pkgs/development/interpreters/octave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4293e0112991..3ffdc415f880 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -3,10 +3,10 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: stdenv.mkDerivation rec { - name = "octave-3.6.1"; + name = "octave-3.6.2"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1xmd9rqpwzn6z808i3brw1w9lh083vpjg046cj4gg3qdazkkw1zq"; + sha256 = "1bn48ldhx585iyrylnz59b6mb3wlpvmz2i3ri8q75s5ys29rpdhb"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 From 32b48d64dc9a146185d53dc0ec563f6946333a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 26 Jul 2012 09:25:52 +0200 Subject: [PATCH 0367/1120] Adding 'ii', irc it. --- .../networking/irc/ii/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/networking/irc/ii/default.nix diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix new file mode 100644 index 000000000000..a283258d589a --- /dev/null +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "ii-1.6"; + + src = fetchurl { + url = "http://dl.suckless.org/tools/${name}.tar.gz"; + sha256 = "0afccbcm7i9lfch5mwzs3l1ax79dg3g6rrw0z8rb7d2kn8wsckvr"; + }; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = http://tools.suckless.org/ii/; + license = "MIT"; + description = "Irc it, simple FIFO based irc client"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88d62eb5ffad..76918d081db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7000,6 +7000,8 @@ let id3v2 = callPackage ../applications/audio/id3v2 { }; + ii = callPackage ../applications/networking/irc/ii { }; + ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext From c0832627c4f344376cd7a45945d1f4f7bb1210cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 27 Jul 2012 20:37:08 +0200 Subject: [PATCH 0368/1120] ocaml, unison: make them build on mips (native compilers) I switch off the build of ocaml compilers to native code, and add a 'passthru' that unison can use to see if it needs to call the native or the bytecode compiler. --- pkgs/applications/networking/sync/unison/default.nix | 7 ++----- pkgs/development/compilers/ocaml/3.12.1.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index b6906c86afe2..ea30903fb383 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,9 +1,6 @@ {stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses , enableX11 ? true}: -let - nativeCode = if stdenv.isArm then false else true; -in stdenv.mkDerivation (rec { name = "unison-2.40.63"; @@ -19,7 +16,7 @@ stdenv.mkDerivation (rec { '' else ""; makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") - + (if ! nativeCode then " NATIVE=false" else ""); + + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); preInstall = "mkdir -p $out/bin"; @@ -30,7 +27,7 @@ stdenv.mkDerivation (rec { done '' else ""; - dontStrip = if ! nativeCode then true else false; + dontStrip = if ! ocaml.nativeCompilers then true else false; meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 66075d4a9669..a70ba649d1fe 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, ncurses, x11 }: let - useX11 = !stdenv.isArm; - useNativeCompilers = !stdenv.isArm; + useX11 = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isArm && !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { ln -sv $out/lib/ocaml/caml $out/include/caml ''; + passthru = { + nativeCompilers = useNativeCompilers; + }; + meta = { homepage = http://caml.inria.fr/ocaml; licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; From 2a1215115fb0ea4628343a405a68207aae666296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 28 Jul 2012 00:35:39 +0200 Subject: [PATCH 0369/1120] Updating Ardour3 to beta 5 --- pkgs/applications/audio/ardour/ardour3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index c803ec076187..cfa86af3c379 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -6,8 +6,8 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3 Beta 4a - rev = "12406"; + # Ardour 3 Beta 5 + rev = "13072"; in stdenv.mkDerivation { @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchsvn { url = http://subversion.ardour.org/svn/ardour2/branches/3.0; inherit rev; - sha256 = "0a68xb3l36m5908y3airxw1b3bymhrjrf1l492mgcvviq6pn7pmk"; + sha256 = "17k990kdb5q17z6jcz5b60imvvfbjw9zfxzy9fk0vg8gd6yq7736"; }; buildInputs = From f11631c8c4de1811ae4f1e15986373f1c5874cf1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Jul 2012 19:27:25 -0400 Subject: [PATCH 0370/1120] tcsh: Bump --- pkgs/shells/tcsh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 9e5fa7dae0f3..be182f87f1ee 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: -stdenv.mkDerivation { - name = "tcsh-6.16.00"; +stdenv.mkDerivation rec { + name = "tcsh-6.18.01"; src = fetchurl { - url = ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.16.00.tar.gz; - sha256 = "1m0p8lqqna3vpf2k4x3hia3rlrz38av67x7hb4qsiq2kfpbbh0vn"; + url = "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${name}.tar.gz"; + sha256 = "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q"; }; buildInputs = [ncurses]; From deb09fd9debfe519037cf1fd1b17f2489ef6ffab Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Jul 2012 19:44:01 -0400 Subject: [PATCH 0371/1120] Mercurial: Bump --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 24e1b95bf0cb..be806e49f5ca 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,14 +2,14 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.1.2"; + name = "mercurial-2.2.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "11lqjnbal667rkbafby9qvb7hyxfycyc7h3hw04p4s4mw64lhkci"; + sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw"; }; inherit python; # pass it so that the same version can be used in hg2git From 184ea61eb685e1bf92be4de5e782c8c680433bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 28 Jul 2012 22:43:42 +0200 Subject: [PATCH 0372/1120] vlc: updating to 2.0.3 I hadd problems with how 2.0.1 disabled and reenabled DPMS on xorg. Let's see if anything improves with 2.0.3. --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b33bcddbffb8..65357acf00fd 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b"; + sha256 = "1lnjfpizgp8slj6i4fgk5wld6nfw08wfhkb1i1dvzbhmfigq1agv"; }; buildInputs = From c3c68b6510dd1e6b3713be5746e36f3212422ae6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 27 Jul 2012 19:51:30 -0400 Subject: [PATCH 0373/1120] Mercurial: Install hgweb.wsgi as well --- pkgs/applications/version-management/mercurial/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index be806e49f5ca..486bebc2531c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { # copy hgweb.cgi to allow use in apache mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi ''; From bf7467cbb1f08470854db73ee2c07d9f896aefc8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 01:23:51 -0400 Subject: [PATCH 0374/1120] Add first attempt at linux/kernel/manual-config. The goal of this function is to make it possible to build a kernel with a user provided .config. As a secondary goal, it will extract NixOS-relevant features from the config automatically. As a tertiary goal, the build will aim to be simpler than the current generic kernel builder.sh. Unfortunately, that simplicity is offset by the complexity of the feature extraction, especially since nix segfaults when trying to split the file into lines (so an import from a derivation is used) --- .../linux/kernel/manual-config.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/manual-config.nix diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix new file mode 100644 index 000000000000..8cf8b6502166 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -0,0 +1,81 @@ +{ stdenv, runCommand }: + +{ version, modDirVersion ? version, src, patches ? [], config }: + +with stdenv.lib; + +let + + # Function to parse the config file to get the features supported + readFeatures = config: + let + # !!! Original causes recursion too deep, need to import from derivation + # linesWithComments = splitString "\n" (builtins.readFile config); + lines = import "${runCommand "lines.nix" {} '' + echo "[" >> $out + while read line; do + if [ -n "$line" ] && [ `expr index "$line" "#"` -ne 1 ]; then + echo "${"''"}" >> $out + echo $(echo $line | sed "s@${"''"}@\$\{\"${"''"}\"}@g")"${"''"}" >> $out + fi + done < ${config} + echo "]" >> $out + ''}"; + + nvpairs = map (s: let split = splitString "=" s; fst = head split; in { + name = substring (stringLength "CONFIG_") (stringLength fst) fst; + value = head (tail split); + }) lines; + + configAttrs = listToAttrs nvpairs; + + getValue = option: + if hasAttr option configAttrs then getAttr option configAttrs else null; + + isYes = option: (getValue option) == "y"; + in + + { + modular = isYes "MODULES"; + }; + + features = readFeatures config; + +in + +stdenv.mkDerivation ({ + name = "linux-${version}"; + + enableParallelBuilding = true; + + passthru = { + inherit version modDirVersion features; + }; + + inherit patches src; + + postPatch = '' + for mf in $(find -name Makefile); do + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' + done + ''; + + configurePhase = '' + runHook preConfigure + ln -sv ${config} .config + make oldconfig + runHook postConfigure + ''; + + INSTALL_PATH = "$out"; +} // optionalAttrs features.modular { + MODLIB = "$out/lib/modules/${modDirVersion}"; + + INSTALL_MOD_STRIP = "1"; + + postInstall = '' + make modules_install $makeFlags "$\{makeFlagsArray[@]}" \ + $installFlags "$\{installFlagsArray[@]}" + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76918d081db0..0ca0f90768a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5856,6 +5856,11 @@ let linux = linuxPackages.kernel; linuxPackages = linuxPackages_3_2; + # A function to build a manually-configured kernel + linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { + inherit stdenv runCommand; + }; + keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { }; From ff728a63650a2544351b5114912589c8e7faf21f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 01:29:56 -0400 Subject: [PATCH 0375/1120] The kernel build needs hostname and perl --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8cf8b6502166..783a41337551 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand }: +{ stdenv, runCommand, nettools, perl }: { version, modDirVersion ? version, src, patches ? [], config }: @@ -69,6 +69,8 @@ stdenv.mkDerivation ({ ''; INSTALL_PATH = "$out"; + + buildNativeInputs = [ perl nettools ]; } // optionalAttrs features.modular { MODLIB = "$out/lib/modules/${modDirVersion}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ca0f90768a3..190c380fccb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5858,7 +5858,7 @@ let # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { - inherit stdenv runCommand; + inherit stdenv runCommand nettools perl; }; keyutils = callPackage ../os-specific/linux/keyutils { }; From dfa750732d34740577c2907be70450ad23aa37c4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 01:34:27 -0400 Subject: [PATCH 0376/1120] linux/kernel/manual-config: Properly set env vars referencing $out --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 783a41337551..79c8061bb10d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation ({ runHook postConfigure ''; - INSTALL_PATH = "$out"; + INSTALL_PATH = "$(out)"; buildNativeInputs = [ perl nettools ]; } // optionalAttrs features.modular { - MODLIB = "$out/lib/modules/${modDirVersion}"; + MODLIB = "$(out)/lib/modules/${modDirVersion}"; INSTALL_MOD_STRIP = "1"; From aa40e0ff5965c7d195026d193f216d58c3263b46 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 01:57:59 -0400 Subject: [PATCH 0377/1120] linux/kernel/manual-config: The default 'make install' tries to do something with LILO, so install the kernel manually --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 79c8061bb10d..34bcaba3f316 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -71,6 +71,16 @@ stdenv.mkDerivation ({ INSTALL_PATH = "$(out)"; buildNativeInputs = [ perl nettools ]; + + installPhase = '' + runHook preInstall + mkdir $out + mv -v System.map $out + # !!! Assumes x86 + mv -v arch/x86/boot/bzImage $out + mv -v vmlinux $out + runHook postInstall + ''; } // optionalAttrs features.modular { MODLIB = "$(out)/lib/modules/${modDirVersion}"; From 471b4bc9bb9e67caec7fb11bb7f01c6c7b2b0d85 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 02:49:31 -0400 Subject: [PATCH 0378/1120] MODLIB needs to be passed directly to make --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 34bcaba3f316..131ff74bcf1c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation ({ runHook postInstall ''; } // optionalAttrs features.modular { - MODLIB = "$(out)/lib/modules/${modDirVersion}"; + makeFlags = [ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" ]; INSTALL_MOD_STRIP = "1"; From 5a9d9f4f457e98df5a017a295f7c4e9c1c5f5128 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 02:57:58 -0400 Subject: [PATCH 0379/1120] linux/kernel/manual-config: Properly escape makeFlagsArray and installFlagsArray --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 131ff74bcf1c..83740b6285e7 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation ({ INSTALL_MOD_STRIP = "1"; postInstall = '' - make modules_install $makeFlags "$\{makeFlagsArray[@]}" \ - $installFlags "$\{installFlagsArray[@]}" + make modules_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" ''; }) From a36456ca255883520fd07fa5a0b8a23bd08196a3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 03:09:44 -0400 Subject: [PATCH 0380/1120] linux/kernel-manual-config: Simplify the lines.nix runCommand now that I know how to escape properly --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 83740b6285e7..87550401f78a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -14,9 +14,9 @@ let lines = import "${runCommand "lines.nix" {} '' echo "[" >> $out while read line; do - if [ -n "$line" ] && [ `expr index "$line" "#"` -ne 1 ]; then - echo "${"''"}" >> $out - echo $(echo $line | sed "s@${"''"}@\$\{\"${"''"}\"}@g")"${"''"}" >> $out + if [ -n "$line" ] && [ "#" != ''${line:0:1} ]; then + echo "'''" >> $out + echo $(echo $line | sed "s/'''/''''/g")"'''" >> $out fi done < ${config} echo "]" >> $out From e42a6c5f464b7f77a60ffbbcf0cdaed739d553eb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 03:27:09 -0400 Subject: [PATCH 0381/1120] linux/kernel/manual-config: Move the build directory to $out instead of symlinking it --- pkgs/os-specific/linux/kernel/manual-config.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 87550401f78a..651f9b14e778 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation ({ runHook preConfigure ln -sv ${config} .config make oldconfig + rm .config.old runHook postConfigure ''; @@ -89,5 +90,9 @@ stdenv.mkDerivation ({ postInstall = '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" + rm -f $out/lib/modules/${modDirVersion}/{build,source} + cd .. + mv $sourceRoot $out/lib/modules/${modDirVersion}/build + ln -sv $out/lib/modules/${modDirVersion}/{build,source} ''; }) From 48b5e8eee7e1b86ca06417875627f032d5107ee4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 03:49:52 -0400 Subject: [PATCH 0382/1120] linux/kernel/manual-config: Build in a separate directory and move the build and source trees into $out --- .../linux/kernel/manual-config.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 651f9b14e778..b4dbb786016c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -41,6 +41,9 @@ let features = readFeatures config; + commonMakeFlags = [ + "O=../build" + ]; in stdenv.mkDerivation ({ @@ -54,8 +57,8 @@ stdenv.mkDerivation ({ inherit patches src; - postPatch = '' - for mf in $(find -name Makefile); do + prePatch = '' + for mf in $(find -name Makefile -o -name Makefile.include); do echo "stripping FHS paths in \`$mf'..." sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' done @@ -63,9 +66,11 @@ stdenv.mkDerivation ({ configurePhase = '' runHook preConfigure - ln -sv ${config} .config - make oldconfig - rm .config.old + mkdir ../build + make $makeFlags "''${makeFlagsArray[@]}" mrproper + ln -sv ${config} ../build/.config + make $makeFlags "''${makeFlagsArray[@]}" oldconfig + rm ../build/.config.old runHook postConfigure ''; @@ -76,14 +81,18 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall mkdir $out - mv -v System.map $out + mv -v ../build/System.map $out # !!! Assumes x86 - mv -v arch/x86/boot/bzImage $out - mv -v vmlinux $out + mv -v ../build/arch/x86/boot/bzImage $out + mv -v ../build/vmlinux $out runHook postInstall ''; + + makeFlags = commonMakeFlags; } // optionalAttrs features.modular { - makeFlags = [ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" ]; + makeFlags = commonMakeFlags ++ [ + "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" + ]; INSTALL_MOD_STRIP = "1"; @@ -92,7 +101,7 @@ stdenv.mkDerivation ({ $installFlags "''${installFlagsArray[@]}" rm -f $out/lib/modules/${modDirVersion}/{build,source} cd .. - mv $sourceRoot $out/lib/modules/${modDirVersion}/build - ln -sv $out/lib/modules/${modDirVersion}/{build,source} + mv $sourceRoot $out/lib/modules/${modDirVersion}/source + mv build $out/lib/modules/${modDirVersion}/build ''; }) From 4f713d27f7a58e1e5c2a7f0f138c97b76dea3979 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 03:57:50 -0400 Subject: [PATCH 0383/1120] kmod: Bump to version 9 --- pkgs/os-specific/linux/kmod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 89d4c463cc70..afa19491ce5e 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xz, zlib, pkgconfig }: stdenv.mkDerivation rec { - name = "kmod-8"; + name = "kmod-9"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "0kbkjzcyhkwgcplwa29n0f03ccwpg4df83pdl5nkvsk2rzgx3xrm"; + sha256 = "1kyfplx0gygzxp5dn81yk3cn8zzraqm497vis04r1g1dnry2c1q6"; }; # Disable xz/zlib support to prevent needing them in the initrd. From 6e3b17feece1364a341af7eb11c18b4eaa8556bb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:01:40 -0400 Subject: [PATCH 0384/1120] linux/kernel/manual-config: Run depmod after build --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b4dbb786016c..fe9769a00ade 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, perl }: +{ stdenv, runCommand, nettools, perl, kmod }: { version, modDirVersion ? version, src, patches ? [], config }: @@ -62,6 +62,7 @@ stdenv.mkDerivation ({ echo "stripping FHS paths in \`$mf'..." sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' done + sed -i -e 's|/sbin/depmod|${kmod}/sbin/depmod|' Makefile ''; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 190c380fccb6..d8223f2e0ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5858,7 +5858,7 @@ let # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { - inherit stdenv runCommand nettools perl; + inherit stdenv runCommand nettools perl kmod; }; keyutils = callPackage ../os-specific/linux/keyutils { }; From 6b18ab5365f8cb4c6cd66f69ad1f083a91da22f0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:07:43 -0400 Subject: [PATCH 0385/1120] linux/kernel/manual-config: Remove useless INSTALL_MOD_STRIP variable --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fe9769a00ade..aa23656171d6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -95,8 +95,6 @@ stdenv.mkDerivation ({ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" ]; - INSTALL_MOD_STRIP = "1"; - postInstall = '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" From 6bb20c7ba21071f020a312370c03f145b35546d9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:23:28 -0400 Subject: [PATCH 0386/1120] linux/kernel/manual-config: Strip modules after install --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index aa23656171d6..d6cf3bf76125 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -103,4 +103,10 @@ stdenv.mkDerivation ({ mv $sourceRoot $out/lib/modules/${modDirVersion}/source mv build $out/lib/modules/${modDirVersion}/build ''; + + postFixup = '' + if [ -z "$dontStrip" ]; then + find $out -name "*.ko" -print0 | xargs -0 strip -S + fi + ''; }) From a9a70856845625bd6b9f988d07553774f88d18d4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:31:40 -0400 Subject: [PATCH 0387/1120] linux/kernel/manual-config: Allow manually specifying features, cleanup --- .../linux/kernel/manual-config.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d6cf3bf76125..730983d895fe 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,7 +1,5 @@ { stdenv, runCommand, nettools, perl, kmod }: -{ version, modDirVersion ? version, src, patches ? [], config }: - with stdenv.lib; let @@ -39,13 +37,25 @@ let modular = isYes "MODULES"; }; - features = readFeatures config; - - commonMakeFlags = [ - "O=../build" - ]; in +{ + # The kernel version + version, + # The version of the kernel module directory + modDirVersion ? version, + # The kernel source (tarball, git checkout, etc.) + src, + # Any patches + patches ? [], + # The kernel .config file + config, + # Manually specified features the kernel supports + features ? readFeatures config +}: + +let commonMakeFlags = [ "O=../build" ]; in + stdenv.mkDerivation ({ name = "linux-${version}"; From 98341e0bda814d6e92e9fef8522840eec738db4b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:48:50 -0400 Subject: [PATCH 0388/1120] linux/kernel/manual-config: Use the kernel's make install --- .../linux/kernel/manual-config.nix | 34 +++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 730983d895fe..777b33a84731 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, perl, kmod }: +{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }: with stdenv.lib; @@ -54,7 +54,20 @@ in features ? readFeatures config }: -let commonMakeFlags = [ "O=../build" ]; in +let + commonMakeFlags = [ + "O=../build" + "INSTALL_PATH=$(out)" + "INSTALLKERNEL=${installkernel}" + ]; + + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' + #!/bin/sh + mkdir $4 + mv -v $2 $4 + mv -v $3 $4 + '';}; +in stdenv.mkDerivation ({ name = "linux-${version}"; @@ -70,9 +83,8 @@ stdenv.mkDerivation ({ prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include); do echo "stripping FHS paths in \`$mf'..." - sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done - sed -i -e 's|/sbin/depmod|${kmod}/sbin/depmod|' Makefile ''; configurePhase = '' @@ -85,19 +97,7 @@ stdenv.mkDerivation ({ runHook postConfigure ''; - INSTALL_PATH = "$(out)"; - - buildNativeInputs = [ perl nettools ]; - - installPhase = '' - runHook preInstall - mkdir $out - mv -v ../build/System.map $out - # !!! Assumes x86 - mv -v ../build/arch/x86/boot/bzImage $out - mv -v ../build/vmlinux $out - runHook postInstall - ''; + buildNativeInputs = [ perl nettools kmod ]; makeFlags = commonMakeFlags; } // optionalAttrs features.modular { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8223f2e0ffd..88e1626e5801 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5858,7 +5858,7 @@ let # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { - inherit stdenv runCommand nettools perl kmod; + inherit stdenv runCommand nettools perl kmod writeTextFile; }; keyutils = callPackage ../os-specific/linux/keyutils { }; From f7b6f01da1362931d5c58ec1fd78922966b3e2d4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:52:34 -0400 Subject: [PATCH 0389/1120] linux/kernel/manual-config: Cleanup --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 777b33a84731..59fb1a6cd4c8 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -51,6 +51,7 @@ in # The kernel .config file config, # Manually specified features the kernel supports + # If unspecified, this will be autodetected from the .config features ? readFeatures config }: @@ -100,7 +101,7 @@ stdenv.mkDerivation ({ buildNativeInputs = [ perl nettools kmod ]; makeFlags = commonMakeFlags; -} // optionalAttrs features.modular { +} // optionalAttrs (features ? modular && features.modular) { makeFlags = commonMakeFlags ++ [ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" ]; From 46fa5ab105937b44098bc4c4403a62e9cf4dd950 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:56:56 -0400 Subject: [PATCH 0390/1120] linux/kernel/manual-config: Relink the symlink from the build directory to the source directory after the source directory is moved --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 59fb1a6cd4c8..5aee2c194b63 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -113,6 +113,8 @@ stdenv.mkDerivation ({ cd .. mv $sourceRoot $out/lib/modules/${modDirVersion}/source mv build $out/lib/modules/${modDirVersion}/build + unlink $out/lib/modules/${modDirVersion}/build/source + ln -sv $out/lib/modules/${modDirVersion}/{,build/}source ''; postFixup = '' From 6585646d4195c9cfab1fdae2b473222159aa096b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 04:59:38 -0400 Subject: [PATCH 0391/1120] linux/kernel/manual-config: Add meta --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5aee2c194b63..5d2a42646bf6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -101,6 +101,16 @@ stdenv.mkDerivation ({ buildNativeInputs = [ perl nettools kmod ]; makeFlags = commonMakeFlags; + + meta = { + description = "The Linux kernel"; + license = "GPLv2"; + homepage = http://www.kernel.org/; + maintainers = [ + maintainers.shlevy + ]; + platforms = lib.platforms.linux; + }; } // optionalAttrs (features ? modular && features.modular) { makeFlags = commonMakeFlags ++ [ "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" From 855e5dc05a0b39c38908c4bc55a35891517d2fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 29 Jul 2012 14:12:39 +0200 Subject: [PATCH 0392/1120] btar: updating to 1.1 --- pkgs/tools/backup/btar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 919b814f60ad..528bb05bb0cb 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { - name = "btar-1.0.1"; + name = "btar-1.1"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "141mqrghqmms6zpbwn9bw98q4rkxfyly950jh8hajq9d2fk5qyn1"; + sha256 = "17vkccv2b7mz1pj5zmnapjkx9aykzb6xf5wibwhn8da6kn7qwnnj"; }; buildInputs = [ librsync ]; From e58b3517348b7b380b119cd250f4ec69cf40728b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 29 Jul 2012 17:24:19 +0200 Subject: [PATCH 0393/1120] go: updating to 1.0.2 I've only tried it in 386. We'll see if it works on amd64. --- pkgs/development/compilers/go/default.nix | 68 ++++++++++------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 143c091a1dc0..a5b75ed94356 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -1,46 +1,50 @@ -{ stdenv, fetchhg, bison, glibc, ed, which, bash, coreutils, makeWrapper, perl }: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}: let - version = "2010-06-09"; - sha256 = "b607879b333ef100466c726a13cc69ed143566a3c1af59f6d33a6e90b9d0c917"; - loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; in stdenv.mkDerivation { - name = "go-" + version; + name = "go-1.0.2"; # No tarball yet. - src = fetchhg { - url = https://go.googlecode.com/hg/; - tag = "release." + version; - inherit sha256; + src = fetchurl { + url = http://go.googlecode.com/files/go1.0.2.src.tar.gz; + sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h"; }; - buildInputs = [ bison glibc ed which bash makeWrapper ]; + buildInputs = [ bison glibc bash makeWrapper ]; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; prePatch = '' patchShebangs ./ # replace /bin/bash - # only for 386 build # !!! substituteInPlace does not seems to be effective. sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go - sed -i 's,/bin/ed,${ed}/bin/ed,' src/cmd/6l/mkenam + sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - -e 's,/bin/echo,${coreutils}/bin/echo,' \ - src/pkg/exec/exec_test.go + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) - sed -i -e '/^NOTEST=/a\\tos\\\n\thttp\\\n\tnet\\' src/pkg/Makefile - - sed -i -e 's,/bin:/usr/bin:/usr/local/bin,'$PATH, test/run - sed -i -e 's,/usr/bin/perl,${perl}/bin/perl,' test/errchk + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go ''; + GOOS = "linux"; GOARCH = if (stdenv.system == "i686-linux") then "386" else if (stdenv.system == "x86_64-linux") then "amd64" @@ -55,28 +59,16 @@ stdenv.mkDerivation { ./all.bash cd - - # Handle Libraries and make them availabale under /share/go. - export GOLIB="pkg/"$GOOS"_"$GOARCH - mkdir -p "$out/lib/go/$GOLIB" - cp -r ./$GOLIB $out/lib/go/pkg/ - - # this line set $AS $CC $GC $LD - source ./src/Make.$GOARCH - - # Wrap the compiler and the linker to define the location of the + # Wrap the tools to define the location of the # libraries. - wrapProgram "$out/bin/$GC" \ - --add-flags "-I" \ - --add-flags "$out/lib/go/$GOLIB" - - wrapProgram "$out/bin/$LD" \ - --set "GOROOT" "$out/lib/go/" \ - --set "GOOS" "$GOOS" \ - --set "GOARCH" "$GOARCH" + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" "$out/share/go/" + done # Copy the emacs configuration for Go files. mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */ + cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; meta = { From f0694a3151133543750f2418f9f83a297ee83147 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 13:24:05 -0400 Subject: [PATCH 0394/1120] linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation --- .../linux/kernel/manual-config.nix | 76 ++++++++++++++----- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5d2a42646bf6..7cec47b86be9 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }: +{ stdenv, runCommand, nettools, perl, kmod, writeTextFile, coffeescript }: with stdenv.lib; @@ -7,25 +7,65 @@ let # Function to parse the config file to get the features supported readFeatures = config: let - # !!! Original causes recursion too deep, need to import from derivation - # linesWithComments = splitString "\n" (builtins.readFile config); - lines = import "${runCommand "lines.nix" {} '' - echo "[" >> $out - while read line; do - if [ -n "$line" ] && [ "#" != ''${line:0:1} ]; then - echo "'''" >> $out - echo $(echo $line | sed "s/'''/''''/g")"'''" >> $out - fi - done < ${config} - echo "]" >> $out - ''}"; + configParser = writeTextFile { name = "config-parser"; executable=true; text = '' + #!${coffeescript}/bin/coffee + fs = require "fs" + events = require "events" - nvpairs = map (s: let split = splitString "=" s; fst = head split; in { - name = substring (stringLength "CONFIG_") (stringLength fst) fst; - value = head (tail split); - }) lines; + lineEmitter = new events.EventEmitter() + buffer = new Buffer 0 + input = fs.createReadStream process.argv[2] + input.on 'data', (data) -> + nextBuffer = new Buffer buffer.length + data.length + buffer.copy(nextBuffer) + data.copy(nextBuffer, buffer.length) + start = 0 + offset = buffer.length + buffer = nextBuffer - configAttrs = listToAttrs nvpairs; + for i in [1..data.length] + if data[i] == '\n'.charCodeAt 0 + end = i+offset+1 + line = buffer.slice start, end - 1 + start = end + lineEmitter.emit "line", line.toString() + + buffer = buffer.slice start + input.once 'end', -> + input.destroy() + if safeToWrite + output.end "}" + output.destroySoon() + else + output.once 'drain', -> + output.end "}" + output.destroySoon() + + output = fs.createWriteStream process.env["out"] + output.setMaxListeners 0 + safeToWrite = output.write "{\n" + unless safeToWrite + output.once 'drain', -> + safeToWrite = true + + escapeNixString = (str) -> + str.replace("'''", "''''").replace("''${", "'''''${") + lineEmitter.on 'line', (line) -> + unless line.length is 0 or line.charAt(0) is '#' + split = line.split '=' + name = split[0].substring "CONFIG_".length + value = escapeNixString split.slice(1).join "" + lineToWrite = "\"#{name}\" = '''#{value}''';\n" + if safeToWrite + safeToWrite = output.write lineToWrite + else + input.pause() + output.once 'drain', -> + safeToWrite = output.write lineToWrite + input.resume() + '';}; + + configAttrs = import "${runCommand "attrList.nix" {} "${configParser} ${config}"}"; getValue = option: if hasAttr option configAttrs then getAttr option configAttrs else null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88e1626e5801..69f9a352d8a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5858,7 +5858,8 @@ let # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { - inherit stdenv runCommand nettools perl kmod writeTextFile; + inherit (pkgs) stdenv runCommand nettools perl kmod writeTextFile; + coffeescript = pkgs.nodePackages."coffee-script"; }; keyutils = callPackage ../os-specific/linux/keyutils { }; From 298b5ccdab13ac7f63cf7c84fa1ce6eb01c28c02 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 13:26:39 -0400 Subject: [PATCH 0395/1120] linux/kernel/manual-config: Only import from derivation when explicitly asked to --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 7cec47b86be9..c943c8fa823c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -92,7 +92,9 @@ in config, # Manually specified features the kernel supports # If unspecified, this will be autodetected from the .config - features ? readFeatures config + features ? optionalAttrs allowImportFromDerivation (readFeatures config), + # Whether to utilize the controversial import-from-derivation feature to parse the config + allowImportFromDerivation ? false }: let From 5d44de6398b0440fd8c77f014af9fbfdc4307744 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jul 2012 20:54:17 +0200 Subject: [PATCH 0396/1120] perl-CGI-Session: update to version 4.46 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 280be2139e7b..389dc97a4503 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -594,10 +594,10 @@ rec { }; CGISession = buildPerlPackage rec { - name = "CGI-Session-4.42"; + name = "CGI-Session-4.46"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz"; - sha256 = "186lqqmfvisw3i74anvnsaqlbp6ww3wyhlsgdpni0mlcnh56h4gw"; + sha256 = "c04b725be6a1b9bf22387cc6427eb951408ccba1c52471a43a80306f31e68e1b"; }; buildInputs = [ DBFile ]; }; From 248faf47264f1dabcdb2a704d499a614238539bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jul 2012 20:54:39 +0200 Subject: [PATCH 0397/1120] perl-DB_File: update to version 1.826 --- pkgs/development/perl-modules/DB_File/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index 858d459f5ca1..f6396af8b652 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -1,11 +1,11 @@ {fetchurl, buildPerlPackage, db4}: -buildPerlPackage { - name = "DB_File-1.820"; - +buildPerlPackage rec { + name = "DB_File-1.826"; + src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.820.tar.gz; - sha256 = "0jnz5lsrad67j42sdw5bqpkmgiyj45rpiqgkff3i21252k9d5s7a"; + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "c39828ef3cfecff8197ff057cb1c6127b87107c051d182b87c6b9ac79d23f09c"; }; preConfigure = '' From f8ff9b74e9ad1ee2d0966634da7a71233b8166c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jul 2012 21:34:20 +0200 Subject: [PATCH 0398/1120] all-packages.nix: strip trailing whitespace --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69f9a352d8a6..783ab79b1953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -532,7 +532,7 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; clamav = callPackage ../tools/security/clamav { }; - + cloog = callPackage ../development/libraries/cloog { }; cloogppl = callPackage ../development/libraries/cloog-ppl { }; From 8a112fe598de35de508b2f7c8a3374fc3b23c2f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jul 2012 21:39:29 +0200 Subject: [PATCH 0399/1120] perl-packages.nix: add perl-Authen-Passphrase (and its dependencies) - Authen-DecHpwd-2.006 - Authen-Passphrase-0.008 - Class-Mix-0.005 - Crypt-Eksblowfish-0.009 - Crypt-MySQL-0.04 - Crypt-Rijndael-1.11 - Crypt-UnixCrypt_XS-0.09 - Data-Entropy-0.007 - Data-Float-0.012 - Data-Integer-0.004 - Digest-CRC-0.18 - Digest-MD4-1.5 - HTTP-Lite-2.4 - Scalar-String-0.002 --- pkgs/top-level/perl-packages.nix | 119 +++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 389dc97a4503..c5d2de58fca6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -107,6 +107,15 @@ rec { }; }; + AuthenDecHpwd = buildPerlPackage rec { + name = "Authen-DecHpwd-2.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "67f45fef6a23b7548f387b675cbf7881bf9da62d7d007cbf90d3a4b851b99eb7"; + }; + propagatedBuildInputs = [ ScalarString DataInteger DigestCRC ]; + }; + AuthenHtpasswd = buildPerlPackage rec { name = "Authen-Htpasswd-0.171"; src = fetchurl { @@ -116,6 +125,16 @@ rec { propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; }; + AuthenPassphrase = buildPerlPackage rec { + name = "Authen-Passphrase-0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; + }; + propagatedBuildInputs = [ModuleRuntime ParamsClassify CryptPasswdMD5 CryptDES + DataEntropy CryptUnixCryptXS CryptEksblowfish CryptMySQL DigestMD4 AuthenDecHpwd]; + }; + AuthenSASL = buildPerlPackage rec { name = "Authen-SASL-2.1401"; src = fetchurl { @@ -721,6 +740,15 @@ rec { }; }; + ClassMix = buildPerlPackage rec { + name = "Class-Mix-0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "054d0db62df90f22601f2a18fc84e9ca026d81601f5940b2fcc543e39d69b36b"; + }; + propagatedBuildInputs = [ParamsClassify]; + }; + ClassMOP = Moose; ClassSingleton = buildPerlPackage rec { @@ -907,6 +935,15 @@ rec { buildInputs = [CryptCBC]; }; + CryptEksblowfish = buildPerlPackage rec { + name = "Crypt-Eksblowfish-0.009"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; + }; + propagatedBuildInputs = [ClassMix]; + }; + CryptPasswdMD5 = buildPerlPackage { name = "Crypt-PasswdMD5-1.3"; src = fetchurl { @@ -931,6 +968,23 @@ rec { }; }; + CryptMySQL = buildPerlPackage rec { + name = "Crypt-MySQL-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IK/IKEBE/${name}.tar.gz"; + sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; + }; + propagatedBuildInputs = [DigestSHA1]; + }; + + CryptRijndael = buildPerlPackage rec { + name = "Crypt-Rijndael-1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; + sha256 = "8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4"; + }; + }; + CryptSmbHash = buildPerlPackage rec { name = "Crypt-SmbHash-0.12"; src = fetchurl { @@ -994,6 +1048,23 @@ rec { }; }; + DataEntropy = buildPerlPackage rec { + name = "Data-Entropy-0.007"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; + }; + propagatedBuildInputs = [ParamsClassify DataFloat CryptRijndael HTTPLite]; + }; + + DataFloat = buildPerlPackage rec { + name = "Data-Float-0.012"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "698ecb092a3284e260cd3c3208408feb791d7d0f06a02673f9125ab2d51cc2d8"; + }; + }; + DataHierarchy = buildPerlPackage { name = "Data-Hierarchy-0.34"; src = fetchurl { @@ -1003,6 +1074,14 @@ rec { propagatedBuildInputs = [TestException]; }; + DataInteger = buildPerlPackage rec { + name = "Data-Integer-0.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "3a52f7717d1ebda3af40036d72cbcadd1984210737743997abdad141d620f67e"; + }; + }; + DataOptList = buildPerlPackage rec { name = "Data-OptList-0.107"; src = fetchurl { @@ -1245,6 +1324,14 @@ rec { ]; }; + DigestCRC = buildPerlPackage rec { + name = "Digest-CRC-0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/${name}.tar.gz"; + sha256 = "5c5329f37c46eb79835169508583da8767d9839350b69bb2b48ac6f594f70374"; + }; + }; + DigestHMAC = buildPerlPackage { name = "Digest-HMAC-1.01"; src = fetchurl { @@ -1254,6 +1341,14 @@ rec { propagatedBuildInputs = [DigestSHA1]; }; + DigestMD4 = buildPerlPackage rec { + name = "Digest-MD4-1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/${name}.tar.gz"; + sha256 = "c7d7a32f5c2710c929b5688a7b057ec8ddbc51cf278f623e771fc02dcabd6a1f"; + }; + }; + DigestSHA = buildPerlPackage rec { name = "Digest-SHA-5.47"; src = fetchurl { @@ -1823,6 +1918,14 @@ rec { }; }; + HTTPLite = buildPerlPackage rec { + name = "HTTP-Lite-2.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "66f4fc0f93eeb42c09737f83b21de1944212ae9b2acb784d5103e8208491477b"; + }; + }; + HTTPMessage = buildPerlPackage rec { name = "HTTP-Message-6.02"; src = fetchurl { @@ -3084,6 +3187,14 @@ rec { }; }; + ScalarString = buildPerlPackage rec { + name = "Scalar-String-0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/${name}.tar.gz"; + sha256 = "d3a45cc137bb9f7d8848d5a10a5142d275a98f8dcfd3adb60593cee9d33fa6ae"; + }; + }; + ScopeGuard = buildPerlPackage { name = "Scope-Guard-0.03"; src = fetchurl { @@ -3907,6 +4018,14 @@ rec { }; }; + CryptUnixCryptXS = buildPerlPackage rec { + name = "Crypt-UnixCrypt_XS-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; + }; + }; + URI = buildPerlPackage rec { name = "URI-1.59"; src = fetchurl { From 9e334221fc77e13162f143308ddfba59e3cf7d53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Jul 2012 21:39:49 +0200 Subject: [PATCH 0400/1120] ikiwiki: enable pass phrase authentication support --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 35ce5478d90f..73dfe29a572c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML, which, HTMLTree +, YAMLLibYAML, which, HTMLTree, AuthenPassphrase , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree ] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase ] ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783ab79b1953..681b5f2fcac7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7011,7 +7011,8 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir; + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir + AuthenPassphrase; }; imagemagick = callPackage ../applications/graphics/ImageMagick { From da4c64026af9f493e34061bffbc3b4e77c1ce0e4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 29 Jul 2012 15:54:31 -0400 Subject: [PATCH 0401/1120] linux/kernel/manual-config: Greatly simplify config parser --- .../linux/kernel/manual-config.nix | 70 +++---------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 62 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index c943c8fa823c..41dbbc227602 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, nettools, perl, kmod, writeTextFile, coffeescript }: +{ stdenv, runCommand, nettools, perl, kmod, writeTextFile }: with stdenv.lib; @@ -7,66 +7,14 @@ let # Function to parse the config file to get the features supported readFeatures = config: let - configParser = writeTextFile { name = "config-parser"; executable=true; text = '' - #!${coffeescript}/bin/coffee - fs = require "fs" - events = require "events" - - lineEmitter = new events.EventEmitter() - buffer = new Buffer 0 - input = fs.createReadStream process.argv[2] - input.on 'data', (data) -> - nextBuffer = new Buffer buffer.length + data.length - buffer.copy(nextBuffer) - data.copy(nextBuffer, buffer.length) - start = 0 - offset = buffer.length - buffer = nextBuffer - - for i in [1..data.length] - if data[i] == '\n'.charCodeAt 0 - end = i+offset+1 - line = buffer.slice start, end - 1 - start = end - lineEmitter.emit "line", line.toString() - - buffer = buffer.slice start - input.once 'end', -> - input.destroy() - if safeToWrite - output.end "}" - output.destroySoon() - else - output.once 'drain', -> - output.end "}" - output.destroySoon() - - output = fs.createWriteStream process.env["out"] - output.setMaxListeners 0 - safeToWrite = output.write "{\n" - unless safeToWrite - output.once 'drain', -> - safeToWrite = true - - escapeNixString = (str) -> - str.replace("'''", "''''").replace("''${", "'''''${") - lineEmitter.on 'line', (line) -> - unless line.length is 0 or line.charAt(0) is '#' - split = line.split '=' - name = split[0].substring "CONFIG_".length - value = escapeNixString split.slice(1).join "" - lineToWrite = "\"#{name}\" = '''#{value}''';\n" - if safeToWrite - safeToWrite = output.write lineToWrite - else - input.pause() - output.once 'drain', -> - safeToWrite = output.write lineToWrite - input.resume() - '';}; - - configAttrs = import "${runCommand "attrList.nix" {} "${configParser} ${config}"}"; - + configAttrs = import "${runCommand "attrList.nix" {} '' + grep -E -v '(^#|^$)' < ${config} | \ + sed 's/CONFIG_// ; s/=/ /' | \ + awk \ + 'BEGIN { print "{" } + END { print "}" } + { printf "\"%s\" = '"'''"'%s'"'''"';\n", $1, $2 }' > $out + ''}"; getValue = option: if hasAttr option configAttrs then getAttr option configAttrs else null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 681b5f2fcac7..4cc46b6836de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5859,7 +5859,6 @@ let # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { inherit (pkgs) stdenv runCommand nettools perl kmod writeTextFile; - coffeescript = pkgs.nodePackages."coffee-script"; }; keyutils = callPackage ../os-specific/linux/keyutils { }; From 812c182be54822a8ba8f9825d4fe6a48cea8a027 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 27 Jul 2012 18:36:10 -0400 Subject: [PATCH 0402/1120] s3sync: Require Ruby 1.8 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cc46b6836de..0c127b49d340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1410,7 +1410,9 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3sync = callPackage ../tools/networking/s3sync { }; + s3sync = callPackage ../tools/networking/s3sync { + ruby = ruby18; + }; sablotron = callPackage ../tools/text/xml/sablotron { }; From bb2cff55ae253ed8d57d5136850d00c80dbbf4dc Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 30 Jul 2012 18:58:54 +0200 Subject: [PATCH 0403/1120] dovecot_2: Enable LDAP support. --- pkgs/servers/mail/dovecot/2.x.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/2.x.nix index d500e5c9bd5d..1b4fbe7c7cc2 100644 --- a/pkgs/servers/mail/dovecot/2.x.nix +++ b/pkgs/servers/mail/dovecot/2.x.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, openssl, pam, bzip2, zlib}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: stdenv.mkDerivation rec { name = "dovecot-2.1.8"; - buildInputs = [openssl pam bzip2 zlib]; + buildInputs = [openssl pam bzip2 zlib inotifyTools openldap]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { # It will hardcode this for /var/lib/dovecot. # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211 - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--localstatedir=/var" + "--with-ldap" + ]; meta = { homepage = http://dovecot.org/; From bec34c6f599db0429ca3312f15105a8dcbb75733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 30 Jul 2012 19:25:08 +0200 Subject: [PATCH 0404/1120] btar: update to 1.1.1 (bugfix) --- pkgs/tools/backup/btar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 528bb05bb0cb..0258edb8a194 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, librsync }: stdenv.mkDerivation rec { - name = "btar-1.1"; + name = "btar-1.1.1"; src = fetchurl { url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz"; - sha256 = "17vkccv2b7mz1pj5zmnapjkx9aykzb6xf5wibwhn8da6kn7qwnnj"; + sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"; }; buildInputs = [ librsync ]; From 5d4916871c705a478415685376cde8a105d7681c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jul 2012 13:47:38 -0400 Subject: [PATCH 0405/1120] libcgroup: Update to 0.38 --- pkgs/os-specific/linux/libcgroup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index aa73867122f1..0246f6729b10 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pam, yacc, flex }: stdenv.mkDerivation rec { - name = "libcgroup-0.37.1"; + name = "libcgroup-0.38"; src = fetchurl { url = "mirror://sourceforge/libcg/${name}.tar.bz2"; - sha256 = "03awrn49bb84a9vaha1kjdbpwdnrfwmd08mlajjilr6kwlnn620b"; + sha256 = "0zw6144jlvzx0hasl4b07vjfa4lm12jaax6zzkljzxlmifjd2djx"; }; buildInputs = [ pam ]; buildNativeInputs = [ yacc flex ]; - + meta = { description = "Library and tools to manage Linux's cgroup resource management system"; homepage = http://libcg.sourceforge.net/; From cae8bec49044ff7920c19e2379c5bf2719643a1d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 31 Jul 2012 00:11:03 +0200 Subject: [PATCH 0406/1120] stunnel: Update to 4.53 --- pkgs/tools/networking/stunnel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index fa225877b403..d16d9bfb0896 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation { - name = "stunnel-4.26"; + name = "stunnel-4.53"; src = fetchurl { - url = http://www.stunnel.org/download/stunnel/src/stunnel-4.26.tar.gz; - sha256 = "1lvbd25krcz1sqk5pj2fv3r32h0160qdxrbzlqqs0kz8f987krp9"; + url = http://www.stunnel.org/downloads/stunnel-4.53.tar.gz; + sha256 = "3e640aa4c96861d10addba758b66e99e7c5aec8697764f2a59ca2268901b8e57"; }; buildInputs = [openssl]; From b5d4e8a17a70657455122d6103d156ef6c2f6d07 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 31 Jul 2012 10:26:18 +0200 Subject: [PATCH 0407/1120] linux-3.4: upgrade to 3.4.7 --- 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 b51154d0ca21..ae5f5dcaa3f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.6"; + version = "3.4.7"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0302q8m4xq0pidsd8ga0568sb620pk4il2kb8gi7dhsq615himjh"; + sha256 = "0y93f6vjax4bwl6w73yqxn7dnv43ywd5vf5f5q27fm7y49m9ch95"; }; config = configWithPlatform stdenv.platform; From 7d708365805ad7f9056c05611de9c24f357ca4d2 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Thu, 12 Jul 2012 17:22:45 +0200 Subject: [PATCH 0408/1120] ocamlgraph: update to 1.8.2 Also added the dependency on lablgtk, so that it builds the 'dgraph' module, which is needed for packaging frama-c. This dependency can be made optional. --- .../ocaml-modules/ocamlgraph/default.nix | 14 ++++++--- .../tools/misc/frama-c/default.nix | 29 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/misc/frama-c/default.nix diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 92a465731174..2e109f1d6210 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, ocaml, findlib }: +{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.8.1"; + version = "1.8.2"; in stdenv.mkDerivation { @@ -10,15 +10,21 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0hrba69wvw9b42irkvjf6q7zzw12v5nyyc33yaq3jlf1qbzqhqxs"; + sha256 = "e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlPackages.lablgtk ]; patches = ./destdir.patch; + # some patching is required so that the lablgtk2 library is taken into account. It + # does not reside in a subdirectory of the default library path, hence: + # * configure looked in the wrong path + # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in + sed -i 's@-I +lablgtk2@-I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; diff --git a/pkgs/development/tools/misc/frama-c/default.nix b/pkgs/development/tools/misc/frama-c/default.nix new file mode 100644 index 000000000000..2f597d29c75b --- /dev/null +++ b/pkgs/development/tools/misc/frama-c/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, ocamlPackages }: + +let + + version = "20111001"; + sha256 = "8afad848321c958fab265045cd152482e77ce7c175ee7c9af2d4bec57a1bc671"; + +in stdenv.mkDerivation { + name = "frama-c-${version}"; + + src = fetchurl { + url = "http://frama-c.com/download/frama-c-Nitrogen-${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = with ocamlPackages; [ + ocaml findlib + ]; + + meta = { + description = "Frama-C is an extensible tool for source-code analysis of C software"; + + homepage = http://frama-c.com/; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.amiddelk ]; + platforms = stdenv.lib.platforms.gnu; + }; +} From 2df1d646c80c771348e73fd3ea359b82940359e2 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Thu, 12 Jul 2012 17:42:24 +0200 Subject: [PATCH 0409/1120] frama-c: add version 20111001 --- .../0007-Port-to-OCamlgraph-1.8.2.patch | 64 +++++++++++++++++++ .../tools/misc/frama-c/default.nix | 42 +++++++++++- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch diff --git a/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch b/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch new file mode 100644 index 000000000000..1c16e1794abc --- /dev/null +++ b/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch @@ -0,0 +1,64 @@ +From: Mehdi Dogguy +Date: Wed, 16 May 2012 14:48:40 +0200 +Subject: Port to OCamlgraph 1.8.2 + + o Graph.Topological: as of OCamlgraph 1.8.2, the input graph must + implement Sig.COMPARABLE instead of Sig.HASHABLE +--- + src/misc/service_graph.ml | 2 +- + src/misc/service_graph.mli | 2 +- + src/semantic_callgraph/register.ml | 1 + + src/syntactic_callgraph/register.ml | 1 + + 4 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml +index f30a1be..567698f 100644 +--- a/src/misc/service_graph.ml ++++ b/src/misc/service_graph.ml +@@ -24,7 +24,7 @@ module Make + (G: sig + type t + module V: sig +- include Graph.Sig.HASHABLE ++ include Graph.Sig.COMPARABLE + val id: t -> int + val name: t -> string + val attributes: t -> Graph.Graphviz.DotAttributes.vertex list +diff --git a/src/misc/service_graph.mli b/src/misc/service_graph.mli +index 5ebb570..8006977 100644 +--- a/src/misc/service_graph.mli ++++ b/src/misc/service_graph.mli +@@ -28,7 +28,7 @@ module Make + (G: sig + type t + module V: sig +- include Graph.Sig.HASHABLE ++ include Graph.Sig.COMPARABLE + val id: t -> int + (** assume is >= 0 and unique for each vertices of the graph *) + val name: t -> string +diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml +index 0b3b4df..064dca8 100644 +--- a/src/semantic_callgraph/register.ml ++++ b/src/semantic_callgraph/register.ml +@@ -107,6 +107,7 @@ module Service = + (if Kernel_function.is_definition v then `Bold + else `Dotted) ] + let equal = Kernel_function.equal ++ let compare v1 v2 = Datatype.Int.compare (id v1) (id v2) + let hash = Kernel_function.hash + let entry_point () = + try Some (fst (Globals.entry_point ())) +diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml +index 4efb594..d9d78b9 100644 +--- a/src/syntactic_callgraph/register.ml ++++ b/src/syntactic_callgraph/register.ml +@@ -41,6 +41,7 @@ module Service = + | NIVar (_,b) when not !b -> `Style `Dotted + | _ -> `Style `Bold ] + let equal v1 v2 = id v1 = id v2 ++ let compare v1 v2 = Datatype.Int.compare (id v1) (id v2) + let hash = id + let entry_point () = !entry_point_ref + end +-- diff --git a/pkgs/development/tools/misc/frama-c/default.nix b/pkgs/development/tools/misc/frama-c/default.nix index 2f597d29c75b..ede316b4b7b8 100644 --- a/pkgs/development/tools/misc/frama-c/default.nix +++ b/pkgs/development/tools/misc/frama-c/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, ocamlPackages }: +# Note on a potential dependency-bloat: +# Frama-c ships with several plugins that have dependencies on other +# software. Not providing the dependencies has as effect that certain +# plugins will not be available. +# I've included the dependencies that are well-supported by nixpkgs +# and seem useful in general. Not included are: +# alt-ergo, ltl2ba, otags, why-dp + +{ stdenv, fetchurl, ncurses, ocamlPackages, coq, graphviz }: let @@ -14,9 +22,39 @@ in stdenv.mkDerivation { }; buildInputs = with ocamlPackages; [ - ocaml findlib + ncurses ocaml findlib ocamlgraph + lablgtk coq graphviz # optional dependencies ]; + patches = [ + # this patch comes from the debian frama-c package, and was + # posted on the frama-c issue tracker. + ./0007-Port-to-OCamlgraph-1.8.2.patch + ]; + + postPatch = '' + # strip absolute paths to /usr/bin + for file in ./configure ./share/Makefile.common ./src/*/configure; do + substituteInPlace $file --replace '/usr/bin/' "" + done + + # find library paths + OCAMLGRAPH_HOME=`ocamlfind query ocamlgraph` + LABLGTK_HOME=`ocamlfind query lablgtk2` + + # patch search paths + # ensure that the tests against the ocamlgraph version succeeds + # filter out the additional search paths from ocamldep + substituteInPlace ./configure \ + --replace '$OCAMLLIB/ocamlgraph' "$OCAMLGRAPH_HOME" \ + --replace '$OCAMLLIB/lablgtk2' "$LABLGTK_HOME" \ + --replace '+ocamlgraph' "$OCAMLGRAPH_HOME" \ + --replace '1.8)' '*)' + substituteInPlace ./Makefile --replace '+lablgtk2' "$LABLGTK_HOME" \ + --replace '$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES))' \ + '$(patsubst /%,.,$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES)))' + ''; + meta = { description = "Frama-C is an extensible tool for source-code analysis of C software"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c127b49d340..ad80feb12729 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2964,6 +2964,8 @@ let coccinelle = callPackage ../development/tools/misc/coccinelle { }; + framac = callPackage ../development/tools/misc/frama-c { }; + cppi = callPackage ../development/tools/misc/cppi { }; cproto = callPackage ../development/tools/misc/cproto { }; From 5bc99bc88351222d8c03c9a8dcbf29c4f3993533 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Mon, 30 Jul 2012 18:08:06 +0200 Subject: [PATCH 0410/1120] Adds Ocaml 4.00.0 (first attempt) Bumps Findlib to 1.3.3 (required for ocaml 4.00) --- pkgs/development/compilers/ocaml/4.00.0.nix | 63 +++++++++++++++++++ .../tools/ocaml/findlib/default.nix | 6 +- pkgs/top-level/all-packages.nix | 3 + 3 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/ocaml/4.00.0.nix diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.0.nix new file mode 100644 index 000000000000..da065356e851 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.00.0.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, ncurses, x11 }: + +let + useX11 = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; +in + +stdenv.mkDerivation rec { + + name = "ocaml-4.00.0"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + preConfigure = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + passthru = { + nativeCompilers = useNativeCompilers; + }; + + meta = { + homepage = http://caml.inria.fr/ocaml; + licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; + description = "OCaml, the most popular variant of the Caml language"; + + longDescription = + '' + OCaml is the most popular variant of the Caml language. From a + language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The OCaml system is an industrial-strength implementation of this + language, featuring a high-performance native-code compiler (ocamlopt) + for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, + Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) + and an interactive read-eval-print loop (ocaml) for quick development + and portability. The OCaml distribution includes a comprehensive + standard library, a replay debugger (ocamldebug), lexer (ocamllex) and + parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) + and a documentation generator (ocamldoc). + ''; + + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; + +} diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index c89af03097d7..3170712b9baf 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.2.7"; + name = "ocaml-findlib-1.3.3"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.2.7.tar.gz; - sha256 = "16q2avr48hd7vwz3bwvjw39dva86mdwa05drcwz32fwbwhlv2869"; + url = http://download.camlcity.org/download/findlib-1.3.3.tar.gz; + sha256 = "981f5c67118a2be015efa79f3af3cb0063376b93123b5d695e7cb5c586b1d45c"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad80feb12729..e07069587b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2396,6 +2396,8 @@ let ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { }; + ocaml_4_00_0 = callPackage ../development/compilers/ocaml/4.00.0.nix { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; @@ -2491,6 +2493,7 @@ let ocamlPackages_3_10_0 = mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0; ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; + ocamlPackages_4_00_0 = mkOcamlPackages ocaml_4_00_0 pkgs.ocamlPackages_4_00_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; From 63be0ae2f770dbd137e271bccd051b3adb17486b Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 31 Jul 2012 00:50:48 +0200 Subject: [PATCH 0411/1120] patch of sexplib for compatibility with ocaml 4.00.0. --- .../ocaml-modules/sexplib/default.nix | 2 +- ...explib-7.0.5-patch-ocamlbuild-ocaml4.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix index d999dc471bdb..32d5c842dc8c 100644 --- a/pkgs/development/ocaml-modules/sexplib/default.nix +++ b/pkgs/development/ocaml-modules/sexplib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "b1022da052254581aae51fb634345920364439f715a2c786abcd0b828c2ce697"; }; - patches = [ ./sexp-3.10-compat.patch ]; + patches = [ ./sexp-3.10-compat.patch ./sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch ]; buildInputs = [ocaml findlib ocaml_typeconv ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch new file mode 100644 index 000000000000..02e13e39445a --- /dev/null +++ b/pkgs/development/ocaml-modules/sexplib/sexplib-7.0.5-patch-ocamlbuild-ocaml4.patch @@ -0,0 +1,29 @@ +Patch from the fedora repository. + +--- sexplib-7.0.5.old/myocamlbuild.ml 2012-03-20 16:41:54.000000000 +0000 ++++ sexplib-7.0.5/myocamlbuild.ml 2012-07-30 11:38:21.829869635 +0100 +@@ -438,7 +438,13 @@ + BaseEnvLight.var_choose cond_specs env + in + flag tags & spec) +- t.flags ++ t.flags; ++ ++ flag ["ocaml"; "compile"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]); ++ flag ["ocaml"; "link"; "byte"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cma"]); ++ flag ["ocaml"; "compile"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"]); ++ flag ["ocaml"; "link"; "native"; "use_toploop"] (S[A"-I"; A"+compiler-libs"; A"+compiler-libs/ocamltoplevel.cmxa"]); ++ + | _ -> + () + +--- sexplib-7.0.5.old/_tags 2012-03-20 16:41:54.000000000 +0000 ++++ sexplib-7.0.5/_tags 2012-07-30 11:37:01.749255839 +0100 +@@ -49,6 +49,7 @@ + : pkg_camlp4.extend + # Library sexplib_top + "top": include ++: use_toploop + # Executable sexp_test + "lib_test/sexp_test.byte": use_sexplib + "lib_test/sexp_test.byte": pkg_unix From 2d09dbf8fc456a6fea0fc01c861250b59db05698 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 31 Jul 2012 00:40:41 +0200 Subject: [PATCH 0412/1120] update of ocaml-makefile to version 6.37.0. --- pkgs/development/ocaml-modules/ocamlmake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 23858576efd5..0170119d94e0 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -2,14 +2,14 @@ let - version = "6.36.0"; - sha256 = "7c9a771d79bf945050dc7530957f4b61669976177818185e64c002cbfd75e3a2"; + version = "6.37.0"; + sha256 = "99ff58080ed154cc4bd70f915fe4760dffb026a1c0447caa0b3bdb982b24b0a8"; in stdenv.mkDerivation { name = "ocaml-make-${version}"; src = fetchurl { - url = "http://hg.ocaml.info/release/ocaml-make/archive/release-${version}.tar.bz2"; + url = "http://bitbucket.org/mmottl/ocaml-makefile/downloads/ocaml-makefile-${version}.tar.gz"; inherit sha256; }; From 26b4e2a286efab1bca53a84602a25619c6dffc5f Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Mon, 30 Jul 2012 20:12:06 +0200 Subject: [PATCH 0413/1120] compatibility fix of ocaml-extlib for ocaml 4.00.0. --- pkgs/development/ocaml-modules/extlib/default.nix | 1 + .../extlib/hashtable-ocaml4-compat.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 55e1c8418305..a520f8196d8a 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa"; }; + patches = [ ./hashtable-ocaml4-compat.patch ]; buildInputs = [ocaml findlib]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch new file mode 100644 index 000000000000..c587f2b6cd3b --- /dev/null +++ b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch @@ -0,0 +1,12 @@ +Revision 396 from the official extlib repository. + +--- extlib/extHashtbl.ml (revision 395) ++++ extlib/extHashtbl.ml (working copy) +@@ -32,6 +32,7 @@ + } + + include Hashtbl ++ let create n = Hashtbl.create (* no seed *) n + + external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity" + external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity" \ No newline at end of file From 2faada9f30ac5cd42c061ee54bfc40101f848584 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 31 Jul 2012 15:16:11 +0200 Subject: [PATCH 0414/1120] mobile-broadband-provider-info: Update to 20120614 --- pkgs/data/misc/mobile-broadband-provider-info/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 830e0ffa68a4..52e9ebf0617c 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "20110511"; + version = "20120614"; pname = "mobile-broadband-provider-info"; name = "${pname}-${version}"; in @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { inherit name; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.bz2"; - sha256 = "0cny8bd6kdwvabnwdr00f4wp4xjbc8ynp0kcdg72c1q9186kdikj"; + url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz"; + sha256 = "72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1"; }; meta = { From eb29e0449bc0382f5bd8238f69031982fdde4fdb Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 31 Jul 2012 15:51:31 +0200 Subject: [PATCH 0415/1120] Add mod_evasive --- .../apache-modules/mod_evasive/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/http/apache-modules/mod_evasive/default.nix diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix new file mode 100644 index 000000000000..22e0fabf832c --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, apacheHttpd }: + +stdenv.mkDerivation { + name = "mod_evasive_1.10.1"; + + src = fetchurl { + url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; + sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07"; + }; + + buildInputs = [ apacheHttpd ]; + + buildPhase = '' + export APACHE_LIBEXECDIR=$out/modules + export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + apxs -ca mod_evasive20.c + ''; + + installPhase = '' + mkdir -p $out/modules + cp .libs/mod_evasive20.so $out/modules + ''; + + meta = { + homepage = "http://www.zdziarski.com/blog/?page_id=442"; + description = "mod_evasive is an evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack."; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e07069587b18..98c0e16d7974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5224,6 +5224,8 @@ let memcached = callPackage ../servers/memcached {}; + mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; From 53007311775716454abb2b054df3994be980e892 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 31 Jul 2012 16:30:50 -0400 Subject: [PATCH 0416/1120] Joe: Bump to 3.7 --- pkgs/applications/editors/joe/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index b6324e5879ce..0e97a036905c 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl} : -stdenv.mkDerivation { - name = "joe-3.3"; +stdenv.mkDerivation rec { + name = "joe-3.7"; + src = fetchurl { - url = mirror://sourceforge/joe-editor/joe-3.3.tar.gz; - md5 = "02221716679c039c5da00c275d61dbf4"; + url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; + sha256 = "0vqhffdjn3xwsfa383i6kdrpfwilq8b382ljjhy1v32smphmdr6a"; }; meta = { From ed8c4b0585daba9c8f39f06c33edeed7d80d1505 Mon Sep 17 00:00:00 2001 From: Laszlo Nagy Date: Tue, 31 Jul 2012 23:34:52 +0200 Subject: [PATCH 0417/1120] Fix w3m configure problem on non-chroot build env. The configure script picks up libbsd.so from the host machine. It uses simple find command to locate the file, but the linker can not use it. The fix replace the search path to /no-such-path --- pkgs/applications/networking/browsers/w3m/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index d5294c961e64..2a05e920d5f1 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"; preConfigure = '' + substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path substituteInPlace ./configure --replace /usr /no-such-path ''; From 36fc363a476ada030742abeab3c811d9da76ef60 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Aug 2012 00:24:17 +0200 Subject: [PATCH 0418/1120] django: Security update to 1.3.2 and 1.4.1. Django 1.4.0 and 1.3.1 have serious security vulnerabilities which are addressed in those releases, for details, please see: https://www.djangoproject.com/weblog/2012/jul/30/security-releases-issued/ --- pkgs/top-level/python-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b2139a8c68e..f843d2511b2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -507,11 +507,11 @@ let pythonPackages = python.modules // rec { django = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4"; + version = "1.4.1"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/${version}/${name}.tar.gz"; - sha256 = "1sc8ajixaqfylb7jmmhn38hgbnqipylh1sqmpicx7rqhxbxvm5n0"; + sha256 = "16s0anvpaccbqmdrhl71z73k0dy2sl166nnc2fbd5lshlgmj13ad"; }; doCheck = false; @@ -523,12 +523,12 @@ let pythonPackages = python.modules // rec { }; - django_1_3_1 = buildPythonPackage rec { - name = "Django-1.3.1"; + django_1_3_2 = buildPythonPackage rec { + name = "Django-1.3.2"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "0sqmvqy3y5h76pa3zjcnyiy5x01bzzy03afdp2qdwqx0x321i4dg"; + sha256 = "0r6pdm33x96aba9x36jvqpkh2bf1zixnzvr12mcc8qq8wc7hii3j"; }; doCheck = false; @@ -548,7 +548,7 @@ let pythonPackages = python.modules // rec { md5 = "24b8373916f53f74d701b99a6cf41409"; }; - propagatedBuildInputs = [ django_1_3_1 ]; + propagatedBuildInputs = [ django_1_3_2 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -565,7 +565,7 @@ let pythonPackages = python.modules // rec { sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8"; }; - propagatedBuildInputs = [ pkgs.pil django_1_3_1 ]; + propagatedBuildInputs = [ pkgs.pil django_1_3_2 ]; meta = { description = "A collection of useful extensions for Django"; @@ -2072,7 +2072,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil paramiko flup pygments - djblets django_1_3_1 django_evolution pkgs.pycrypto python.modules.sqlite3 + djblets django_1_3_2 django_evolution pkgs.pycrypto python.modules.sqlite3 pysvn pkgs.pil psycopg2 ]; }; From bd8d7a8d15def4730491c4e19a0a0406bc740c9c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Jul 2012 17:21:41 -0400 Subject: [PATCH 0419/1120] Add some packages to the channel --- .../applications/version-management/bazaar/default.nix | 1 + pkgs/development/perl-modules/DBD-Pg/default.nix | 10 ++++++---- pkgs/development/perl-modules/DBD-SQLite/default.nix | 10 ++++++---- pkgs/top-level/perl-packages.nix | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 462aede3b1c7..856320f01684 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix index 02c436404078..0d0cb1accc5b 100644 --- a/pkgs/development/perl-modules/DBD-Pg/default.nix +++ b/pkgs/development/perl-modules/DBD-Pg/default.nix @@ -1,15 +1,17 @@ -{ fetchurl, buildPerlPackage, DBI, postgresql }: +{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }: buildPerlPackage rec { name = "DBD-Pg-2.19.2"; - + src = fetchurl { url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz"; sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9"; }; - + buildInputs = [ postgresql ]; propagatedBuildInputs = [ DBI ]; - + makeMakerFlags = "POSTGRES_HOME=${postgresql}"; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 8e1faf900a06..4cc2eb6a01ce 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,15 +1,15 @@ -{fetchurl, buildPerlPackage, DBI, sqlite}: +{ stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { name = "DBD-SQLite-1.35"; - + src = fetchurl { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z"; }; - + propagatedBuildInputs = [ DBI ]; - + makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; patches = [ @@ -23,4 +23,6 @@ buildPerlPackage rec { # Disabled because the tests can randomly fail due to timeouts # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). doCheck = false; + + meta.platforms = stdenv.lib.platforms.linux; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c5d2de58fca6..7fc3a0442e88 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -405,6 +405,7 @@ rec { CatalystDevel DBIxClassSchemaLoader MooseXNonMoose NamespaceClean HashMerge DBIxClassCursorCached ]; + meta.platforms = stdenv.lib.platforms.linux; }; CatalystRuntime = buildPerlPackage rec{ @@ -1201,7 +1202,7 @@ rec { }; DBDSQLite = import ../development/perl-modules/DBD-SQLite { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; }; @@ -1211,7 +1212,7 @@ rec { }; DBDPg = import ../development/perl-modules/DBD-Pg { - inherit fetchurl buildPerlPackage DBI; + inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) postgresql; }; From 10d92ca9889db6871b25cb3d5acd87997dc3141d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 1 Aug 2012 10:59:44 +0200 Subject: [PATCH 0420/1120] django: Rename django_1_3_2 to django_1_3. The django team tries very hard to not introduce backwards-incompatible changes into patch versions, so I guess it is safe to only use the major and minor version number for specific Django versions. This way, it doesn't require manual action by users who have added django_1_3_* into system packages or local overrides/custom derivations. Thanks to @7c6f434c for the suggestion. --- 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 f843d2511b2a..f9743951797d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -523,7 +523,7 @@ let pythonPackages = python.modules // rec { }; - django_1_3_2 = buildPythonPackage rec { + django_1_3 = buildPythonPackage rec { name = "Django-1.3.2"; src = fetchurl { @@ -548,7 +548,7 @@ let pythonPackages = python.modules // rec { md5 = "24b8373916f53f74d701b99a6cf41409"; }; - propagatedBuildInputs = [ django_1_3_2 ]; + propagatedBuildInputs = [ django_1_3 ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -565,7 +565,7 @@ let pythonPackages = python.modules // rec { sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8"; }; - propagatedBuildInputs = [ pkgs.pil django_1_3_2 ]; + propagatedBuildInputs = [ pkgs.pil django_1_3 ]; meta = { description = "A collection of useful extensions for Django"; @@ -2072,7 +2072,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil paramiko flup pygments - djblets django_1_3_2 django_evolution pkgs.pycrypto python.modules.sqlite3 + djblets django_1_3 django_evolution pkgs.pycrypto python.modules.sqlite3 pysvn pkgs.pil psycopg2 ]; }; From b530c8c22f4146fc80a98f784b3a6991235e8431 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 1 Aug 2012 11:49:56 +0200 Subject: [PATCH 0421/1120] networkmanager: Add me as maintainer --- pkgs/tools/networking/network-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e5bd2ab77e38..f7aab9fb4f25 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management in an easy way. Desktop environment independent."; license = licenses.gpl2Plus; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; }; } From c01b8a76e4b71d2ed47a9775b8d58b30887860e4 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 1 Aug 2012 11:50:42 +0200 Subject: [PATCH 0422/1120] gnomeicontheme: Update to 3.4.0 --- .../gnome-2/desktop/gnome-icon-theme/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index a16dfb14d226..a1dbf78bba26 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }: +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }: stdenv.mkDerivation rec { - name = "gnome-icon-theme-2.30.3"; + #name = "gnome-icon-theme-3.4.0"; + name = "gnome-icon-theme-2.91.93"; src = fetchurl { - url = mirror://gnome/sources/gnome-icon-theme/2.30/gnome-icon-theme-2.30.3.tar.bz2; - sha256 = "1iysjfw3rajv9skdhshwcbjsm4jrsl6sfvqzrfynsfl4fyfjyzj1"; + #url = "mirror://gnome/sources/gnome-icon-theme/3.4/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2"; + sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; }; - buildNativeInputs = [ pkgconfig intltool iconnamingutils ]; + buildNativeInputs = [ pkgconfig intltool iconnamingutils gtk ]; } From 70114d1b0dd91e9d6d80d2a43520e836ba34d40e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 1 Aug 2012 11:51:41 +0200 Subject: [PATCH 0423/1120] networkmanagerapplet: Update to 0.9.4.1 Also add dependency on mobile_broadband_provider_info. --- .../network-manager-applet/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d22d5f50988f..1a9b94857495 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade -, networkmanager, GConf, libnotify, libgnome_keyring, dbus_glib -, polkit, isocodes }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf +, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes +, mobile_broadband_provider_info }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.2.0"; + version = "${major}.4.1"; in stdenv.mkDerivation rec { @@ -13,19 +13,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de"; + sha256 = "b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7"; }; - buildInputs = [ gtk libglade networkmanager GConf libnotify libgnome_keyring - polkit isocodes ]; + buildInputs = [ + gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib + polkit isocodes + ]; buildNativeInputs = [ intltool pkgconfig ]; + makeFlags = [ + ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; }; } From 6c0b7103c9c22473f07dd0a251798f07ee5e892d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 31 Jul 2012 17:13:53 -0400 Subject: [PATCH 0424/1120] Add sbc --- pkgs/development/libraries/sbc/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/sbc/default.nix diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix new file mode 100644 index 000000000000..d621eed67285 --- /dev/null +++ b/pkgs/development/libraries/sbc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libsndfile, pkgconfig }: + +stdenv.mkDerivation rec { + name = "sbc-1.0"; + + src = fetchurl { + url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; + sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz"; + }; + + buildInputs = [ pkgconfig libsndfile ]; + + meta = { + description = "SubBand Codec Library"; + + homepage = http://www.bluez.org/; + + licenses = stdenv.lib.licenses.gpl2; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98c0e16d7974..f040dd56d2a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4679,6 +4679,8 @@ let inherit (vamp) vampSDK; }; + sbc = callPackage ../development/libraries/sbc { }; + schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { From 3dbfca0d7fd1d680999a86ca56508990d9ebc39e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 06:18:03 -0400 Subject: [PATCH 0425/1120] linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed. Instead of manually adding which 'features' a kernel has based on its config here, just generate a nixexpr representation of the whole config and let places that need it (e.g. NixOS modules) decide how to map config options to features. Note that if your kernel requires firmware whose hex file sits directly in ${src}/firmware rather than in a subdirectory thereof, you may need this patch for now: https://lkml.org/lkml/2012/7/31/724 --- .../linux/kernel/manual-config.nix | 122 ++++++++++-------- 1 file changed, 70 insertions(+), 52 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 41dbbc227602..a9f0b8f052bb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -4,26 +4,41 @@ with stdenv.lib; let - # Function to parse the config file to get the features supported - readFeatures = config: + # Function to parse the config file into a nix expression + readConfig = configFile: let - configAttrs = import "${runCommand "attrList.nix" {} '' - grep -E -v '(^#|^$)' < ${config} | \ - sed 's/CONFIG_// ; s/=/ /' | \ - awk \ - 'BEGIN { print "{" } - END { print "}" } - { printf "\"%s\" = '"'''"'%s'"'''"';\n", $1, $2 }' > $out + configAttrs = import "${runCommand "config.nix" {} '' + (. ${configFile} + echo "{" + for var in `set`; do + if [[ "$var" =~ ^CONFIG_ ]]; then + IFS="=" + set -- $var + echo "\"$1\" = \"''${*:2}\";" + fi + done + echo "}") > $out ''}"; - getValue = option: - if hasAttr option configAttrs then getAttr option configAttrs else null; - isYes = option: (getValue option) == "y"; + config = configAttrs // rec { + attrName = attr: "CONFIG_" + attr; + + isSet = attr: hasAttr (attrName attr) config; + + getValue = attr: if isSet attr then getAttr (attrName attr) config else null; + + isYes = attr: (isSet attr) && ((getValue attr) == "y"); + + isNo = attr: (isSet attr) && ((getValue attr) == "n"); + + isModule = attr: (isSet attr) && ((getValue attr) == "m"); + + isEnabled = attr: (isModule attr) || (isYes attr); + + isDisabled = attr: (!(isSet attr)) || (isNo attr); + }; in - - { - modular = isYes "MODULES"; - }; + config; in @@ -37,36 +52,35 @@ in # Any patches patches ? [], # The kernel .config file - config, - # Manually specified features the kernel supports + configfile, + # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config - features ? optionalAttrs allowImportFromDerivation (readFeatures config), + config ? optionalAttrs allowImportFromDerivation (readConfig configfile), # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false }: let - commonMakeFlags = [ - "O=../build" - "INSTALL_PATH=$(out)" - "INSTALLKERNEL=${installkernel}" - ]; - installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!/bin/sh mkdir $4 mv -v $2 $4 mv -v $3 $4 '';}; + + isModular = config.isYes "MODULES"; + + installsFirmware = (config.isEnabled "FW_LOADER") && + (isModular || (config.isNo "FIRMWARE_IN_KERNEL")); in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "linux-${version}"; enableParallelBuilding = true; passthru = { - inherit version modDirVersion features; + inherit version modDirVersion config; }; inherit patches src; @@ -82,15 +96,40 @@ stdenv.mkDerivation ({ runHook preConfigure mkdir ../build make $makeFlags "''${makeFlagsArray[@]}" mrproper - ln -sv ${config} ../build/.config + ln -sv ${configfile} ../build/.config make $makeFlags "''${makeFlagsArray[@]}" oldconfig rm ../build/.config.old runHook postConfigure ''; - buildNativeInputs = [ perl nettools kmod ]; + buildNativeInputs = [ perl nettools ] ++ optional isModular kmod; - makeFlags = commonMakeFlags; + makeFlags = [ + "O=../build" + "INSTALL_PATH=$(out)" + "INSTALLKERNEL=${installkernel}" + ] ++ (optional isModular "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"") + ++ optional installsFirmware "INSTALL_FW_PATH=\"$(out)/lib/firmware\""; + + postInstall = if isModular then '' + make modules_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" + rm -f $out/lib/modules/${modDirVersion}/{build,source} + cd .. + mv $sourceRoot $out/lib/modules/${modDirVersion}/source + mv build $out/lib/modules/${modDirVersion}/build + unlink $out/lib/modules/${modDirVersion}/build/source + ln -sv $out/lib/modules/${modDirVersion}/{,build/}source + '' else optionalString installsFirmware '' + make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" + ''; + + postFixup = optionalString isModular '' + if [ -z "$dontStrip" ]; then + find $out -name "*.ko" -print0 | xargs -0 strip -S + fi + ''; meta = { description = "The Linux kernel"; @@ -101,25 +140,4 @@ stdenv.mkDerivation ({ ]; platforms = lib.platforms.linux; }; -} // optionalAttrs (features ? modular && features.modular) { - makeFlags = commonMakeFlags ++ [ - "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" - ]; - - postInstall = '' - make modules_install $makeFlags "''${makeFlagsArray[@]}" \ - $installFlags "''${installFlagsArray[@]}" - rm -f $out/lib/modules/${modDirVersion}/{build,source} - cd .. - mv $sourceRoot $out/lib/modules/${modDirVersion}/source - mv build $out/lib/modules/${modDirVersion}/build - unlink $out/lib/modules/${modDirVersion}/build/source - ln -sv $out/lib/modules/${modDirVersion}/{,build/}source - ''; - - postFixup = '' - if [ -z "$dontStrip" ]; then - find $out -name "*.ko" -print0 | xargs -0 strip -S - fi - ''; -}) +} From 8ea5b1aeaa927dd2606555a0c402cc9fcf8aaeca Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 1 Aug 2012 12:59:34 +0200 Subject: [PATCH 0426/1120] Fix naming convention for haskell-packages.nix --- .../comonad-transformers/{default.nix => 3.0.nix} | 0 .../haskell/comonad/{default.nix => 3.0.0.1.nix} | 0 .../haskell/semigroupoids/{default.nix => 3.0.nix} | 0 pkgs/top-level/haskell-packages.nix | 12 +++++++++--- 4 files changed, 9 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/comonad-transformers/{default.nix => 3.0.nix} (100%) rename pkgs/development/libraries/haskell/comonad/{default.nix => 3.0.0.1.nix} (100%) rename pkgs/development/libraries/haskell/semigroupoids/{default.nix => 3.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/3.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad-transformers/default.nix rename to pkgs/development/libraries/haskell/comonad-transformers/3.0.nix diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/3.0.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad/default.nix rename to pkgs/development/libraries/haskell/comonad/3.0.0.1.nix diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/3.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/semigroupoids/default.nix rename to pkgs/development/libraries/haskell/semigroupoids/3.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c8ec5b2bad15..2660ff784e3c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -534,14 +534,18 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonad = callPackage ../development/libraries/haskell/comonad {}; + comonad_3_0_0_1 = callPackage ../development/libraries/haskell/comonad/3.0.0.1.nix {}; + + comonad = self.comonad_3_0_0_1; comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { comonad = self.comonad_1_1_1_6; semigroupoids = self.semigroupoids_1_3_4; }; - comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {}; + + comonadTransformers = self.comonadTransformers_3_0; compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; @@ -1321,7 +1325,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); comonad = self.comonad_1_1_1_6; }; - semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {}; + + semigroupoids = self.semigroupoids_3_0; shelly = callPackage ../development/libraries/haskell/shelly {}; From 443b9bc936e7ef9af777e7db319b6495543948db Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 11:21:32 -0400 Subject: [PATCH 0427/1120] linux/kernel/manual-config: use isDisabled instead of isNo in case FIRMWARE_IN_KERNEL is left unspecified --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index a9f0b8f052bb..2234a76dbf87 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -71,7 +71,7 @@ let isModular = config.isYes "MODULES"; installsFirmware = (config.isEnabled "FW_LOADER") && - (isModular || (config.isNo "FIRMWARE_IN_KERNEL")); + (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in stdenv.mkDerivation { From 3f4fd55c63de3eb7250606c9a2b0d84eb2bc89f2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 11:26:30 -0400 Subject: [PATCH 0428/1120] linux/manual-config: Remove unnecessary quotation --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 2234a76dbf87..a4929102cb7b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -108,8 +108,8 @@ stdenv.mkDerivation { "O=../build" "INSTALL_PATH=$(out)" "INSTALLKERNEL=${installkernel}" - ] ++ (optional isModular "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"") - ++ optional installsFirmware "INSTALL_FW_PATH=\"$(out)/lib/firmware\""; + ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") + ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; postInstall = if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ From ad49d928995ec9337c02be4dd1f6c7e34e520c97 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 11:56:12 -0400 Subject: [PATCH 0429/1120] linux/manual-config: When installing firmware, create the firmware directory prior to make *_install. It is probably a kernel build system bug that this is necessary, but it's not really a big deal either. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index a4929102cb7b..3f2d5d0a39c7 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -111,7 +111,9 @@ stdenv.mkDerivation { ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; - postInstall = if isModular then '' + postInstall = stdenv.lib.optionalString installsFirmware '' + mkdir -p $out/lib/firmware + '' + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" rm -f $out/lib/modules/${modDirVersion}/{build,source} @@ -123,7 +125,7 @@ stdenv.mkDerivation { '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" - ''; + ''); postFixup = optionalString isModular '' if [ -z "$dontStrip" ]; then From f4847262ae1d638b9b352374a9b678c052218de5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 21:30:47 +0200 Subject: [PATCH 0430/1120] grub2: Add dependency on devicemapper (needed for LVM support) --- pkgs/tools/misc/grub/2.0x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ef9d939ed47b..4186a4405353 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu -, EFIsupport ? false }: +, devicemapper, EFIsupport ? false }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildNativeInputs = [ flex bison ]; - buildInputs = [ ncurses libusb freetype gettext ] + buildInputs = [ ncurses libusb freetype gettext devicemapper ] ++ stdenv.lib.optional doCheck qemu; preConfigure = From fd330e9315c84f2ea9598d4fa2e6cc79a39cb1e3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 14:15:26 -0400 Subject: [PATCH 0431/1120] linux/manual-config: Install the kernel with the name given in stdenv.platform.kernelTarget --- .../linux/kernel/manual-config.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3f2d5d0a39c7..e2cee9c23e7c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -61,10 +61,10 @@ in }: let - installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' + installkernel = name: writeTextFile { name = "installkernel"; executable=true; text = '' #!/bin/sh mkdir $4 - mv -v $2 $4 + mv -v $2 $4/${name} mv -v $3 $4 '';}; @@ -72,6 +72,12 @@ let installsFirmware = (config.isEnabled "FW_LOADER") && (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); + + commonMakeFlags = [ + "O=../build" + "INSTALL_PATH=$(out)" + ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") + ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; in stdenv.mkDerivation { @@ -86,7 +92,7 @@ stdenv.mkDerivation { inherit patches src; prePatch = '' - for mf in $(find -name Makefile -o -name Makefile.include); do + for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do echo "stripping FHS paths in \`$mf'..." sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done @@ -104,12 +110,15 @@ stdenv.mkDerivation { buildNativeInputs = [ perl nettools ] ++ optional isModular kmod; - makeFlags = [ - "O=../build" - "INSTALL_PATH=$(out)" - "INSTALLKERNEL=${installkernel}" - ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") - ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; + makeFlags = commonMakeFlags ++ [ + "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" + ]; + + crossAttrs = { + makeFlags = commonMakeFlags ++ [ + "INSTALLKERNEL=${installkernel stdenv.cross.platform.kernelTarget}" + ]; + }; postInstall = stdenv.lib.optionalString installsFirmware '' mkdir -p $out/lib/firmware From ec587dfc2596aa2c1e933c85016f1e29fe4ead16 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 21:44:53 -0400 Subject: [PATCH 0432/1120] kernelPackages.splashUtils: Enable detecting if manually configured kernels have fbcondecor --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f040dd56d2a1..6ad835a9524a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5816,8 +5816,10 @@ let linuxHeaders = glibc.kernelHeaders; }; - splashutils = - if kernel.features ? fbConDecor then pkgs.splashutils else null; + splashutils = let hasFbConDecor = if kernel ? features + then kernel.features ? fbConDecor + else kernel.config.isEnabled "FB_CON_DECOR"; + in if hasFbConDecor then pkgs.splashutils else null; /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. From 4aba2bb3f509681ff98c68d837437f058cf3dccd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 23:02:17 -0400 Subject: [PATCH 0433/1120] linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index e2cee9c23e7c..6238509e8fa6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -50,7 +50,7 @@ in # The kernel source (tarball, git checkout, etc.) src, # Any patches - patches ? [], + kernelPatches ? [], # The kernel .config file configfile, # Manually specified nixexpr representing the config @@ -86,10 +86,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version modDirVersion config; + inherit version modDirVersion config kernelPatches; }; - inherit patches src; + inherit src; + + patches = map (p: p.patch) kernelPatches; prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do From 1b7264d349cb9c7442f6fbea87e156c24b945e6b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 23:32:02 -0400 Subject: [PATCH 0434/1120] linux/manual-config.nix: When stripping, use xargs -r in case CONFIG_MODULES=y but no modules are actually installed --- pkgs/os-specific/linux/kernel/manual-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6238509e8fa6..523d52b0d3c0 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation { postFixup = optionalString isModular '' if [ -z "$dontStrip" ]; then - find $out -name "*.ko" -print0 | xargs -0 strip -S + find $out -name "*.ko" -print0 | xargs -0 -r strip -S fi ''; From 7954b0134273c157fc65277c39b2cf4cb602cea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 1 Aug 2012 23:54:18 +0200 Subject: [PATCH 0435/1120] Adding gcc 4.7.1. --- pkgs/development/compilers/gcc/4.7/builder.sh | 249 ++++++++++ .../development/compilers/gcc/4.7/default.nix | 441 ++++++++++++++++++ .../compilers/gcc/4.7/gfortran-driving.patch | 20 + .../compilers/gcc/4.7/gnat-cflags.patch | 33 ++ .../compilers/gcc/4.7/hurd-sigrtmin.patch | 14 + .../gcc/4.7/java-jvgenmain-link.patch | 17 + .../compilers/gcc/4.7/libstdc++-target.patch | 32 ++ .../compilers/gcc/4.7/no-sys-dirs.patch | 41 ++ pkgs/top-level/all-packages.nix | 27 +- 9 files changed, 862 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/compilers/gcc/4.7/builder.sh create mode 100644 pkgs/development/compilers/gcc/4.7/default.nix create mode 100644 pkgs/development/compilers/gcc/4.7/gfortran-driving.patch create mode 100644 pkgs/development/compilers/gcc/4.7/gnat-cflags.patch create mode 100644 pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch create mode 100644 pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch create mode 100644 pkgs/development/compilers/gcc/4.7/libstdc++-target.patch create mode 100644 pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/4.7/builder.sh b/pkgs/development/compilers/gcc/4.7/builder.sh new file mode 100644 index 000000000000..4ae7a1c193b9 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/builder.sh @@ -0,0 +1,249 @@ +source $stdenv/setup + + +export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $NIX_FIXINC_DUMMY + + +if test "$staticCompiler" = "1"; then + EXTRA_LDFLAGS="-static" +else + EXTRA_LDFLAGS="" +fi + +# GCC interprets empty paths as ".", which we don't want. +if test -z "$CPATH"; then unset CPATH; fi +if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi +echo "\$CPATH is \`$CPATH'" +echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" + +if test "$noSysDirs" = "1"; then + + if test -e $NIX_GCC/nix-support/orig-libc; then + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + + else + # Hack: support impure environments. + extraFlags="-isystem /usr/include" + extraLDFlags="-L/usr/lib64 -L/usr/lib" + glibc_libdir="/usr/lib" + export NIX_FIXINC_DUMMY=/usr/include + fi + + extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, + # make sure to explictly add them so that files compiled with the + # bootstrap compiler are optimized and (optionally) contain + # debugging information (info "(gccinstall) Building"). + if test -n "$dontStrip"; then + extraFlags="-O2 -g $extraFlags" + else + # Don't pass `-g' at all; this saves space while building. + extraFlags="-O2 $extraFlags" + fi + + EXTRA_FLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" + done + + if test -n "$targetConfig"; then + # Cross-compiling, we need gcc not to read ./specs in order to build + # the g++ compiler (after the specs for the cross-gcc are created). + # Having LIBRARY_PATH= makes gcc read the specs from ., and the build + # breaks. Having this variable comes from the default.nix code to bring + # gcj in. + unset LIBRARY_PATH + unset CPATH + if test -z "$crossStageStatic"; then + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" + fi + else + if test -z "$NIX_GCC_CROSS"; then + EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" + EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + else + # This the case of cross-building the gcc. + # We need special flags for the target, different than those of the build + # Assertion: + test -e $NIX_GCC_CROSS/nix-support/orig-libc + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" + + extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + EXTRA_TARGET_CFLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" + done + fi + fi + + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + + if test -z "$targetConfig"; then + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ + ) + fi + + if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + # We don't want the gcc build to assume there will be a libc providing + # limits.h in this stagae + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=false \ + ) + else + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=true \ + ) + fi +fi + +if test -n "$targetConfig"; then + # The host strip will destroy some important details of the objects + dontStrip=1 +fi + + +preConfigure() { + if test -n "$newlibSrc"; then + tar xvf "$newlibSrc" -C .. + ln -s ../newlib-*/newlib newlib + # Patch to get armvt5el working: + sed -i -e 's/ arm)/ arm*)/' newlib/configure.host + fi + # Bug - they packaged zlib + if test -d "zlib"; then + # This breaks the build without-headers, which should build only + # the target libgcc as target libraries. + # See 'configure:5370' + rm -Rf zlib + fi + + if test -f "$NIX_GCC/nix-support/orig-libc"; then + # Patch the configure script so it finds glibc headers. It's + # important for example in order not to get libssp built, + # because its functionality is in glibc already. + glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + sed -i \ + -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ + gcc/configure + fi + + if test -n "$crossMingw" -a -n "$crossStageStatic"; then + mkdir -p ../mingw + # --with-build-sysroot expects that: + cp -R $libcCross/include ../mingw + configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." + fi + + # Perform the build in a different directory. + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure +} + + +postConfigure() { + # Don't store the configure flags in the resulting executables. + sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile +} + + +postInstall() { + # Remove precompiled headers for now. They are very big and + # probably not very useful yet. + find $out/include -name "*.gch" -exec rm -rf {} \; -prune + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # More dependencies with the previous gcc or some libs (gccbug stores the build command line) + rm -rf $out/bin/gccbug + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out + for i in $out/libexec/gcc/*/*/*; do + if PREV_RPATH=`patchelf --print-rpath $i`; then + patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i + fi + done + + # Get rid of some "fixed" header files + rm -rf $out/lib/gcc/*/*/include/root + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + eval "$postInstallGhdl" +} + + +if test -z "$targetConfig" && test -z "$crossConfig"; then + if test -z "$profiledCompiler"; then + buildFlags="bootstrap $buildFlags" + else + buildFlags="profiledbootstrap $buildFlags" + fi +fi + +genericBuild diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix new file mode 100644 index 000000000000..5edcdfdd1938 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -0,0 +1,441 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langJava ? false +, langAda ? false +, langVhdl ? false +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man); required for Java +, gmp, mpfr, mpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? true # whether to support user-supplied plug-ins +, name ? "gcc" +, cross ? null +, binutilsCross ? null +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +}: + +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null + && perl != null; # for `--enable-java-home' +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.isDarwin -> gnused != null; + +with stdenv.lib; +with builtins; + +let version = "4.7.1"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = cross != null && cross.config == "i586-pc-gnu"; + + patches = [ ] + ++ optional (cross != null || langGo) ./libstdc++-target.patch + # ++ optional noSysDirs ./no-sys-dirs.patch + # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its + # target libraries and tools. + ++ optional langAda ./gnat-cflags.patch + ++ optional langFortran ./gfortran-driving.patch + ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; + + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-3.1.3.jar; + sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && gtk != null; + + /* Cross-gcc settings */ + gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; + gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + crossMingw = (cross != null && cross.libc == "msvcrt"); + + crossConfigureFlags = + "--target=${cross.config}" + + withArch + + withCpu + + withAbi + + (if (crossMingw && crossStageStatic) then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libmudflap " + + " --disable-libgomp " + + " --disable-libquadmath" + + " --disable-shared" + + " --disable-decimal-float" # libdecnumber requires libc + else + " --with-headers=${libcCross}/include" + + " --enable-__cxa_atexit" + + " --enable-long-long" + + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + + # I think noone uses shared gcc libs in mingw, so we better do the same. + # In any case, mingw32 g++ linking is broken by default with shared libs, + # unless adding "-lsupc++" to any linking command. I don't know why. + " --disable-shared" + + (if cross.config == "x86_64-w64-mingw32" then + # To keep ABI compatibility with upstream mingw-w64 + " --enable-fully-dynamic-string" + else "") + else (if cross.libc == "uclibc" then + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + " --disable-libgomp" else "") + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if (crossStageStatic) then "-stage-static" else + "-stage-final"; + crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + +in + +# We need all these X libraries when building AWT with GTK+. +assert gtk != null -> (filter (x: x == null) xlibs) == []; + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ./builder.sh; + + src = fetchurl { + url = "http://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2"; + sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; + }; + + inherit patches; + + postPatch = + if (stdenv.isGNU + || (libcCross != null # e.g., building `gcc.hostDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + i386_gnu_h = "gcc/config/i386/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${i386_gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' + sed -i gcc/config/t-gnu \ + -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' + '' + else if cross != null || stdenv.gcc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if (libcCross != null) then libcCross else stdenv.gcc.libc; + in + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q LIBC_DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g' + done + '' + else null; + + inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + libcCross crossMingw; + + buildNativeInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional javaAwtGtk pkgconfig); + + buildInputs = [ gmp mpfr mpc libelf ] + ++ (optional (ppl != null) ppl) + ++ (optional (cloog != null) cloog) + ++ (optional (zlib != null) zlib) + ++ (optionals langJava [ boehmgc zip unzip ]) + ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional stdenv.isDarwin gnused) + ; + + configureFlagsArray = stdenv.lib.optionals + (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) + [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; + + configureFlags = " + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if enablePlugin then "--enable-plugin" else ""} + ${if ppl != null then "--with-ppl=${ppl}" else ""} + ${if cloog != null then + "--with-cloog=${cloog} --enable-cloog-backend=isl" + else ""} + ${if langJava then + "--with-ecj-jar=${javaEcj} " + + + # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See + # . + "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " + else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${mpc} + ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if (stdenv ? glibc) then " --with-native-system-header-dir=${stdenv.glibc}/include" else ""} + ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f + if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""} + ${if langAda then " --enable-libada" else ""} + ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + "; + + targetConfig = if (cross != null) then cross.config else null; + + installTargets = + if stripped + then "install-strip" + else "install"; + + crossAttrs = { + patches = patches ++ [ ./hurd-sigrtmin.patch ]; + AR = "${stdenv.cross.config}-ar"; + LD = "${stdenv.cross.config}-ld"; + CC = "${stdenv.cross.config}-gcc"; + CXX = "${stdenv.cross.config}-gcc"; + AR_FOR_TARGET = "${stdenv.cross.config}-ar"; + LD_FOR_TARGET = "${stdenv.cross.config}-ld"; + CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; + NM_FOR_TARGET = "${stdenv.cross.config}-nm"; + CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; + # If we are making a cross compiler, cross != null + NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + dontStrip = true; + configureFlags = '' + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} + ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} + --with-gmp=${gmp.hostDrv} + --with-mpfr=${mpfr.hostDrv} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ++ optional langGo "go" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + --target=${stdenv.cross.config} + ''; + }; + + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + CC = "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = concatStrings + (intersperse ":" (map (x: x + "/include") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && + hasAttr "propagatedBuildInputs" libcCross) + libcCross.propagatedBuildInputs))); + + LIBRARY_PATH = concatStrings + (intersperse ":" (map (x: x + "/lib") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread))); + + EXTRA_TARGET_CFLAGS = + if cross != null && libcCross != null + then "-idirafter ${libcCross}/include" + else null; + + EXTRA_TARGET_LDFLAGS = + if cross != null && libcCross != null + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + + (optionalString (libpthreadCross != null) + " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") + else null; + + passthru = { inherit langC langCC langAda langFortran langVhdl + langGo enableMultilib version; }; + + enableParallelBuilding = true; + + meta = { + homepage = http://gcc.gnu.org/; + license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = [ + stdenv.lib.maintainers.ludo + stdenv.lib.maintainers.viric + stdenv.lib.maintainers.shlevy + ]; + + # Volunteers needed for the {Cyg,Dar}win ports of *PPL. + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false && libelf == null) [ "i686-darwin" ]; + }; +} + +// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence cross != null) +// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } +) diff --git a/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch new file mode 100644 index 000000000000..70708886b405 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/gfortran-driving.patch @@ -0,0 +1,20 @@ +This patch fixes interaction with Libtool. +See , for details. + +--- a/gcc/fortran/gfortranspec.c ++++ b/gcc/fortran/gfortranspec.c +@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); + { + fprintf (stderr, _("Driving:")); + for (i = 0; i < g77_newargc; i++) ++ { ++ if (g77_new_decoded_options[i].opt_index == OPT_l) ++ /* Make sure no white space is inserted after `-l'. */ ++ fprintf (stderr, " -l%s", ++ g77_new_decoded_options[i].canonical_option[1]); ++ else + fprintf (stderr, " %s", + g77_new_decoded_options[i].orig_option_with_args_text); ++ } + fprintf (stderr, "\n"); + } diff --git a/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch new file mode 100644 index 000000000000..bf2acf065e9b --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/gnat-cflags.patch @@ -0,0 +1,33 @@ +diff --git a/libada/Makefile.in b/libada/Makefile.in +index f5057a0..337e0c6 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) + WARN_CFLAGS = @warn_cflags@ + + TARGET_LIBGCC2_CFLAGS= +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ + -DIN_RTS @have_getipinfo@ + +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata + SOME_ADAFLAGS =-gnata + FORCE_DEBUG_ADAFLAGS = -g + GNATLIBFLAGS = -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libgcc ++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + diff --git a/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch b/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch new file mode 100644 index 000000000000..dc8236d2b99f --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch @@ -0,0 +1,14 @@ +GNU libc on GNU/Hurd doesn't define `__SIGRTMIN'. +From . + +--- a/libgcc/generic-morestack.c 2011-12-19 21:14:52.000000000 +0100 ++++ b/libgcc/generic-morestack.c 2011-12-19 21:15:35.000000000 +0100 +@@ -507,7 +507,7 @@ + sigemptyset (&__morestack_initial_sp.mask); + + sigfillset (&__morestack_fullmask); +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && defined(__SIGRTMIN) + /* In glibc, the first two real time signals are used by the NPTL + threading library. By taking them out of the set of signals, we + avoiding copying the signal mask in pthread_sigmask. More diff --git a/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch new file mode 100644 index 000000000000..2612e8bfbbbc --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/java-jvgenmain-link.patch @@ -0,0 +1,17 @@ +The `jvgenmain' executable must be linked against `vec.o', among others, +since it uses its vector API. + +--- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 ++++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 +@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) + +-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) ++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) + rm -f $@ +- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) + + # + # Build hooks: diff --git a/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch new file mode 100644 index 000000000000..fb622b395806 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/libstdc++-target.patch @@ -0,0 +1,32 @@ +Patch to make the target libraries 'configure' scripts find the proper CPP. +I noticed that building the mingw32 cross compiler. +Looking at the build script for mingw in archlinux, I think that only nixos +needs this patch. I don't know why. +diff --git a/Makefile.in b/Makefile.in +index 93f66b6..d691917 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ ++ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + # Where to find GMP + HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch new file mode 100644 index 000000000000..79901703cb82 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/no-sys-dirs.patch @@ -0,0 +1,41 @@ +diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c +--- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 ++++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 +@@ -41,6 +41,10 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++#undef SYSTEM_INCLUDE_DIR ++#undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c +--- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 ++++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 +@@ -1478,10 +1478,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ +--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 ++++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 +@@ -3277,7 +3281,7 @@ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ ++ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ad835a9524a..16b4b5d9645d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2024,20 +2024,23 @@ let binutilsCross = null; })); - gcc47 = lowPrio (wrapGCC (lib.overrideDerivation gcc46_debug.gcc (a: { - name = "gcc-debug-4.7.1"; - src = fetchurl { - url = "mirror://gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2"; - sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; - }; + gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { + inherit noSysDirs; - configureFlags = a.configureFlags - # This flag replaces `no-sys-dirs.patch'. - + (lib.optionalString (stdenv ? glibc) - " --with-native-system-header-dir=${stdenv.glibc}/include"); + # bootstrapping a profiled compiler does not work in the sheevaplug: + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 + profiledCompiler = if stdenv.isArm then false else true; - patches = []; - }))); + # When building `gcc.hostDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + })); gccApple = wrapGCC (makeOverridable From 4f972b793f3db2de16726b150c6f12352b57b098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 Aug 2012 12:54:51 +0200 Subject: [PATCH 0436/1120] Adding the gcc47 attribute, pointing to gcc47_real, for the attributes to look like the gcc46 case. I add a comment about a sheevaplug situation we have to test again. --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16b4b5d9645d..b78c3a237ff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1888,6 +1888,8 @@ let gcc46 = gcc46_real; + gcc47 = gcc47_real; + gcc45_realCross = lib.addMetaAttrs { platforms = []; } (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib @@ -2029,6 +2031,7 @@ let # bootstrapping a profiled compiler does not work in the sheevaplug: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 + # To be reviewed. Maybe it is fixed already in 4.7. profiledCompiler = if stdenv.isArm then false else true; # When building `gcc.hostDrv' (a "Canadian cross", with host == target From 901574fe8a94d4b193e04bb6d1729af7d1605532 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Aug 2012 19:03:52 +0400 Subject: [PATCH 0437/1120] Julia language: update to a fresh version Update julia and some of its dependencies Split PCRE because a lot of packages depend on it and I am not sure we want to test them in a hurry (and Julia specifies exact version). --- pkgs/development/compilers/julia/default.nix | 80 ++++++----- pkgs/development/libraries/fftw/default.nix | 18 ++- pkgs/development/libraries/pcre/8.30.nix | 38 +++++ .../science/math/liblapack/default.nix | 6 +- .../science/math/openblas/default.nix | 36 +++++ .../libraries/suitesparse/default.nix | 11 +- .../libraries/suitesparse/disable-metis.patch | 130 +----------------- pkgs/top-level/all-packages.nix | 14 +- 8 files changed, 154 insertions(+), 179 deletions(-) create mode 100644 pkgs/development/libraries/pcre/8.30.nix create mode 100644 pkgs/development/libraries/science/math/openblas/default.nix diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a594e0e68158..d0231adb73d1 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,35 +1,46 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, blas, liblapack +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl - , ncurses, libunistring, lighttpd, patchelf + , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack } : let - liblapackShared = liblapack.override{shared=true;}; realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; - date = "20120501"; + date = "20120801"; name = "${pname}-git-${date}"; - grisu_ver = "1.1"; + grisu_ver = "1.1.1"; dsfmt_ver = "2.1"; - arpack_ver = "3.1.0"; + openblas_ver = "v0.2.2"; + lapack_ver = "3.4.1"; + arpack_ver = "3.1.1"; clp_ver = "1.14.5"; lighttpd_ver = "1.4.29"; grisu_src = fetchurl { url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; - sha256 = "addee31d11350e4dde2b19c749eda648cb0ab38a68b0dd0d0a45dc49c7346fe7"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; }; dsfmt_src = fetchurl { url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; name = "dsfmt-${dsfmt_ver}.tar.gz"; sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f"; }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; + }; arpack_src = fetchurl { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/376/get/"; + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/417/get/"; name = "arpack-ng_${arpack_ver}.tar.gz"; - sha256 = "65b7856126f06ecbf9ec450d50df92ca9260d4b0d21baf02497554ac230d6feb"; + sha256 = "be250947a7d6eac7dff8c058102fce9922c524aa06be2a090b6e0bb2d1e228cd"; + }; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; + name = "lapack-${lapack_ver}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; clp_src = fetchurl { url = "http://www.coin-or.org/download/source/Clp/Clp-${clp_ver}.tgz"; @@ -43,16 +54,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "990ffabb00f0e51d326911888facdbc473fb634d"; - sha256 = "dfcf41b2d7b62dd490bfd6f6fb962713c920de3f00afaee47423bd26eba7e3b2"; + rev = "3b413ec24957e400c984002f7cdf6232f5391a7e"; + sha256 = "c019b724df9203899a1da5815f85d79291778191bbffc1361d2213ff7d2bbc1d"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm blas liblapackShared readline + buildInputs = [ gfortran perl m4 gmp pcre llvm readline fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas liblapack ]; configurePhase = '' - for i in GMP LLVM PCRE BLAS LAPACK READLINE FFTW LIBUNWIND SUITESPARSE GLPK; + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD; do sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; done @@ -62,52 +74,44 @@ stdenv.mkDerivation rec { cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${lighttpd_src}" ; do + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" ; do copy_kill_hash "$i" deps done copy_kill_hash "${dsfmt_src}" deps/random - sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i deps/Makefile - ${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''} sed -e 's@ cpp @ gcc -E @g' -i base/Makefile - sed -e '1s@#! */bin/bash@#!${stdenv.shell}@' -i deps/*.sh - export LDFLAGS="-L${suitesparse}/lib" + export GLPK_PREFIX="${glpk}/include" + mkdir -p "$out/lib" sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - sed -e '/libumfpack.a/s@find @find ${suitesparse}/lib @' -i deps/Makefile - - export makeFlags="$makeFlags PREFIX=\"$out\" USR=\"$out\"" - - sed -e 's@openblas@blas@' -i base/*.jl - - sed -e '/install -v julia-release-webserver/d' -i Makefile + export makeFlags="$makeFlags PREFIX=$out" export dontPatchELF=1 ''; + preBuild = '' + make -C test/unicode all + make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" + ''; + postInstall = '' - ln -s "$out/share/julia/julia" "$out/bin" + ld -E --whole-archive --shared ${suitesparse}/lib/lib*[a-z].a -o "$out"/lib/libsuitesparse-shared.so + for i in umfpack cholmod amd camd colamd ; do + ln -s "libsuitesparse-shared.so" "$out/lib/lib$i.so" + done + ln -s "${lighttpd}/sbin/lighttpd" "$out/sbin/" + ln -s "${lighttpd}/lib/"* "$out/lib/" - mkdir -p "$out/share/julia/ui/" - cp -r ui/website "$out/share/julia/ui/" - cp deps/lighttpd.conf "$out/share/julia/ui/" - - mkdir -p "$out/share/julia/ui/webserver/" - cp -r ui/webserver/{*.jl,*.h} "$out/share/julia/ui/webserver/" - - echo -e '#!/bin/sh' >> "$out/bin/julia-webserver" - echo -e "cd \"$out/share/julia\"" >> "$out/bin/julia-webserver" - echo -e '${lighttpd}/sbin/lighttpd -D -f ./ui/lighttpd.conf &' >> "$out/bin/julia-webserver" - echo -e "'$out/bin/julia-release-webserver' -p 2001" >> "$out/bin/julia-webserver" - chmod a+x "$out/bin/julia-webserver" + cp -r test examples "$out/lib/julia" + ls -R > "$out/ls-R" ''; meta = { diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 845ec7720106..6b4fbe7df6ce 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,15 +1,19 @@ -{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}: -let localDefs = builderDefs.passthru.function { +{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false}: +let + version = "3.3.2"; + localDefs = builderDefs.passthru.function { src = fetchurl { - url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz; - sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va"; + url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; + sha256 = "b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01"; }; buildInputs = []; - configureFlags = ["--enable-shared" "--enable-openmp"] + configureFlags = ["--enable-shared"] # some distros seem to be shipping both versions within the same package? # why does --enable-float still result in ..3f.so instead of ..3.so? ++ (if singlePrecision then [ "--enable-single" ] else [ ]) + ++ (stdenv.lib.optional (!pthreads) "--enable-openmp") + ++ (stdenv.lib.optional pthreads "--enable-threads") # I think all i686 has sse ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ]) # I think all x86_64 has sse2 @@ -18,8 +22,8 @@ let localDefs = builderDefs.passthru.function { }; in with localDefs; stdenv.mkDerivation { - name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" ); - builder = writeScript "fftw-3.2.1-builder" + name = "fftw-3.3.2" + ( if singlePrecision then "-single" else "-double" ); + builder = writeScript "fftw-3.3.2-builder" (textClosure localDefs [doConfigure doMakeInstall doForceShare]); meta = { description = "Fastest Fourier Transform in the West library"; diff --git a/pkgs/development/libraries/pcre/8.30.nix b/pkgs/development/libraries/pcre/8.30.nix new file mode 100644 index 000000000000..2f636492eb61 --- /dev/null +++ b/pkgs/development/libraries/pcre/8.30.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: + +stdenv.mkDerivation rec { + name = "pcre-8.30"; + + src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; + sha256 = "c1113fd7db934e97ad8b3917d432e5b642e9eb9afd127eb797804937c965f4ac"; + }; + + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. + configureFlags = '' + ${if unicodeSupport then "--enable-unicode-properties" else ""} + ${if !cplusplusSupport then "--disable-cpp" else ""} + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; + + doCheck = !stdenv.isCygwin; # XXX: test failure on Cygwin + + meta = { + homepage = "http://www.pcre.org/"; + description = "A library for Perl Compatible Regular Expressions"; + license = "BSD-3"; + + longDescription = '' + The PCRE library is a set of functions that implement regular + expression pattern matching using the same syntax and semantics as + Perl 5. PCRE has its own native API, as well as a set of wrapper + functions that correspond to the POSIX regular expression API. The + PCRE library is free, even for building proprietary software. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index e2b43b6b0531..9f25011b76f8 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -4,10 +4,10 @@ let usedLibExtension = if shared then ".so" else ".a"; in stdenv.mkDerivation { - name = "liblapack-3.4.0"; + name = "liblapack-3.4.1"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz"; - sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7"; + url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; propagatedBuildInputs = [ atlasMaybeShared ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix new file mode 100644 index 000000000000..4d30671c4880 --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gfortran, perl }: + +stdenv.mkDerivation rec { + version = "0.2.2"; + lapack_version = "3.4.1"; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + }; + + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; + sha256 = "13kdx3knff5ajnmgn419g0dnh83plin07p7akwamr3v7z5qfrzqr"; + name = "openblas-${version}.tar.gz"; + }; + + preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz"; + + buildInputs = [gfortran perl]; + + cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); + + target = if cpu == "i686" then "P6" else + if cpu == "x86_64" then "CORE2" else + # allow autodetect + ""; + + makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\""; + + meta = { + description = "Basic Linear Algebra Subprograms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + }; +} diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index b3fe6db059ac..e3a7fbb5a086 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, blas, liblapack, gfortran } : -stdenv.mkDerivation { - name = "suitesparse"; +stdenv.mkDerivation rec { + version = "4.0.0"; + name = "suitesparse-${version}"; src = fetchurl { - url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ; - sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc"; + url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; + sha256 = "1nvbdw10wa6654k8sa2vhr607q6fflcywyji5xd767cqpwag4v5j"; }; buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; @@ -14,6 +15,8 @@ stdenv.mkDerivation { mkdir -p $out/include ''; + makeFlags = ''PREFIX=\"$(out)\" INSTALL_LIB=$(out)/lib INSTALL_INCLUDE=$(out)/include''; + NIX_CFLAGS = "-fPIC"; } diff --git a/pkgs/development/libraries/suitesparse/disable-metis.patch b/pkgs/development/libraries/suitesparse/disable-metis.patch index 68fd22bc6433..5b735eb7d3c9 100644 --- a/pkgs/development/libraries/suitesparse/disable-metis.patch +++ b/pkgs/development/libraries/suitesparse/disable-metis.patch @@ -1,140 +1,18 @@ -diff -Nrc SuiteSparse/UFconfig/Makefile SuiteSparse-new/UFconfig/Makefile -*** SuiteSparse/UFconfig/Makefile 2009-11-11 20:59:08.000000000 +0100 ---- SuiteSparse-new/UFconfig/Makefile 2010-08-02 13:14:04.000000000 +0200 -*************** -*** 25,31 **** - - # install UFconfig - install: -! $(CP) Lib/libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a - ( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a ) - $(CP) UFconfig.h $(INSTALL_INCLUDE) - ---- 25,31 ---- - - # install UFconfig - install: -! $(CP) libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a - ( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a ) - $(CP) UFconfig.h $(INSTALL_INCLUDE) - -diff -Nrc SuiteSparse/UFconfig/UFconfig.mk SuiteSparse-new/UFconfig/UFconfig.mk -*** SuiteSparse/UFconfig/UFconfig.mk 2010-06-02 17:40:42.000000000 +0200 ---- SuiteSparse-new/UFconfig/UFconfig.mk 2010-08-02 14:55:27.000000000 +0200 -*************** -*** 34,40 **** - # performance. You should select the optimization parameters that are best - # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. - CC = cc -! CFLAGS = -O3 -fexceptions - - # C++ compiler (also uses CFLAGS) - CPLUSPLUS = g++ ---- 34,40 ---- - # performance. You should select the optimization parameters that are best - # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. - CC = cc -! CFLAGS = -O3 -fexceptions -fPIC - - # C++ compiler (also uses CFLAGS) - CPLUSPLUS = g++ -*************** -*** 71,78 **** - # MAKE = gmake - - # For "make install" -! INSTALL_LIB = /usr/local/lib -! INSTALL_INCLUDE = /usr/local/include - - #------------------------------------------------------------------------------ - # BLAS and LAPACK configuration: ---- 71,78 ---- - # MAKE = gmake - - # For "make install" -! INSTALL_LIB = $(out)/lib -! INSTALL_INCLUDE = $(out)/include - - #------------------------------------------------------------------------------ - # BLAS and LAPACK configuration: -*************** -*** 127,134 **** - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. -! METIS_PATH = ../../metis-4.0 -! METIS = ../../metis-4.0/libmetis.a - - # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following - # options: ---- 127,134 ---- - # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc. - # You may wish to use an absolute path. METIS is optional. Compile - # CHOLMOD with -DNPARTITION if you do not wish to use METIS. -! #METIS_PATH = ../../metis-4.0 -! #METIS = - - # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following - # options: -*************** -*** 189,195 **** - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - -! CHOLMOD_CONFIG = - - #------------------------------------------------------------------------------ - # SuiteSparseQR configuration: ---- 189,195 ---- - # -DNSUNPERF for Solaris only. If defined, do not use the Sun - # Performance Library - -! CHOLMOD_CONFIG = -DNPARTITION - - #------------------------------------------------------------------------------ - # SuiteSparseQR configuration: -*************** -*** 203,209 **** - # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - - # default, without timing, without TBB: -! SPQR_CONFIG = - # with timing and TBB: - # SPQR_CONFIG = -DTIMING -DHAVE_TBB - # with timing ---- 203,209 ---- - # -DHAVE_TBB enable the use of Intel's Threading Building Blocks (TBB) - - # default, without timing, without TBB: -! SPQR_CONFIG = -DNPARTITION - # with timing and TBB: - # SPQR_CONFIG = -DTIMING -DHAVE_TBB - # with timing diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile *** SuiteSparse/UMFPACK/Demo/Makefile 2009-11-11 21:09:45.000000000 +0100 --- SuiteSparse-new/UMFPACK/Demo/Makefile 2010-08-02 12:53:16.000000000 +0200 *************** -*** 40,51 **** +*** 40,46 **** ../../CAMD/Lib/libcamd.a: ( cd ../../CAMD ; $(MAKE) library ) -- ../../metis-4.0/libmetis.a: -- ( cd ../../metis-4.0/Lib ; $(MAKE) ) +- $(METIS): +- ( cd $(METIS_PATH) && $(MAKE) ) UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ - ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \ -! ../../CAMD/Lib/libcamd.a ../../metis-4.0/libmetis.a \ - ../../CCOLAMD/Lib/libccolamd.a - - libs: $(UMFPACK) ---- 40,49 ---- +--- 40,44 ---- ../../CAMD/Lib/libcamd.a: ( cd ../../CAMD ; $(MAKE) library ) UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ - ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \ -! ../../CAMD/Lib/libcamd.a \ - ../../CCOLAMD/Lib/libccolamd.a - - libs: $(UMFPACK) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78c3a237ff3..438db4c127db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2365,7 +2365,13 @@ let jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { }; + julia = callPackage ../development/compilers/julia { + llvm = llvm_3_1; + pcre = pcre_8_30; + liblapack = liblapack.override {shared = true;}; + fftw = fftw.override {pthreads = true;}; + fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; + }; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -4552,6 +4558,11 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; + pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix { + unicodeSupport = getConfig ["pcre" "unicode"] true; + cplusplusSupport = !stdenv ? isDietLibC; + }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; @@ -8367,6 +8378,7 @@ let liblapack = callPackage ../development/libraries/science/math/liblapack { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; ### SCIENCE/LOGIC From 866ed72060d0cac47d2bc1ab7d5873a3c2f53e02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Aug 2012 11:58:25 -0400 Subject: [PATCH 0438/1120] libjpeg-turbo: Update to 1.2.1 CVE-2012-2806 --- .../libraries/libjpeg-turbo/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f7135e4018d8..eb86a1d3ff23 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchurl, nasm }: + +stdenv.mkDerivation rec { + name = "libjpeg-turbo-1.2.1"; -stdenv.mkDerivation { - name = "libjpeg-turbo-1.1.1"; - src = fetchurl { - url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.1.1.tar.gz; - sha256 = "553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2"; + url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; + sha256 = "0w1pj3j7hkx6irkrxlcmz53l94s6im0wml1v36nysb50akq26cyb"; }; buildInputs = [ nasm ]; - + meta = { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; From 64f932f8fda4fc87a7ee3ce604405c5c775f5926 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 2 Aug 2012 23:44:50 +0400 Subject: [PATCH 0439/1120] NetworkManager-pptp: fix path to pppd and pptp, upgrade --- .../network-manager/pptp-purity.patch | 26 +++++++++++++++++++ .../tools/networking/network-manager/pptp.nix | 13 +++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/networking/network-manager/pptp-purity.patch diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch new file mode 100644 index 000000000000..55ade68dd41c --- /dev/null +++ b/pkgs/tools/networking/network-manager/pptp-purity.patch @@ -0,0 +1,26 @@ +diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c +index 68a5759..568bbfe 100644 +--- a/src/nm-pptp-service.c ++++ b/src/nm-pptp-service.c +@@ -729,9 +729,7 @@ nm_find_pppd (void) + { + static const char *pppd_binary_paths[] = + { +- "/sbin/pppd", +- "/usr/sbin/pppd", +- "/usr/local/sbin/pppd", ++ "@ppp@/sbin/pppd", + NULL + }; + +@@ -751,9 +749,7 @@ nm_find_pptp (void) + { + static const char *pptp_binary_paths[] = + { +- "/sbin/pptp", +- "/usr/sbin/pptp", +- "/usr/local/sbin/pptp", ++ "@pptp@/sbin/pptp", + NULL + }; + diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dc3c1643ebcc..8d2acfe9b316 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll , withGnome ? false, gtk, libgnome_keyring }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.2.0"; + version = "0.9.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1fj2v8pjc17m9calckgc2jm8wbimwga8if4r21walf9xysvhsd1b"; + sha256 = "0p93in5dn8m6dp9qs2ppfmazwqlklp5hwp9pjqr7jwvjbac75dvg"; }; buildInputs = [ networkmanager pptp ppp ] @@ -19,6 +19,13 @@ stdenv.mkDerivation rec { configureFlags = if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"; + patches = + [ ( substituteAll { + src = ./pptp-purity.patch; + inherit ppp pptp; + }) + ]; + meta = { description = "PPtP plugin for NetworkManager"; inherit (networkmanager.meta) maintainers platforms; From a143bb79e2dff9ddf5bbe7a5e853232cfdb79a01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 13:21:29 +0200 Subject: [PATCH 0440/1120] spamassassin: disable taint mode, without it we cannot configure the PERL5LIB search path --- pkgs/servers/mail/spamassassin/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 8f22d08b7592..0f5cefb84c25 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile -, HTTPDate, MailDKIM +, HTTPDate, MailDKIM, makeWrapper }: # TODO: @@ -20,13 +20,21 @@ buildPerlPackage rec { sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; }; - propagatedBuildInputs = [ HTMLParser NetDNS NetAddrIP DBFile - HTTPDate MailDKIM ]; + buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate + MailDKIM ]; - makeFlags = "PERL_BIN=${perl}/bin/perl"; + # Enabling 'taint' mode is desirable, but that flag disables support + # for the PERL5LIB environment variable. Needs further investigation. + makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no"; doCheck = false; + postInstall = '' + for n in "$out/bin/"*; do + wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" + done + ''; + meta = { homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; From 51c95330b323345ce5605e2d9cf0832735119aea Mon Sep 17 00:00:00 2001 From: Daniel Santa Cruz Date: Wed, 1 Aug 2012 21:13:27 -0400 Subject: [PATCH 0441/1120] Extra libraries required for web dev with Snap [shlevy]: Fixed missing .nix in haskell-packages.nix --- .../libraries/haskell/snap/loader-dynamic.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/snap/loader-dynamic.nix diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix new file mode 100644 index 000000000000..5815496695cc --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -0,0 +1,14 @@ +{ cabal, directoryTree, hint, mtl, snapCore, time }: + +cabal.mkDerivation (self: { + pname = "snap-loader-dynamic"; + version = "0.9.0"; + sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm"; + buildDepends = [ directoryTree hint mtl snapCore time ]; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: dynamic loader"; + 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 97b1782f6b00..5485622db838 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1325,6 +1325,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; + snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic {}; + snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {}; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; From f82c864a4b627fb1c3769243de9dcc5966b22a27 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 3 Aug 2012 16:20:24 +0400 Subject: [PATCH 0442/1120] acpi-call: update and fix kernel version handling --- pkgs/os-specific/linux/acpi-call/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 301a8054557c..082cd869ab7e 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mkottman/acpi_call.git"; - rev = "4f71ce83392bc52b3497"; - sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + rev = "b570c3b6c7016174107558464e864391d8bbd176"; + sha256 = "a89c62d391b721bb87a094f81cefc77d9c80de4bb314bb6ea449c3ef2decad5e"; }; preBuild = '' sed -e 's/break/true/' -i test_off.sh sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh - sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i Makefile + sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.modDirVersion}@" -i Makefile ''; installPhase = '' - mkdir -p $out/lib/modules/${kernel.version}/misc - cp acpi_call.ko $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc + cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; From ac23e96ec957d5f09d3877c867149e79d9a16b56 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 3 Aug 2012 08:29:47 -0400 Subject: [PATCH 0443/1120] Whoops, forgot to actually add my changes to fix the missing .nix --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5485622db838..16c0ba59cb4e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1325,7 +1325,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; - snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic {}; + snapLoaderDynamic = callPackage ../development/libraries/haskell/snap/loader-dynamic.nix {}; snapLoaderStatic = callPackage ../development/libraries/haskell/snap/loader-static.nix {}; From 1935f7e5b89d491ac9665fd43d241f69ea18e255 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 3 Aug 2012 08:33:31 -0400 Subject: [PATCH 0444/1120] linux/manual-config: Add informative comment --- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 523d52b0d3c0..b64cf786e3eb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -46,6 +46,10 @@ in # The kernel version version, # The version of the kernel module directory + # Note that, unlike with the normal kernel builder, it shouldn't be necessary + # to specify this for releases with 2 version numbers, e.g. if you're building + # Linux 3.5 the modules will happily be installed in $out/lib/modules/3.5/, but + # this is provided for compatability. modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) src, From b2446295718d3bc0f618562bac1fcff8d6b2eda0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 3 Aug 2012 16:49:57 +0400 Subject: [PATCH 0445/1120] acpi-call: force example script to be executable --- pkgs/os-specific/linux/acpi-call/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 082cd869ab7e..0689663832e4 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh + chmod a+x $out/bin/test_discrete_video_off.sh ''; meta = { From 209e2b99911b86b4a79e12c67b6e4131c0c95aad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 15:34:03 +0200 Subject: [PATCH 0446/1120] trivial cosmetic --- pkgs/top-level/haskell-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c53f9f46b1bb..da9284982498 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -533,18 +533,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonad_3_0_0_1 = callPackage ../development/libraries/haskell/comonad/3.0.0.1.nix {}; - comonad = self.comonad_3_0_0_1; comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { comonad = self.comonad_1_1_1_6; semigroupoids = self.semigroupoids_1_3_4; }; - comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {}; - comonadTransformers = self.comonadTransformers_3_0; compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; From 42b5938a848b7a29fe50aae1528f6c91fbf80e70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 15:34:39 +0200 Subject: [PATCH 0447/1120] trivial cosmetic --- pkgs/top-level/haskell-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index da9284982498..36e9984b8cce 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1324,9 +1324,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix { comonad = self.comonad_1_1_1_6; }; - semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {}; - semigroupoids = self.semigroupoids_3_0; shelly = callPackage ../development/libraries/haskell/shelly {}; From 09cf14f73d2c9af3518dac663ea065efaa5b63c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 16:09:52 +0200 Subject: [PATCH 0448/1120] Drop haskell-Shellac-{readline,haskeline}. Both packages are broken with recent versions of the compiler and upstream doesn't respond to e-mail. --- .../haskell/Shellac/Shellac-haskeline.nix | 17 ----------------- .../haskell/Shellac/Shellac-readline.nix | 14 -------------- pkgs/top-level/haskell-packages.nix | 4 ---- 3 files changed, 35 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix delete mode 100644 pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix deleted file mode 100644 index 9f75a09ee690..000000000000 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-haskeline.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, haskeline, mtl, Shellac }: - -cabal.mkDerivation (self: { - pname = "Shellac-haskeline"; - version = "0.2.0.1"; - sha256 = "1xvs2ni83yyf7rx3ikmn2bkx20fyj03d03crqyyfw28mikhgv5br"; - buildDepends = [ haskeline mtl Shellac ]; - patchPhase = '' - sed -i -e 's|mtl>=1.1 && < 2.1|mtl|' Shellac-haskeline.cabal - ''; - meta = { - description = "Haskeline backend module for Shellac"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix b/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix deleted file mode 100644 index a39ddf3383ec..000000000000 --- a/pkgs/development/libraries/haskell/Shellac/Shellac-readline.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, readline, Shellac }: - -cabal.mkDerivation (self: { - pname = "Shellac-readline"; - version = "0.9"; - sha256 = "3edffecf2225c199f0a4df55e3685f7deee47755ae7f8d03f5da7fac3c2ab878"; - buildDepends = [ readline Shellac ]; - meta = { - description = "Readline backend module for Shellac"; - 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 36e9984b8cce..67fef9ed23da 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1400,10 +1400,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Shellac = callPackage ../development/libraries/haskell/Shellac/Shellac.nix {}; - ShellacHaskeline = callPackage ../development/libraries/haskell/Shellac/Shellac-haskeline.nix {}; - - ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {}; - show = callPackage ../development/libraries/haskell/show {}; SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; From 2dbe88630b16415e06c8795155eb112b5efc9e87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:45 +0200 Subject: [PATCH 0449/1120] haskell-AspectAG: update to version 0.3.6.1 --- pkgs/development/libraries/haskell/AspectAG/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix index 50bceea9cb42..6cbd760b4aca 100644 --- a/pkgs/development/libraries/haskell/AspectAG/default.nix +++ b/pkgs/development/libraries/haskell/AspectAG/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "AspectAG"; - version = "0.3.5"; - sha256 = "1gqblgd0js2nliad1gryg8a3sibw5xsp577c8h3vhdfssf2bwggs"; + version = "0.3.6.1"; + sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf"; buildDepends = [ HList mtl ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; From def966e7e7d375d78d246f3d7f7af78b4f517eae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:46 +0200 Subject: [PATCH 0450/1120] haskell-Chart: update to version 0.16 --- pkgs/development/libraries/haskell/Chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 4c4584bf9a24..a59e4ca7f422 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "0.15"; - sha256 = "1357gqn2ifalknl85n2z9ysf195dnaxm175rp0kmmzbf4vik9gc4"; + version = "0.16"; + sha256 = "1mb8hgxj0i5s7l061pfn49m5f6qdwvmgy6ni7jmg85vpy6b7jra3"; buildDepends = [ cairo colour dataAccessor dataAccessorTemplate mtl time ]; From a1c1e671e240d8b19dd0e31bd092a253efe4f630 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:46 +0200 Subject: [PATCH 0451/1120] haskell-Vec: update to version 1.0.1 --- pkgs/development/libraries/haskell/Vec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 996cfd1a78cd..85fdcfd0b4af 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Vec"; - version = "1.0"; - sha256 = "1lyi7di92q1f0k08nj7766nm0ygaqdrjdphnb6imvyrsmjrspaqk"; + version = "1.0.1"; + sha256 = "1v0v0ph881vynx8q8xwmn9da6qrd16g83q5i132nxys3ynl5s76m"; meta = { homepage = "http://github.net/sedillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; From 972f9dab8f18955f55f9f73bcb3fbbc3b4431a56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0452/1120] haskell-certificate: update to version 1.2.4 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 89410dbcb004..1f2cdd40238f 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.3"; - sha256 = "0xn46327a50vj70d26gc4z2rn4l6qk77j7mkdwg1j2yh6mcn0n7a"; + version = "1.2.4"; + sha256 = "079364567cshfj2bc0lbj933jcgdqisvv8m0czlyscb4hd10vfg7"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; From 0a1ffe3dc96015bd9db54a18c62ea4cac592d2dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0453/1120] haskell-cmdargs: update to version 0.9.6 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 55c50cb99fb1..87d09a6d5fce 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.5"; - sha256 = "0ihanswhq5d29d9ll5q4grkbaq64dwfsayws7y4xa387d5s9p3iv"; + version = "0.9.6"; + sha256 = "0xmzx7iglygks11qmnwz9jjj0jim2sjq7x3xf39symzs986pswlk"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From ff7d63d2bf461321d99aa9e9eed2c8c2bb998144 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0454/1120] haskell-data-lens: update to version 2.10.2 --- pkgs/development/libraries/haskell/data-lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 48d49324bb54..e4cff67f3761 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "data-lens"; - version = "2.10.1"; - sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh"; + version = "2.10.2"; + sha256 = "1mv4lh5rhmq09d89ci07kj9anv7ckrlqh9x3xr4jq9idf7sf54b5"; buildDepends = [ comonad comonadTransformers semigroupoids transformers ]; From 3ff06e92a235f715e2dc406e08ecf9ec3195a8d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0455/1120] haskell-derive: update to version 2.5.10 --- pkgs/development/libraries/haskell/derive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index c05f7fd02317..ff65518e7f9b 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.9"; - sha256 = "1rws401dpdck7c9jxfv9h46r06vn730lw1fsxvvidnf3hlr0yyk5"; + version = "2.5.10"; + sha256 = "0r5qcchs6kw080pw95r442yk1ld48lk2imn7apk0ibkx53i4mqls"; isLibrary = true; isExecutable = true; buildDepends = [ From de73ae1aac212be1fcbe589795e2fc646e7ff19b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0456/1120] haskell-fclabels: update to version 1.1.4 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 5f62315a9727..25ec69c84592 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.3"; - sha256 = "1f8aav4gcpixmnnwcml0aqsqswb8fc0rp986nbyap22gmcw4hflx"; + version = "1.1.4"; + sha256 = "0b15nvnsxckw75q7dgrfxnnjc93ah140gi3s5wpb41q0fnvl9npz"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 63700848702bd89db15ea9bbfc43efe77078e769 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0457/1120] haskell-hastache: update to version 0.4.2 --- pkgs/development/libraries/haskell/hastache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index 54decaa5ecb8..f37badde96da 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hastache"; - version = "0.4.1"; - sha256 = "1d6d3bmmfx1jh38hhmvaq1ncdxlfjc0mc7jvbxqgr00dg73wfgdk"; + version = "0.4.2"; + sha256 = "1ad691qxnnx0a6ik0cjdzd8aw7z88p06zckbb3cb1r8pk6m0g7vi"; buildDepends = [ blazeBuilder filepath ieee754 mtl syb text utf8String ]; From cbe1d3163d540d8585752adc878503f11aa86989 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:47 +0200 Subject: [PATCH 0458/1120] haskell-hmatrix: update to version 0.14.1.0 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 398299872d5a..2542e2005865 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.14.0.1"; - sha256 = "057ii711qsh5307bp3jqpvlhwp2iacr83whhjm5053b5psinj4z5"; + version = "0.14.1.0"; + sha256 = "10fvbk3k2fgac46a86mc8g0s5gsw1p1bz4k57gn6dzgwh73mxjx7"; buildDepends = [ binary random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; meta = { From 42b11c6474bdc43e0c6ced28a12227e143c27b26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:48 +0200 Subject: [PATCH 0459/1120] haskell-instant-generics: update to version 0.3.5 --- .../libraries/haskell/instant-generics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 648dfd7c3157..f4dfc4848a61 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "instant-generics"; - version = "0.3.4"; - sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; + version = "0.3.5"; + sha256 = "15j41krvabf541vm4vpn2jvlg3nbi6pywcig9zbjjpckzwp5vj9x"; buildDepends = [ syb ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; From efbc72d31edf2997d20739cafb5dde4828b9ab83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:48 +0200 Subject: [PATCH 0460/1120] haskell-shelly: update to version 0.13.4 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 2d2b3ca495d2..867632cb8189 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.13.0.1"; - sha256 = "1iw2hbnr9pwfvz6hhmnmg4h2h58ggppbjy3vs0i08hc33nms1lvy"; + version = "0.13.4"; + sha256 = "0776vlvzkx5dbkb8gyvcngq2ryabcx1ib4hw2cb6f8bm77y20sq1"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 6dbbb861cc8737b00130155ba435b6ff62891e3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:48 +0200 Subject: [PATCH 0461/1120] haskell-socks: update to version 0.4.2 --- pkgs/development/libraries/haskell/socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index eca78fc90df8..d1b4494090cb 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.4.1"; - sha256 = "0kapic4rf1cwbqy5f229b69kr1mg9blpr5p5jna8sx5ds2b8jdjn"; + version = "0.4.2"; + sha256 = "1nbhx2jjij5kjqa0l68s401ach4yziq6w8mvcv589fcscw212w8r"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; From bb6b804fd18dd1a33f97fa91fc24648b75154b9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:48 +0200 Subject: [PATCH 0462/1120] haskell-void: update to version 0.5.7 --- pkgs/development/libraries/haskell/void/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 8c129568479d..581d2f8c9ae7 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.5.6"; - sha256 = "168xp4jxrlhxdw47y3xyr3hi57xharsrll8521a1phh8vzrbpi4z"; + version = "0.5.7"; + sha256 = "1rkc32122mkyxl0a4spbcqz908wh49l5ab8gfvsy0y02d3lldfd4"; buildDepends = [ semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; From 58d1298c45cd1486727f2c040d8e72ca540247a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Aug 2012 17:42:48 +0200 Subject: [PATCH 0463/1120] haskell-xml-types: update to version 0.3.3 --- pkgs/development/libraries/haskell/xml-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 080096b6f333..48bd32b7c897 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-types"; - version = "0.3.2"; - sha256 = "1aihs1n6hxq6frvxdqjqxsfwi2w2c2qx4bjypimjpjxf6d6n1396"; + version = "0.3.3"; + sha256 = "0jvchgzmqsnc0dax73nh7wa7x6n07qnl4wr1d58v21rlbqcklgcn"; buildDepends = [ text ]; meta = { homepage = "https://john-millikin.com/software/haskell-xml/"; From a375ffa53fd61f6091e7b88096b825e23c569071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 3 Aug 2012 19:23:51 +0200 Subject: [PATCH 0464/1120] Adding gccgo for gcc4.7. I tested hello world, and it works. --- pkgs/build-support/gcc-wrapper/buildergo.sh | 194 ++++++++++++++++++ pkgs/build-support/gcc-wrapper/default.nix | 11 +- .../development/compilers/gcc/4.7/default.nix | 6 +- pkgs/top-level/all-packages.nix | 15 +- 4 files changed, 218 insertions(+), 8 deletions(-) create mode 100644 pkgs/build-support/gcc-wrapper/buildergo.sh diff --git a/pkgs/build-support/gcc-wrapper/buildergo.sh b/pkgs/build-support/gcc-wrapper/buildergo.sh new file mode 100644 index 000000000000..cb6bfd7f0517 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper/buildergo.sh @@ -0,0 +1,194 @@ +source $stdenv/setup + + +mkdir -p $out/bin +mkdir -p $out/nix-support + + +if test -z "$nativeLibc"; then + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker $dynamicLinker" > $out/nix-support/libc-ldflags-before +fi + +if test -n "$nativeTools"; then + gccPath="$nativePrefix/bin" + ldPath="$nativePrefix/bin" +else + if test -e "$gcc/lib64"; then + gccLDFlags="$gccLDFlags -L$gcc/lib64" + fi + gccLDFlags="$gccLDFlags -L$gcc/lib" + if [ -n "$langVhdl" ]; then + gccLDFlags="$gccLDFlags -L$zlib/lib" + fi + echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + + # GCC shows $gcc/lib in `gcc -print-search-dirs', but not + # $gcc/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + if test -e "$gcc/lib64"; then + gccCFlags="$gccCFlags -B$gcc/lib64" + fi + + # Find the gcc libraries path (may work only without multilib) + if [ -n "$langAda" ]; then + basePath=`echo $gcc/lib/*/*/*` + gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" + + gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + fi + echo "$gccCFlags" > $out/nix-support/gcc-cflags + + gccPath="$gcc/bin" + ldPath="$binutils/bin" +fi + + +doSubstitute() { + local src=$1 + local dst=$2 + # Can't use substitute() here, because replace may not have been + # built yet (in the bootstrap). + sed \ + -e "s^@out@^$out^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@gcc@^$gcc^g" \ + -e "s^@gccProg@^$gccProg^g" \ + -e "s^@gnatProg@^$gnatProg^g" \ + -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ + -e "s^@binutils@^$binutils^g" \ + -e "s^@coreutils@^$coreutils^g" \ + -e "s^@libc@^$libc^g" \ + -e "s^@ld@^$ldPath/ld^g" \ + < "$src" > "$dst" +} + + +# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks +# cc, c++, and f77. +mkGccWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gccProg="$src" + doSubstitute "$gccWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatProg="$src" + doSubstitute "$gnatWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatLinkWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatlinkProg="$src" + doSubstitute "$gnatlinkWrapper" "$dst" + chmod +x "$dst" +} + +if mkGccWrapper $out/bin/gcc $gccPath/gcc +then + ln -sv gcc $out/bin/cc +fi + +if mkGccWrapper $out/bin/g++ $gccPath/g++ +then + ln -sv g++ $out/bin/c++ +fi + +if mkGccWrapper $out/bin/gfortran $gccPath/gfortran +then + ln -sv gfortran $out/bin/g77 + ln -sv gfortran $out/bin/f77 +fi + +mkGccWrapper $out/bin/gcj $gccPath/gcj || true + +mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true + +mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true +mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true +mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true +mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true + +if [ -f $gccPath/ghdl ]; then + ln -sf $gccPath/ghdl $out/bin/ghdl +fi + +# Create a symlink to as (the assembler). This is useful when a +# gcc-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $ldPath/as $out/bin/as + + +# Make a wrapper around the linker. +doSubstitute "$ldWrapper" "$out/bin/ld" +chmod +x "$out/bin/ld" + + +# Emit a setup hook. Also store the path to the original GCC and +# Glibc. +test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$libc" && echo $libc > $out/nix-support/orig-libc + +doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" + +doSubstitute "$setupHook" "$out/nix-support/setup-hook" + +cp -p $utils $out/nix-support/utils.sh + + +# Propagate the wrapped gcc so that if you install the wrapper, you get +# tools like gcov, the manpages, etc. as well (including for binutils +# and Glibc). +if test -z "$nativeTools"; then + echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index d3fe5a0569f9..5e50a5c7dfb5 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -21,10 +21,11 @@ let gccVersion = (builtins.parseDrvName gcc.name).version; gccName = (builtins.parseDrvName gcc.name).name; - + + langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = (if name != "" then name else gccName + "-wrapper") + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); @@ -90,3 +91,9 @@ stdenv.mkDerivation { abort "don't know the name of the dynamic linker for this platform") else ""; } +# This go wrapper should be reworked in stdenv-updates. +// (if langGo then +{ + inherit langGo; + builder = ./buildergo.sh; +} else {})) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 5edcdfdd1938..961f0d8cc4a8 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -52,7 +52,7 @@ let version = "4.7.1"; crossGNU = cross != null && cross.config == "i586-pc-gnu"; patches = [ ] - ++ optional (cross != null || langGo) ./libstdc++-target.patch + ++ optional (cross != null) ./libstdc++-target.patch # ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. @@ -249,6 +249,10 @@ stdenv.mkDerivation ({ (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; + # 'iant' at #go-nuts@freenode, gccgo maintainer, said that + # they have a bug in 4.7.1 if adding "--disable-static" + dontDisableStatic = langGo; + configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 438db4c127db..9e0f129410be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2028,11 +2028,9 @@ let gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; - - # bootstrapping a profiled compiler does not work in the sheevaplug: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - # To be reviewed. Maybe it is fixed already in 4.7. - profiledCompiler = if stdenv.isArm then false else true; + # I'm not sure if profiling with enableParallelBuilding helps a lot. + # We can enable it back some day. This makes the *gcc* builds faster now. + profiledCompiler = false; # When building `gcc.hostDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still @@ -2217,6 +2215,13 @@ let langGo = true; }); + gccgo47 = wrapGCC (gcc47_real.gcc.override { + name = "gccgo"; + langCC = true; #required for go + langC = true; + langGo = true; + }); + ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat; name = "ghdl"; From 592b980931a4a7284dbeec165486929c5e59e62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 3 Aug 2012 19:52:19 +0200 Subject: [PATCH 0465/1120] gccgo46: removing it. I set gccgo = gcc47 gccgo46 did not build for me, and maybe never built at all. The same recipe, though, worked fine for gcc47. So let's go with gcc47. --- pkgs/development/compilers/gcc/4.7/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 961f0d8cc4a8..a8fcef31e1b2 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -43,6 +43,9 @@ assert libelf != null -> zlib != null; # Make sure we get GNU sed. assert stdenv.isDarwin -> gnused != null; +# The go frontend is written in c++ +assert langGo -> langCC; + with stdenv.lib; with builtins; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e0f129410be..6dfa3ac87484 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2206,18 +2206,12 @@ let inherit fetchurl stdenv; }); - gccgo = gccgo46; - - gccgo46 = wrapGCC (gcc46_real.gcc.override { - name = "gccgo"; - langCC = true; #required for go - langC = true; - langGo = true; - }); + # gccgo46 does not work. I set 4.7 then. + gccgo = gccgo47; gccgo47 = wrapGCC (gcc47_real.gcc.override { name = "gccgo"; - langCC = true; #required for go + langCC = true; #required for go. langC = true; langGo = true; }); From f682ff35215dcddf79350c775af38f61895101cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 3 Aug 2012 19:59:43 +0200 Subject: [PATCH 0466/1120] gcc47: disabling parallel build if profiled bootstrap required The gccinstall manual says that parallel building with a profiled bootstrap is not supported. As we don't have much means of checking if our profiled bootstrap with parallel build was good or bad, I propose going to safe terrain. --- pkgs/development/compilers/gcc/4.7/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index a8fcef31e1b2..084e56173a2b 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -408,7 +408,11 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; - enableParallelBuilding = true; + /* From gccinstall.info: + "parallel make is currently not supported since collisions in profile + collecting may occur" + */ + enableParallelBuilding = !profiledCompiler; meta = { homepage = http://gcc.gnu.org/; From a898f9ce8f3b57a1f37274adff810f09da648c7d Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 4 Aug 2012 09:53:53 +0200 Subject: [PATCH 0467/1120] chromium: Update channels for stable version 21. Version 20 doesn't seem to build with a newer version of pulse audio and as 21 is stable now anyway, let's update the channels. --- .../networking/browsers/chromium/sources.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 93cc3a993b16..740f0c609807 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,19 +1,19 @@ # This file is autogenerated from update.sh in the same directory. -# VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8 +# VHASH: c9500486764a2433d0f059134a981eb9adccd3546a6f779bc0e05cdcb26d2ae6 { dev = { - version = "22.0.1207.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2"; - sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp"; + version = "22.0.1221.1"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1221.1.tar.bz2"; + sha256 = "08cx2im0ng1dg83mk8jlx4in7v8f5vsf9y2ild0i22jb20c7h31s"; }; beta = { - version = "21.0.1180.41"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2"; - sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a"; + version = "21.0.1180.57"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; + sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; }; stable = { - version = "20.0.1132.57"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2"; - sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j"; + version = "21.0.1180.57"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; + sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; }; } From c736b59d2a51569fd11cacd2599796f54e0cde15 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 4 Aug 2012 12:11:13 +0200 Subject: [PATCH 0468/1120] google-talkplugin: upgrade to 3.2.4.0 --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 86588f2ed97b..addba712153b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -40,18 +40,18 @@ let in stdenv.mkDerivation { - name = "google-talk-plugin-2.9.10.0"; + name = "google-talk-plugin-3.2.4.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "1lgvv6bkdc5knghyn4gsg5gp7h3qyr4rb978gsi39gkvcazksm0b"; + sha256 = "0gf1bsd52pa47h53x5n1ljn07xc23pzvdc7q3lbqy12zf9szqq2c"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "0k9j27pklwb3vih2cydz9552p9270p73hdi14f0bmn6afxjxd13m"; + sha256 = "055572zi1j3w16lj4cdk686abyhz1xd43445bwk6v38qr4f188dd"; } else throw "Google Talk does not support your platform."; From 9ba62b69107cdb78b107fe2b36e8ea24219dbcfe Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 4 Aug 2012 12:11:26 +0200 Subject: [PATCH 0469/1120] moderncv: upgrade to 1.1.1 --- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index a3dde11d5ae7..31992e311d3e 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,9 +1,9 @@ args: with args; rec { - name = "moderncv-1.0"; + name = "moderncv-1.1.1"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "0yq0ss3qnwk71rcxvch7r5phxfx00s3v80ddpbpc0a0rkh124w53"; + sha256 = "0krnyw1viyv72lixjpmjqwnx8rdmdazmad95jbyp7jy50454fsfd"; }; buildInputs = [texLive unzip]; From b8d0aebe51298ba8f1070d0f94b9b6be1313e803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 4 Aug 2012 13:00:29 +0200 Subject: [PATCH 0470/1120] stellarium: update to version 0.11.3 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index dcf6ccd7d9b7..b651370db216 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.2"; + name = "stellarium-0.11.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "1qk26s0gal2pqr8zy95270fiszxsc6znzzrj5jap91zzibn17945"; + sha256 = "f7c7eeaefcdc54c0fb8766f09e0c838acb742719adcdf12a6c1e12d55ecd6ac3"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; From 705fbf2e8ccf6cf3f5b5c67bf719b0a0addf53d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 4 Aug 2012 13:00:44 +0200 Subject: [PATCH 0471/1120] bison: update to version 2.6.2 --- pkgs/development/tools/parsing/bison/bison-2.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/bison-2.6.nix b/pkgs/development/tools/parsing/bison/bison-2.6.nix index 96fa7dc8ca53..ea43d30410e3 100644 --- a/pkgs/development/tools/parsing/bison/bison-2.6.nix +++ b/pkgs/development/tools/parsing/bison/bison-2.6.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "bison-2.6"; + name = "bison-2.6.2"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.xz"; - sha256 = "6dde6668484acb66267c74174f0cf850bd1be01f6e94850b9bd86ea2046a87a1"; + sha256 = "79503f80397c30ac81b62eca5ffeaccaed72fdfeddb76257efcf8c3ca24be03d"; }; buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; From a79dd881c71a49de35fb99990e4751027ed06fa4 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sat, 28 Jul 2012 12:54:40 -0700 Subject: [PATCH 0472/1120] add eclipse 4.2 --- pkgs/applications/editors/eclipse/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 801efc166daa..af71e89a4166 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -158,6 +158,20 @@ in { }; }; - + eclipse_sdk_42 = buildEclipse { + name = "eclipse-sdk-4.2"; + description = "Eclipse Classic"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz; + sha256 = "1vcr49qm6rsbgzi9d43ggmby68pdigqcy55l5vy1gmixqks3g6s0"; + } + else + fetchurl { + url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk.tar.gz; + sha256 = "1zlv80idkkdda05ks4biknbkczp24b2xki81ik5nygrjg29jqgnz"; + }; + }; } From fb99c24d7cc3b8c9df84836170a99c802773d620 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 01:55:16 +0200 Subject: [PATCH 0473/1120] kernel-3.5: add aufs3 patch --- pkgs/os-specific/linux/kernel/patches.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 65cd9b3d8301..a8c03d0ffb12 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,6 +175,20 @@ rec { features.aufs3 = true; }; + aufs3_5 = rec { + name = "aufs3.5"; + version = "3.5"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "4a5e660ed7f5c1d0467c81c535d0fedcfe62d15f"; + sha256 = "c474573fc03725053e68db481478be74de98abe2c23be60fe08e2f5f2ab3b188"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + # Increase the timeout on CIFS requests from 15 to 120 seconds to # make CIFS more resilient to high load on the CIFS server. cifs_timeout_2_6_15 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dfa3ac87484..92d758f935ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5750,7 +5750,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs3_4 + kernelPatches.aufs3_5 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From c700ec276d85fb2a6cc0c5830adb31e0f0a1e5ba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 02:14:53 +0200 Subject: [PATCH 0474/1120] emacs: add logito package --- .../editors/emacs-modes/logito/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/logito/default.nix diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix new file mode 100644 index 000000000000..00b3add342e7 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "logito-0.1"; + + src = fetchgit { + url = "https://github.com/sigma/logito.git"; + rev = "v0.1"; + sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile logito.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install logito.el logito.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "tiny logging framework for Emacs"; + homepage = https://github.com/sigma/logito; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92d758f935ec..3093b57b5c3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6685,6 +6685,8 @@ let htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + logito = callPackage ../applications/editors/emacs-modes/logito { }; + magit = callPackage ../applications/editors/emacs-modes/magit { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; From 733b548cd076a25306537bfab67a3b6065b20129 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 02:15:11 +0200 Subject: [PATCH 0475/1120] emacs: add pcache package --- .../editors/emacs-modes/pcache/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/pcache/default.nix diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix new file mode 100644 index 000000000000..fee67119d99f --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "pcache-0.2.3"; + + src = fetchgit { + url = "https://github.com/sigma/pcache.git"; + rev = "v0.2.3"; + sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile pcache.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install pcache.el pcache.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Persistent caching for Emacs"; + homepage = https://github.com/sigma/pcache.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3093b57b5c3f..36a05f64d69f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6699,6 +6699,8 @@ let # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); + pcache = callPackage ../applications/editors/emacs-modes/pcache { }; + phpMode = callPackage ../applications/editors/emacs-modes/php { }; prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; From ad5c002891eac0284ab1b7cd03b0b0080ea208b6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 02:15:34 +0200 Subject: [PATCH 0476/1120] emacs: add gh (github) package --- .../editors/emacs-modes/gh/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/gh/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix new file mode 100644 index 000000000000..a92512686823 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, pcache, logito }: + +stdenv.mkDerivation rec { + name = "gh-0.5.3"; + + src = fetchgit { + url = "https://github.com/sigma/gh.el.git"; + rev = "v0.5.3"; + sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ pcache logito ]; + + patchPhase = '' + sed -i Makefile \ + -e "s|^ *EFLAGS *=|& -L ${pcache}/share/emacs/site-lisp -L ${logito}/share/emacs/site-lisp --eval '(setq user-emacs-directory \"./\")'|" \ + -e "s|/usr/local|$out|" \ + -e "s|/site-lisp/\$(PKGNAME)|/site-lisp|" + ''; + + buildPhase = "make lisp"; + + meta = { + description = "A (very early) GitHub client library for Emacs"; + homepage = https://github.com/sigma/gh.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36a05f64d69f..c6a2eb3a7d2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6669,6 +6669,8 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + gh = callPackage ../applications/editors/emacs-modes/gh { }; + jdee = callPackage ../applications/editors/emacs-modes/jdee { # Requires Emacs 23, for `avl-tree'. }; From 56d30f72da0fb5253ad9d48222235997ae17150f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 02:15:48 +0200 Subject: [PATCH 0477/1120] emacs: add gist package --- .../editors/emacs-modes/gist/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/gist/default.nix diff --git a/pkgs/applications/editors/emacs-modes/gist/default.nix b/pkgs/applications/editors/emacs-modes/gist/default.nix new file mode 100644 index 000000000000..21a2137dd392 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/gist/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, emacs, gh, pcache, logito }: + +stdenv.mkDerivation rec { + name = "gist-1.0"; + + src = fetchgit { + url = "https://github.com/sigma/gist.el.git"; + rev = "bbb457e4eaaf5f96cfaaa4f63021e3e542bfbfed"; + sha256 = "469f9df52076d0c6038183cff4b9415bca98de66c08814a60b69729b44bdf294"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L ${gh}/share/emacs/site-lisp \ + -L ${pcache}/share/emacs/site-lisp \ + -L ${logito}/share/emacs/site-lisp \ + --eval '(setq user-emacs-directory "./")' \ + --batch -f batch-byte-compile gist.el + ''; + + propagatedUserEnvPkgs = [ gh pcache logito ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install gist.el gist.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Emacs integration for gist.github.com"; + homepage = https://github.com/sigma/gist.el; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6a2eb3a7d2f..94796fa0ec2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6671,6 +6671,8 @@ let gh = callPackage ../applications/editors/emacs-modes/gh { }; + gist = callPackage ../applications/editors/emacs-modes/gist { }; + jdee = callPackage ../applications/editors/emacs-modes/jdee { # Requires Emacs 23, for `avl-tree'. }; From a8be5de82e7c2c58865826b3cbe48c0c0a9ce61a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 02:16:01 +0200 Subject: [PATCH 0478/1120] emacs: add lorem-ipsum package --- .../emacs-modes/lorem-ipsum/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix diff --git a/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix new file mode 100644 index 000000000000..94427537003b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/lorem-ipsum/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "lorem-ipsum-0.1"; + + src = fetchurl { + url = "http://www.emacswiki.org/emacs/download/lorem-ipsum.el"; + sha256 = "122d0z3xqfaikgk34l7bh989mfxddin2ljinysp2lqw8djfi7jsl"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src lorem-ipsum.el + emacs --batch -f batch-byte-compile lorem-ipsum.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install lorem-ipsum.el lorem-ipsum.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Insert dummy pseudo Latin text for emacs."; + homepage = http://www.emacswiki.org/emacs/LoremIpsum; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94796fa0ec2f..e6ea71414cbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6691,6 +6691,8 @@ let logito = callPackage ../applications/editors/emacs-modes/logito { }; + loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; + magit = callPackage ../applications/editors/emacs-modes/magit { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; From 7620bd06cfae5f2e7a6f77edb8079957ec5790d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Sun, 5 Aug 2012 12:44:01 +0200 Subject: [PATCH 0479/1120] Adding 'st-0.2.1' --- pkgs/applications/misc/st/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/misc/st/default.nix diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix new file mode 100644 index 000000000000..5ac2ad6b9ad8 --- /dev/null +++ b/pkgs/applications/misc/st/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libX11, ncurses}: + +stdenv.mkDerivation rec { + name = "st-0.2.1"; + + src = fetchurl { + url = http://hg.suckless.org/st/archive/0.2.1.tar.gz; + sha256 = "15yqyys69ifjc4vrzvamrg7x0pwa60mnjpi0kap4y9ykhds83xab"; + }; + + buildInputs = [ libX11 ncurses ]; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = http://st.suckless.org/; + license = "MIT"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ea71414cbd..5536d6fcabbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7495,6 +7495,8 @@ let usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug) }; + st = callPackage ../applications/misc/st { }; + dropbox = callPackage ../applications/networking/dropbox { }; slim = callPackage ../applications/display-managers/slim { }; From b39897bdfdac114ba126650bcebc6dc5cb8a3fb5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 13:50:24 +0200 Subject: [PATCH 0480/1120] add package python-pyxattr --- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9743951797d..b747a00d7015 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1994,7 +1994,26 @@ let pythonPackages = python.modules // rec { }; }); - + + pyxattr = buildPythonPackage (rec { + name = "pyxattr-0.5.1"; + + src = fetchurl { + url = "https://github.com/downloads/iustin/pyxattr/${name}.tar.gz"; + sha256 = "0jmkffik6hdzs7ng8c65bggss2ai40nm59jykswdf5lpd36cxddq"; + }; + + doCheck = false; + + buildInputs = [ pkgs.attr ]; + + meta = { + description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems."; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }); + + pyyaml = buildPythonPackage (rec { name = "PyYAML-3.09"; From 0ab43282795857f0ecaa9751938529e3c9c83e3e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 13:50:47 +0200 Subject: [PATCH 0481/1120] add package python-pylibacl --- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b747a00d7015..b3409f3386c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1755,7 +1755,26 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; - + + pylibacl = buildPythonPackage (rec { + name = "pylibacl-0.5.1"; + + src = fetchurl { + url = "https://github.com/downloads/iustin/pylibacl/${name}.tar.gz"; + sha256 = "1idks7j9bn62xzsaxkvhl7bdq6ws8kv8aa0wahfh7724qlbbcf1k"; + }; + + doCheck = false; + + buildInputs = [ pkgs.acl ]; + + meta = { + description = "A Python extension module for POSIX ACLs. It can be used to query, list, add, and remove ACLs from files and directories under operating systems that support them."; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }); + + pylint = buildPythonPackage rec { name = "pylint-0.23.0"; From 9b91fc81a3559f469e9bc68f300721265d010559 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 13:50:56 +0200 Subject: [PATCH 0482/1120] add package python-fuse --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3409f3386c5..3f92395b16e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -752,6 +752,24 @@ let pythonPackages = python.modules // rec { }; }); + fuse = buildPythonPackage (rec { + baseName = "fuse"; + version = "0.2.1"; + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${version}.tar.gz"; + sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; + }; + + buildInputs = [ pkgs.pkgconfig pkgs.fuse ]; + + meta = { + description = "Python bindings for FUSE."; + license = stdenv.lib.licenses.lgpl21; + }; + }); + genshi = buildPythonPackage { name = "genshi-0.6"; From 107f5e3560e446d690ab62bc5b8f3d86f7032459 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 14:02:05 +0200 Subject: [PATCH 0483/1120] bup: include support for xattrs, acls and fuse on linux this enables the commands "bup meta" and "bup fuse". --- pkgs/tools/backup/bup/default.nix | 33 ++++++++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 6d4555d34e56..586fc514ba65 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,24 +1,47 @@ -{ stdenv, fetchgit, python, git, perl, pandoc }: +{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper }: + +with stdenv.lib; stdenv.mkDerivation { name = "bup-0.25git20120722"; + src = fetchgit { url = "https://github.com/apenwarr/bup.git"; sha256 = "3ad232d7f23071ed34f920bd4c3137583f1adffbe23c022896289bc0a03fe7aa"; rev = "02bd2b566ea5eec2fd656e0ae572b4c7b6b9550a"; }; - buildNativeInputs = [ pandoc perl ]; + + buildNativeInputs = [ pandoc perl makeWrapper ]; + buildInputs = [ python git ]; + + postInstall = optionalString (elem stdenv.system platforms.linux) '' + wrapProgram $out/bin/bup --prefix PYTHONPATH : \ + ${stdenv.lib.concatStringsSep ":" + (map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])} + ''; + patchPhase = '' for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" - substituteInPlace lib/bup/csetup.py --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" + substituteInPlace lib/bup/csetup.py \ + --replace "'bupsplit.c'])" "'bupsplit.c'], library_dirs=['${python}/lib'])" ''; - makeFlags = "MANDIR=$(out)/share/man DOCDIR=$(out)/share/doc/bup BINDIR=$(out)/bin LIBDIR=$(out)/lib/bup"; + + makeFlags = [ + "MANDIR=$(out)/share/man" + "DOCDIR=$(out)/share/doc/bup" + "BINDIR=$(out)/bin" + "LIBDIR=$(out)/lib/bup" + ]; + meta = { - description = "Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images."; + description = '' + Highly efficient file backup system based on the git packfile format. + Capable of doing *fast* incremental backups of virtual machine images. + ''; homepage = "https://github.com/apenwarr/bup"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5536d6fcabbe..a0cf5f4739a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -488,7 +488,8 @@ let btar = callPackage ../tools/backup/btar { }; bup = callPackage ../tools/backup/bup { - pandoc = haskellPackages.pandoc; + inherit (pythonPackages) pyxattr pylibacl setuptools fuse; + inherit (haskellPackages) pandoc; }; bzip2 = callPackage ../tools/compression/bzip2 { }; From 98614c72c138af13ef7b463fb4b011a7788cb4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 5 Aug 2012 14:22:52 +0200 Subject: [PATCH 0484/1120] LyX: a minor update. --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 4358c3fe6e75..0d0fbe4a5d64 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; name = "lyx-${version}"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz"; - sha256 = "1j2sl22w41h4vrgnxv2n0s7d11k6zchjbggjw3ai9yxcahvrj72f"; + sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8"; }; buildInputs = [texLive qt python makeWrapper pkgconfig ]; From aed4ee4025a518db48782779ab018aabea7570a1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 14:36:54 +0200 Subject: [PATCH 0485/1120] sysstat: upgrade to 10.1.1 --- pkgs/os-specific/linux/sysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 3f464dbd6560..13655b4c91ff 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "sysstat-10.0.3"; + name = "sysstat-10.1.1"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.bz2"; - sha256 = "0z7zr1b4xg9k8rbk2rnghjcycdfi0vb55f117d46ygcdym9ks0i2"; + sha256 = "1ig6k4yjkkazddjr90hykiapl30s9r9c1gy1h8hqzn2c3xgkm7p3"; }; buildInputs = [ gettext ]; From e8afe3c1c841eddbb1462ba48c1c432bea1f6d8d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 5 Aug 2012 14:55:44 +0200 Subject: [PATCH 0486/1120] add package dstat --- pkgs/os-specific/linux/dstat/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/dstat/default.nix diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix new file mode 100644 index 000000000000..fb454c78788b --- /dev/null +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "dstat-0.7.2"; + + src = fetchurl { + url = "http://dag.wieers.com/home-made/dstat/${name}.tar.bz2"; + sha256 = "1bivnciwlamnl9q6i5ygr7jhs8pp833z2bkbrffvsa60szcqda9l"; + }; + + buildInputs = [ ]; + + patchPhase = '' + sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \ + -e "s|/usr/share/dstat|$out/share/dstat|" dstat + ''; + + makeFlags = "prefix=$(out)"; + + meta = { + homepage = http://dag.wieers.com/home-made/dstat/; + description = "Versatile resource statistics tool."; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0cf5f4739a5..7348082740e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5494,6 +5494,8 @@ let drbd = callPackage ../os-specific/linux/drbd { }; + dstat = callPackage ../os-specific/linux/dstat { }; + libuuid = if crossSystem != null && crossSystem.config == "i586-pc-gnu" then (utillinux // { From 1229893ebe32f911e1ff5a668ab55ea6481b1b02 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2012 17:25:52 +0400 Subject: [PATCH 0487/1120] ModernCV: use launchpad-based versioned downloads --- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 31992e311d3e..2d422385bd55 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,9 +1,10 @@ args: with args; rec { - name = "moderncv-1.1.1"; + version = "1.1.1"; + name = "moderncv-${version}"; src = fetchurl { - url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "0krnyw1viyv72lixjpmjqwnx8rdmdazmad95jbyp7jy50454fsfd"; + url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; + sha256 = "929c118eff339a5c59ed58cc961ddee787e9a5933d12ec8801613fd2e2500e9f"; }; buildInputs = [texLive unzip]; From 3d2e1508eed0845fbba57ed0bf134454249f1aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Sun, 5 Aug 2012 13:01:43 +0200 Subject: [PATCH 0488/1120] surf: updating to 0.5, and making it build. It needed webkit_gtk2. --- pkgs/applications/misc/surf/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 3164f0c1a94a..61d2e6a65bd0 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "surf-${version}"; - version="0.4.1"; + version="0.5"; src = fetchurl { url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "0im5psjw0r8av3zjyy2wqcl6y5ylwnrab5kfcwc23bsbx2irnw4k"; + sha256 = "19qfkwdk6p5hcwnnplscp1kmypz74mga7x6iqy6w3g18s221f2mx"; }; buildInputs = [ gtk webkit pkgconfig glib libsoup ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7348082740e2..c12d033f1ef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,6 +7556,7 @@ let surf = callPackage ../applications/misc/surf { libsoup = gnome.libsoup; + webkit = webkit_gtk2; }; svk = perlPackages.SVK; From 6655bc783e2db1c29701a363c8886d44db101bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 3 Aug 2012 22:55:10 +0200 Subject: [PATCH 0489/1120] go: patching it to get the nixos cacert bundle taken just fine --- pkgs/development/compilers/go/cacert.patch | 15 +++++++++++++++ pkgs/development/compilers/go/default.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/compilers/go/cacert.patch diff --git a/pkgs/development/compilers/go/cacert.patch b/pkgs/development/compilers/go/cacert.patch new file mode 100644 index 000000000000..42a44313835f --- /dev/null +++ b/pkgs/development/compilers/go/cacert.patch @@ -0,0 +1,15 @@ +Go comes with hardcoded cacert. We add the usual in NixOS, +for easier NixOS life. + +diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go +index 76e79f4..6ef1dd3 100644 +--- a/src/pkg/crypto/x509/root_unix.go ++++ b/src/pkg/crypto/x509/root_unix.go +@@ -15,6 +15,7 @@ var certFiles = []string{ + "/etc/ssl/ca-bundle.pem", // OpenSUSE + "/etc/ssl/cert.pem", // OpenBSD + "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD ++ "/etc/ssl/certs/ca-bundle.crt", // NixOS + } + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index a5b75ed94356..459ce6310bf0 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation { sed -i '/TestHostname/areturn' src/pkg/os/os_test.go ''; + patches = [ ./cacert.patch ]; GOOS = "linux"; GOARCH = if (stdenv.system == "i686-linux") then "386" From bdb1ccaf805a8e3f585d25a2a492c49752570576 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 5 Aug 2012 23:08:01 +0400 Subject: [PATCH 0490/1120] Lilypond: update to 2.14.2 --- pkgs/misc/lilypond/default.nix | 32 ++++++++++++++++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index b3a9bec29725..65575af4c392 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,24 +1,36 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, texLive -, fontconfig, freetype, pango, fontforge, help2man }: +, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex +, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff +, fetchsvn }: stdenv.mkDerivation rec{ - majorVersion="2.13"; - minorVersion="46"; + majorVersion="2.14"; + minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "370f59d10a3fc74c5790111f7a69e04304eda5384513c95838dda3cc087904e6"; + urwfonts = fetchsvn { + url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44"; + sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn"; }; - configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"]; + src = fetchurl { + url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; + # 2.15.42 + # sha256 = "0cm2fq1cr9d24w5xkz6ik6qnby516dfahz4cw47xx8mb5qsa4drd"; + sha256 = "15i6k3fjc29wvchayn31khxhpppzd4g6ivbk7l43fakj8lw6nfi4"; + }; + + preConfigure='' + sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl + ''; + + configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile + [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm python gettext flex perl bison pkgconfig texLive fontconfig freetype pango - fontforge help2man + fontforge help2man groff ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12d033f1ef9..5a4729bfbf6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8595,9 +8595,7 @@ let lazylist = callPackage ../tools/typesetting/tex/lazylist { }; - lilypond = callPackage ../misc/lilypond { - guile = guile_1_8; - }; + lilypond = callPackage ../misc/lilypond { }; martyr = callPackage ../development/libraries/martyr { }; From 97081611e2a8b57ec5beeff090131ea2b9e6fefb Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 27 Jul 2012 07:33:01 +0200 Subject: [PATCH 0491/1120] Add package haskell-digestive-functors-heist Generated by cabal2nix, builds locally. --- .../haskell/digestive-functors-heist/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/digestive-functors-heist/default.nix diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix new file mode 100644 index 000000000000..acc75a3552a2 --- /dev/null +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -0,0 +1,14 @@ +{ cabal, digestiveFunctors, heist, text, xmlhtml }: + +cabal.mkDerivation (self: { + pname = "digestive-functors-heist"; + version = "0.5.0.0"; + sha256 = "1cqzpnr53mailnmjgkbqk4f4hrjd84h6682mr8x7qg5v27zvcdbn"; + buildDepends = [ digestiveFunctors heist text xmlhtml ]; + meta = { + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "Heist frontend for the digestive-functors library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 67fef9ed23da..97c209862895 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -636,6 +636,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; + digestiveFunctorsHeist = callPackage ../development/libraries/haskell/digestive-functors-heist {}; + digestiveFunctorsSnap = callPackage ../development/libraries/haskell/digestive-functors-snap {}; dimensional = callPackage ../development/libraries/haskell/dimensional {}; From f3ae30b8d61a02bca5fc8d9a2abc67efb4971c5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Aug 2012 12:44:29 +0200 Subject: [PATCH 0492/1120] haskell-accelerate-cuda: update to version 0.12.1.1 --- .../development/libraries/haskell/accelerate-cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 4ed0f4ea5e38..ff9a98cbb59e 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.12.1.0"; - sha256 = "1y6viivizv4frdh3xk5wqhs7wwnhqyjr9wid1y1d5l42mz41vp84"; + version = "0.12.1.1"; + sha256 = "1kj9i6djjb46ad3dnzk72mf33r8h1mjxljs7x5rf2d658hqk5yfv"; buildDepends = [ accelerate binary blazeBuilder cryptohash cuda fclabels filepath hashable hashtables languageCQuote mainlandPretty mtl srcloc From b2eb3b886ef36eef768437982cebe6e02e290a53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Aug 2012 12:44:29 +0200 Subject: [PATCH 0493/1120] haskell-irc: update to version 0.5.1.0 --- pkgs/development/libraries/haskell/irc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 613f03c80c16..89d277d1f406 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "irc"; - version = "0.5.0.0"; - sha256 = "0bid9iqgrppkl7hl1cd2m1pvvk5qva53fqfl0v5ld52j904c50sr"; + version = "0.5.1.0"; + sha256 = "1xkgqcjxlxqg60qlv26ypmvf9x288sjz1n47rb7zfvjhdimws8gj"; buildDepends = [ parsec ]; meta = { description = "A small library for parsing IRC messages"; From f020eac1ff615758f8f2d348395754353409196d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Aug 2012 12:44:29 +0200 Subject: [PATCH 0494/1120] haskell-multiplate: update to version 0.0.2 --- pkgs/development/libraries/haskell/multiplate/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index ac572b7c59ac..14310f50ef6f 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "multiplate"; - version = "0.0.1.1"; - sha256 = "00rxgkvgx1rfvk15gjyyg00vqyg4j24d8d19q6rj07j2mgfvdxw6"; + version = "0.0.2"; + sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw"; buildDepends = [ transformers ]; - patchPhase = '' - sed -i -e 's|transformers >= 0.2 && < 0.3|transformers|' multiplate.cabal - ''; meta = { homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; From 3e2e746d5aed8d7808d0716c440432e0e55d811e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 6 Aug 2012 12:44:29 +0200 Subject: [PATCH 0495/1120] haskell-shelly: update to version 0.14.0.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 867632cb8189..0c266ab1b29c 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.13.4"; - sha256 = "0776vlvzkx5dbkb8gyvcngq2ryabcx1ib4hw2cb6f8bm77y20sq1"; + version = "0.14.0.1"; + sha256 = "062c3zqr6ad61p0s423h8rhimqfld6p95z3qzrmag9f29a5f4fbz"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 17c8e65cefdaf842ad655e08d88ea766fbaa1dbc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 6 Aug 2012 14:17:41 +0200 Subject: [PATCH 0496/1120] django: Fix URL in src. Accidentally left the ${version} url but it didn't cause an error on my machine, as I used nix-prefetch-url with the correct URL. This should be fixed by now. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f92395b16e0..5a2784a568b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -510,7 +510,7 @@ let pythonPackages = python.modules // rec { version = "1.4.1"; src = fetchurl { - url = "http://www.djangoproject.com/m/releases/${version}/${name}.tar.gz"; + url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; sha256 = "16s0anvpaccbqmdrhl71z73k0dy2sl166nnc2fbd5lshlgmj13ad"; }; From d6cc420fd71e4d33fc2efb1e10e17054a40f98cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Aug 2012 09:57:01 -0400 Subject: [PATCH 0497/1120] linux: Update to 3.2.26 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 811c75a344a1..2570bf2e2a54 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.24"; + version = "3.2.26"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1vg8wr8qd2hm40izx53iyfj97j6z02swx9skjy1a8spvix2ihwvs"; + sha256 = "1prchrid14sl29480g8a92lb7nn1hxrhcyx2mz4wi7wyr34lrv5z"; }; config = configWithPlatform stdenv.platform; From dabc583abbb4408b52d9ee40473fd30fe976240a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Mon, 6 Aug 2012 17:43:30 +0200 Subject: [PATCH 0498/1120] awesome: update to 3.4.13 I removed some patches that were no longer needed. Russian manpages still fail. --- .../window-managers/awesome/cmake284.patch | 40 ------------------- .../window-managers/awesome/default.nix | 18 ++------- 2 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 pkgs/applications/window-managers/awesome/cmake284.patch diff --git a/pkgs/applications/window-managers/awesome/cmake284.patch b/pkgs/applications/window-managers/awesome/cmake284.patch deleted file mode 100644 index 4af70227805f..000000000000 --- a/pkgs/applications/window-managers/awesome/cmake284.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001 -From: Thomas Moschny -Date: Mon, 21 Feb 2011 17:58:04 +0100 -Subject: [PATCH] Normalize icon path names (fixes #869). - -The elements in ${icon_sources}, as returned by file(GLOB ...) contain -double slashes, could be a bug in cmake. This causes building with -cmake 2.8.4 to fail, due to dependency problems lateron. - -This patch works around the issue by normalizing all path names in -${icon_sources} while appending them to ${ALL_ICONS}, thereby removing -the double slashes. ---- - CMakeLists.txt | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 64be9b9..472bec2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,14 +244,15 @@ endif() - - # {{{ Theme icons - file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png) --set(ALL_ICONS ${icon_sources}) - - foreach(icon ${icon_sources}) - # Copy all icons to the build dir to simplify the following code. - # Source paths are interpreted relative to ${SOURCE_DIR}, target paths - # relative to ${BUILD_DIR}. - get_filename_component(icon_path ${icon} PATH) -+ get_filename_component(icon_name ${icon} NAME) - file(COPY ${icon} DESTINATION ${icon_path}) -+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}") - endforeach() - - macro(a_icon_convert match replacement input) --- -1.7.3.4 - diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 5110e42fb183..5e24a42d3a72 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_45, libxslt, coreutils}: let - version = "3.4.11"; + version = "3.4.13"; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; + sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; }; buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango @@ -36,19 +36,9 @@ stdenv.mkDerivation rec { # asciidoc: FAILED: : line 3: section title expected # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 substituteInPlace CMakeLists.txt \ - --replace "set(AWE_MAN_LANGS es fr de ru)" \ - "set(AWE_MAN_LANGS es fr de)" + --replace "set(AWE_MAN_LANGS it es fr de ru)" \ + "set(AWE_MAN_LANGS it es fr de)" ''; - - # XXX: maybe not needed anymore - # Somehow libev does not get into the rpath, although it should. - # Something may be wrong in the gcc wrapper. - preBuild = '' - export NIX_LDFLAGS_BEFORE="-lev"; - ''; - - # Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error. - cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ]; meta = { homepage = http://awesome.naquadah.org/; From f901b6d38d61b7a99a7d1ea633294a6f9a6ae78e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Aug 2012 15:26:24 -0400 Subject: [PATCH 0499/1120] git: Update to 1.7.11.4 --- .../version-management/git-and-tools/git/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 4ed5f78d6e0c..066b5a50913e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,10 +9,10 @@ let - version = "1.7.11"; - + version = "1.7.11.4"; + svn = subversionClient.override { perlBindings = true; }; - + in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0qgi1cj19dnn0sl3n38dbz68nllvyppdvs2jb77ksiar4jb9lsc3"; + sha256 = "16a1gm256w82j9ardzyfyqi0f35l3x92xsqz8ghz1pnja8jns7g9"; }; patches = [ ./docbook2texi.patch ]; @@ -100,7 +100,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ - "$out/$prog" + "$out/$prog" done '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts From 679b534dd07e42a70cbc5c8a0616c2c0e88f162f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 7 Aug 2012 00:11:13 +0200 Subject: [PATCH 0500/1120] Add selenium python package --- pkgs/top-level/python-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a2784a568b3..637d53b06f76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2257,6 +2257,34 @@ let pythonPackages = python.modules // rec { }; }; + selenium = + buildPythonPackage rec { + name = "selenium-2.25.0"; + src = pkgs.fetchurl { + url = http://pypi.python.org/packages/source/s/selenium/selenium-2.25.0.tar.gz; + sha256 = "0iinpry1vr4dydh44sc0ny22sa9fqhy2302hf56pf8fakvza9m0a"; + }; + + buildInputs = [pkgs.xlibs.libX11]; + + # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some + # absolute paths. Replaced by relative path so it is found when used in nix. + x_ignore_nofocus = + pkgs.fetchsvn { + url = http://selenium.googlecode.com/svn/tags/selenium-2.25.0/cpp/linux-specific; + rev = 17641; + sha256 = "1wif9r6307qhlcp2zbg6n05yvxxn9ppkxh8gpsplcbyh22zi7bcd"; + }; + + preInstallPhases = "preInstall"; + preInstall = '' + cp ${x_ignore_nofocus}/* . + sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c + gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o + gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so x_ignore_nofocus.o + cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ + ''; + }; setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; From f676f9e4872ed8683a841517644f871047a351e9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 7 Aug 2012 03:14:17 +0200 Subject: [PATCH 0501/1120] Add xvfb-run, a wrapper script for Xvfb. --- pkgs/tools/misc/xvfb-run/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/xvfb-run/default.nix diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix new file mode 100644 index 000000000000..234317b5163a --- /dev/null +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config}: +let + xvfb_run = fetchurl { + url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; + sha256 = "1f9mrhqy0l72i3674n98bqlq9a10h0rh9qfjiwvivz3hjhq5c0gz"; + }; +in +stdenv.mkDerivation { + name = "xvfb-run"; + buildInputs = [makeWrapper]; + buildCommand = '' + mkdir -p $out/bin + cp ${xvfb_run} $out/bin/xvfb-run + sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run + + chmod a+x $out/bin/xvfb-run + wrapProgram $out/bin/xvfb-run \ + --set XKB_BINDIR "${xkbcomp}/bin" \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a4729bfbf6f..197d0e48dfda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1738,6 +1738,8 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; + xvfb_run = callPackage ../tools/misc/xvfb-run {}; + youtubeDL = callPackage ../tools/misc/youtube-dl { }; zbar = callPackage ../tools/graphics/zbar {}; From 374886444f4463672c3b7474c9048810c319e8d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 7 Aug 2012 03:27:00 +0200 Subject: [PATCH 0502/1120] xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE --- pkgs/tools/misc/xvfb-run/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 234317b5163a..162fb73b3f00 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config}: +{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}: let xvfb_run = fetchurl { url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; @@ -16,6 +16,7 @@ stdenv.mkDerivation { chmod a+x $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ --set XKB_BINDIR "${xkbcomp}/bin" \ - --prefix PATH : ${getopt}/bin:${xorgserver}/bin + --set FONTCONFIG_FILE "${fontsConf}" \ + --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 197d0e48dfda..7054595180f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1738,7 +1738,7 @@ let xtreemfs = callPackage ../tools/filesystems/xtreemfs {}; - xvfb_run = callPackage ../tools/misc/xvfb-run {}; + xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; youtubeDL = callPackage ../tools/misc/youtube-dl { }; From 21a200d6b21e7c28540203306b61c73f63f41ace Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 7 Aug 2012 06:36:50 -0400 Subject: [PATCH 0503/1120] linux/manual-config: Fix depmod step, remove false comment --- pkgs/os-specific/linux/kernel/manual-config.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b64cf786e3eb..f9806c45451a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -46,10 +46,6 @@ in # The kernel version version, # The version of the kernel module directory - # Note that, unlike with the normal kernel builder, it shouldn't be necessary - # to specify this for releases with 2 version numbers, e.g. if you're building - # Linux 3.5 the modules will happily be installed in $out/lib/modules/3.5/, but - # this is provided for compatability. modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) src, @@ -68,8 +64,8 @@ let installkernel = name: writeTextFile { name = "installkernel"; executable=true; text = '' #!/bin/sh mkdir $4 - mv -v $2 $4/${name} - mv -v $3 $4 + cp -av $2 $4/${name} + cp -av $3 $4 '';}; isModular = config.isYes "MODULES"; @@ -80,7 +76,7 @@ let commonMakeFlags = [ "O=../build" "INSTALL_PATH=$(out)" - ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}") + ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; in @@ -102,6 +98,7 @@ stdenv.mkDerivation { echo "stripping FHS paths in \`$mf'..." sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' done + sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' ''; configurePhase = '' @@ -114,7 +111,7 @@ stdenv.mkDerivation { runHook postConfigure ''; - buildNativeInputs = [ perl nettools ] ++ optional isModular kmod; + buildNativeInputs = [ perl nettools ]; makeFlags = commonMakeFlags ++ [ "INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}" @@ -126,7 +123,7 @@ stdenv.mkDerivation { ]; }; - postInstall = stdenv.lib.optionalString installsFirmware '' + postInstall = optionalString installsFirmware '' mkdir -p $out/lib/firmware '' + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ From 740cd9b5f446cdfb32ea2845c20e5e9a93297197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 7 Aug 2012 14:45:18 +0200 Subject: [PATCH 0504/1120] LyX: add support for spell checking via enchant. Also comment on testing of other config options. --- pkgs/applications/misc/lyx/default.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 0d0fbe4a5d64..cb832ed99f5c 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,6 +1,5 @@ -# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc { fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig -, libX11, qt +, libX11, qt4, enchant #, mythes, boost }: stdenv.mkDerivation rec { @@ -12,7 +11,17 @@ stdenv.mkDerivation rec { sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8"; }; - buildInputs = [texLive qt python makeWrapper pkgconfig ]; + configureFlags = [ + #"--without-included-boost" + /* Boost is a huge dependency from which 1.4 MB of libs would be used. + Using internal boost stuff only increases executable by around 0.2 MB. */ + #"--without-included-mythes" # such a small library isn't worth a split package + ]; + + buildInputs = [ + texLive qt4 python makeWrapper pkgconfig + enchant # mythes boost + ]; meta = { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7054595180f2..981b21e37f1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7170,9 +7170,7 @@ let lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = callPackage ../applications/misc/lyx { - qt = qt4; - }; + lyx = callPackage ../applications/misc/lyx { }; makeself = callPackage ../applications/misc/makeself { }; From 54651b266293992b16dfc625acfeded132e9b74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 7 Aug 2012 14:44:00 +0200 Subject: [PATCH 0505/1120] Hunspell upgrade. --- pkgs/development/libraries/hunspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 9f3650c21558..c5243bc63930 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, readline }: stdenv.mkDerivation rec { - name = "hunspell-1.2.12"; + name = "hunspell-1.3.2"; src = fetchurl { url = "mirror://sf/hunspell/${name}.tar.gz"; - sha256 = "0s8fh8zanhks6bgkb7dzwscy97fb6wl4ymvjqz7188fz29qjlnaz"; + sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl"; }; propagatedBuildInputs = [ ncurses readline ]; From cf3ea80e1f6c2ce063f06cdc60a0daa0f91da926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 7 Aug 2012 17:41:18 +0200 Subject: [PATCH 0506/1120] Scribus minor update, modifying dependencies. - using the boostHeaders dep to build scribus with 2geom (internal) - adding more xorg deps to build with XCB support --- pkgs/applications/office/scribus/default.nix | 21 +++++++++++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 3c72db17e1f1..a4f5821c54c0 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,21 +1,24 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt, python, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: -stdenv.mkDerivation { - name = "scribus-1.4.0rc6"; +, libart_lgpl, qt4, python, cups, fontconfig, libjpeg +, zlib, libpng, xorg, cairo, podofo, aspell, boostHeaders, cmake }: + +stdenv.mkDerivation rec { + name = "scribus-1.4.1"; src = fetchurl { - url = mirror://sourceforge/scribus/scribus/scribus-1.4.0.rc6.tar.bz2; - sha256 = "1rrnzxjzhqj4lgyfswly501xlyvm4hsnnq7zw008v0cnkx31icli"; + url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; + sha256 = "1n67z2bk5ca2sxvv43jvj7yygfr4d2x5yc69zk70v38prm0gqlv8"; }; enableParallelBuilding = true; - buildInputs = - [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt + buildInputs = with xorg; + [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 python cups fontconfig - xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama libjpeg zlib libpng podofo aspell cairo + boostHeaders # for internal 2geom library + libXaw libXext libX11 libXtst libXi libXinerama + libpthreadstubs libXau libXdmcp ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 981b21e37f1f..79bd75833174 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7479,7 +7479,6 @@ let scribus = callPackage ../applications/office/scribus { inherit (gnome) libart_lgpl; - qt = qt4; }; seeks = callPackage ../tools/networking/p2p/seeks { From fbfd84f81682272dfb408508d938a796d4ec4f86 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 7 Aug 2012 16:53:51 +0200 Subject: [PATCH 0507/1120] chromium: Install libffmpegsumo.so. This caused HTML5 video to not work because this shared library is loaded at runtime. Unfortunately we can't use system ffmpeg yet, because upgrading would break builds of other packages, and it would result in a copy of ffmpeg laying around aswell, so we can defer this until we have fixed ffmpeg. Thanks to @bluescreen303 for the bug report. --- pkgs/applications/networking/browsers/chromium/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4c3a02dcecc2..fb3d1109e148 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -172,6 +172,7 @@ in stdenv.mkDerivation rec { mkdir -vp "$out/libexec/${packageName}" cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/" cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/" + cp -v out/${buildType}/libffmpegsumo.so "$out/libexec/${packageName}/" cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}" From bff9f2720f36ff1f3ac3ac86a3c0adb9d572c7e7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:30:25 +0400 Subject: [PATCH 0508/1120] Revert "xen: update to version 4.1.2" This reverts commit af32fd6ce3ce2ae138c2fc2bc5c6067216f8b828. --- .../virtualization/xen/default.nix | 19 +++------ .../virtualization/xen/gcc-4.5.patch | 39 +++++++++++++++++++ 2 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/gcc-4.5.patch diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index d898daad2a77..ce799242e12e 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - version = "4.1.2"; + version = "4.0.3"; libDir = if stdenv.is64bit then "lib64" else "lib"; @@ -30,24 +30,23 @@ let } ]; - ipxeSrc = - { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz; - sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723"; - }; -in +in stdenv.mkDerivation { name = "xen-${version}"; src = fetchurl { url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d"; + sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5"; }; patches = [ # Xen looks for headers in /usr/include and for libraries using # ldconfig. Don't do that. ./has-header.patch + + # GCC 4.5 compatibility. + ./gcc-4.5.patch ]; buildInputs = @@ -103,18 +102,12 @@ stdenv.mkDerivation { --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \ --replace /bin/ls ls - grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g' - # Xen's stubdoms need various sources that it usually fetches at # build time using wget. We can't have that. ${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in '' cp ${src} stubdom/${src.name} '')} - ${let src = fetchurl ipxeSrc; in '' - cp ${src} tools/firmware/etherboot/ipxe.tar.gz - ''} - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h diff --git a/pkgs/applications/virtualization/xen/gcc-4.5.patch b/pkgs/applications/virtualization/xen/gcc-4.5.patch new file mode 100644 index 000000000000..a8412d69fd3f --- /dev/null +++ b/pkgs/applications/virtualization/xen/gcc-4.5.patch @@ -0,0 +1,39 @@ +http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html + +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c +--- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100 +@@ -281,7 +281,7 @@ + /* + * Mark portion of the address space read only. + */ +-extern void shared_info; ++extern char shared_info[PAGE_SIZE]; + static void set_readonly(void *text, void *etext) + { + unsigned long start_address = +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk +--- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100 +@@ -10,6 +10,7 @@ + DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) + DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) + DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline ++DEF_CFLAGS += -Wno-uninitialized + DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION) + + DEF_ASFLAGS += -D__ASSEMBLY__ +diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c +--- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200 ++++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100 +@@ -25,8 +25,8 @@ + + + +-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE) +-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE) ++#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE) ++#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE) + #define GRANT_INVALID_REF 0 + + From b125ef36b67f2a0aedabc34eb4dac12e61ae9828 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 8 Aug 2012 00:49:12 +0200 Subject: [PATCH 0509/1120] Bump gitAndTools/tig from 0.16 to 1.0 --- .../git-and-tools/default.nix | 18 ++---------------- .../git-and-tools/tig/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/version-management/git-and-tools/tig/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 53e214e8f370..efe4fcb2d7c9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -69,22 +69,8 @@ rec { inherit stdenv fetchurl unzip; }; - tig = stdenv.mkDerivation { - name = "tig-0.16"; - src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz"; - sha256 = "167kak44n66wqjj6jrv8q4ijjac07cw22rlpqjqz3brlhx4cb3ix"; - }; - buildInputs = [ncurses asciidoc xmlto docbook_xsl]; - installPhase = '' - make install - make install-doc - ''; - meta = { - description = "console git repository browser that additionally can act as a pager for output from various git commands"; - homepage = http://jonas.nitro.dk/tig/; - license = "GPLv2"; - }; + tig = import ./tig { + inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl; }; gitFastExport = import ./fast-export { diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix new file mode 100644 index 000000000000..d567e20d7320 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl }: + +stdenv.mkDerivation { + name = "tig-1.0"; + src = fetchurl { + url = "http://jonas.nitro.dk/tig/releases/tig-1.0.tar.gz"; + md5 = "a2d414d1cebbc9cd4f3d545bc6f225c6"; + }; + buildInputs = [ncurses asciidoc xmlto docbook_xsl]; + installPhase = '' + make install + make install-doc + ''; + meta = { + description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands"; + homepage = "http://jonas.nitro.dk/tig/"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79bd75833174..193d8a357d0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6887,6 +6887,7 @@ let git = gitAndTools.git; gitFull = gitAndTools.gitFull; gitSVN = gitAndTools.gitSVN; + tig = gitAndTools.tig; giv = callPackage ../applications/graphics/giv { pcre = pcre.override { unicodeSupport = true; }; From da7408e105d605596ac926dd990d2c2e7aee2bc8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:33:06 +0400 Subject: [PATCH 0510/1120] xen: Support PCI passthrough. Previous commit reverted Xen back to 4.0.3 because xend from 4.1.* and newer hangs for unknown reasons. The new "xl" toolstack from 4.1.* and unstable works, yet PCI passthrough is not supported by xl in 4.1.* and is broken in the unstable. With this patch I was able to passthrough ATI Radeon HD 6950 without 3D acceleration, though, to both Linux and Windows guests. Which is the best archived result with Xen PCI passthrough on NixOS after trying out all possible Xen versions. Same VGA card works fine if passed through into a guest with KVM (acceleration, GPGPU, everything works). I should have tried KVM from the start. --- pkgs/applications/virtualization/xen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index ce799242e12e..3cb16a6b4425 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses}/include/curses.h + substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't # print the GCC version number properly. substituteInPlace xen/Makefile \ From 179b1bd2943edb2be18c67813e1f4af7dd21cf87 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 03:58:17 +0400 Subject: [PATCH 0511/1120] Add package enca 1.13 to tools/text --- pkgs/tools/text/enca/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/text/enca/default.nix diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix new file mode 100644 index 000000000000..ce1c7401a4e0 --- /dev/null +++ b/pkgs/tools/text/enca/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libiconv ? null }: + +stdenv.mkDerivation rec { + name = "enca-1.13"; + + src = fetchurl { + url = "http://dl.cihar.com/enca/${name}.tar.bz2"; + sha256 = "6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432"; + }; + + buildInputs = (stdenv.lib.optional (libiconv != null) libiconv); + + meta = { + homepage = http://freecode.com/projects/enca; + description = "Detects the encoding of text files and reencodes them"; + + longDescription = '' + Enca detects the encoding of text files, on the basis of knowledge + of their language. It can also convert them to other encodings, + allowing you to recode files without knowing their current encoding. + It supports most of Central and East European languages, and a few + Unicode variants, independently on language. + ''; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79bd75833174..356384e95cb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,6 +447,8 @@ let eggdrop = callPackage ../tools/networking/eggdrop { }; + enca = callPackage ../tools/text/enca { }; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; From 8071b4040e7629943097b21a13a8a71b51e20def Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:54:10 +0400 Subject: [PATCH 0512/1120] pptp: Fix path to `ip` routing.c has hardcoded /bin/ip. Use ${iproute2}/sbin/ip instead. --- pkgs/tools/networking/pptp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index adb22a8d9c66..88f1a86a2edc 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ppp }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { name = "pptp-1.7.2"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e 's/install -o root/install/' -i Makefile + sed -e 's,/bin/ip,${iproute}/sbin/ip,' -i routing.c ''; preConfigure = '' From 8040b72293c0751bc77aa3402a3342698d226252 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:55:00 +0400 Subject: [PATCH 0513/1120] KDE NM 0.9.0.4 --- pkgs/tools/networking/networkmanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanagement/default.nix b/pkgs/tools/networking/networkmanagement/default.nix index 682b78f2bae3..1919186586a6 100644 --- a/pkgs/tools/networking/networkmanagement/default.nix +++ b/pkgs/tools/networking/networkmanagement/default.nix @@ -2,7 +2,7 @@ let pname = "networkmanagement"; - version = "0.9.0"; + version = "0.9.0.4"; name = "${pname}-${version}"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0bxb5hzygf4szv01903zirzxjb3r2nzza9ya3rag4lkxxpwaynpd"; + sha256 = "0mp2jai6f2qpywjwgvxcl1nh27idgy740vwiahfamq8w2y90a3aj"; }; buildInputs = [ kdelibs kde_workspace networkmanager ]; From cb9b55a197bc4065f7d8b11520d2df4385c45d4b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 9 Jul 2012 03:05:56 +0200 Subject: [PATCH 0514/1120] google-talk-plugin: Prefer Debian package. The reason is because unpacking debian packages requires fewer dependencies (ar, gzip and tar, nothing more), and in addition we can explicitly reference a version number from the apt repository. --- .../google-talk-plugin/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index addba712153b..ff199791bba8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; let + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; + rpathPlugin = makeLibraryPath [ mesa xorg.libXt @@ -39,28 +41,26 @@ let in -stdenv.mkDerivation { - name = "google-talk-plugin-3.2.4.0"; +stdenv.mkDerivation rec { + name = "google-talk-plugin-${version}"; + version = "3.2.4.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "0gf1bsd52pa47h53x5n1ljn07xc23pzvdc7q3lbqy12zf9szqq2c"; + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; + sha256 = "0hd8iyv092fr4bz760xjawiad581hphddv608d0dvzy2bhnl17g1"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "055572zi1j3w16lj4cdk686abyhz1xd43445bwk6v38qr4f188dd"; + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; + sha256 = "13vqs4k16a6bzc5i4zpnakh31nkdqp7m9cv7p16r1sq5smv1331i"; } else throw "Google Talk does not support your platform."; - buildInputs = [ rpm cpio ]; - - unpackPhase = - '' - rpm2cpio $src | cpio -i --make-directories -v - ''; + unpackPhase = '' + ar p "$src" data.tar.gz | tar xz + ''; installPhase = '' From 6be27d8c4e4602ae24ff96c2528735442f1c9474 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Aug 2012 08:59:38 +0400 Subject: [PATCH 0515/1120] Vacuum-IM: update to 1.2.0 --- .../networking/instant-messengers/vacuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index bddedce7183d..63f18ee7dc4c 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -12,11 +12,11 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="1.1.2"; + version="1.2.0"; baseName="vacuum-im"; name="${baseName}-${version}"; url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz"; - hash="451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d"; + hash="55a2c27aaaf79c7a4de127c22d3845ede35970283d35ee57fd5ceca581b085fc"; }; in rec { From 938d86b16bc4e45fa999ecaf8bd5ce9fc02b7119 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Aug 2012 11:05:43 +0400 Subject: [PATCH 0516/1120] Veracity: update to version 2.0 Still no permission support or commit signing, though. --- .../version-management/veracity/default.nix | 2 +- .../version-management/veracity/src-for-default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index 91650deb077d..6bf452c18210 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -63,7 +63,7 @@ rec { export SGNEEDS_DIR="$out"/sgneeds/ export VVTHIRDPARTY="$out"/sgneeds/ - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I"$out/sgneeds/include" -Wno-error" '') ["minInit" "defEnsureDir"]; prepareMakefiles = a.fullDepEntry '' diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix index b074c3ec5079..395dda240b8b 100644 --- a/pkgs/applications/version-management/veracity/src-for-default.nix +++ b/pkgs/applications/version-management/veracity/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.5.0.10647"; - name="veracity-1.5.0.10647"; - hash="1b10npyxxg9592wigfpv66h17bzbsg2hqcfm7imyn941a34qrkd3"; - url="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-${version}.tar.gz"; - advertisedUrl="http://download.sourcegear.com/Veracity/nightly/1.5.0.10647/veracity-source-1.5.0.10647.tar.gz"; + version="2.0.0.10822"; + name="veracity-2.0.0.10822"; + hash="0zgvrsjxfd1p9pflx1kxggmk953jhjk02h1hili9h1vdasvn2188"; + url="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-${version}.tar.gz"; + advertisedUrl="http://download.sourcegear.com/Veracity/release/2.0.0.10822/veracity-source-2.0.0.10822.tar.gz"; } From 2a2b52201e2e10c60555c5ed7976dad1a1e7f1d6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Aug 2012 12:55:30 +0400 Subject: [PATCH 0517/1120] Wine: update to 1.5.10 --- pkgs/misc/emulators/wine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index a0b9f9eccb01..b35660daf5e2 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,11 +7,11 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - name = "wine-1.5.9"; + name = "wine-1.5.10"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1lwwi53fccl2ckaq5vjj23yvhrajsr6rk2gc3yj13v4g1mymxhkv"; + sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk"; }; gecko = fetchurl { From 801dee4a363c0f2d9b80c010154fb69798c9905e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 9 Aug 2012 13:01:04 +0400 Subject: [PATCH 0518/1120] SBCL: update to 1.0.58 --- pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index 467ed05a6a44..d56520d29021 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.57"; - name="sbcl-1.0.57"; - hash="1vvifyq0lapx6p6wz6jknsgch3lbyr7m785844wdgkdx2hh8ch51"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.57/sbcl-1.0.57-source.tar.bz2"; + version="1.0.58"; + name="sbcl-1.0.58"; + hash="0ifr96hy5ax5c5iv7igwgkwcqb3pwrc4ism957pkfb5yy39p4yc1"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2"; } From b454e2e43efca09286fcd69a677874d02e0db40b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 11:12:45 +0200 Subject: [PATCH 0519/1120] haskell-unix-time: add version 0.1.0 --- .../libraries/haskell/unix-time/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/unix-time/default.nix diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix new file mode 100644 index 000000000000..f9313532b29e --- /dev/null +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "unix-time"; + version = "0.1.0"; + sha256 = "063mssiq57g4bsalp653fa4yj9wmaynvg0x7vk67gds2l2zpd2gy"; + patchPhase = '' + sed -i Setup.hs -e 's|main = defaultMain|main = defaultMainWithHooks autoconfUserHooks|' + ''; + meta = { + description = "Unix time parser/formatter and utilities"; + 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 97c209862895..721bca5df2dc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1516,6 +1516,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; + unixTime = callPackage ../development/libraries/haskell/unix-time {}; + unlambda = callPackage ../development/libraries/haskell/unlambda {}; unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; From 7aa98d2f5e0f352755f3545bcf922a2fcbcfa774 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 11:36:45 +0200 Subject: [PATCH 0520/1120] haskell-monad-logger: add version 0.2.0 --- .../libraries/haskell/monad-logger/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monad-logger/default.nix diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix new file mode 100644 index 000000000000..66f10e16e662 --- /dev/null +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -0,0 +1,14 @@ +{ cabal, fastLogger, resourcet, text, transformers }: + +cabal.mkDerivation (self: { + pname = "monad-logger"; + version = "0.2.0"; + sha256 = "0rsp24lx9gcvayj5d6afq26qrggm9qrjqjpdm7088xbl5k0c71fz"; + buildDepends = [ fastLogger resourcet text transformers ]; + meta = { + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + 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 721bca5df2dc..8ad566503684 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1056,6 +1056,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; + monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; + monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {}; monadPar = self.monadPar_0_3; From 0979c3df69e507c724f2b20ba72f622641c356c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 11:50:37 +0200 Subject: [PATCH 0521/1120] haskell-snap: patch to allow building with latest version of 'clientsession' --- pkgs/development/libraries/haskell/snap/snap.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 505c9bcb0cc3..4121a657357f 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,9 @@ cabal.mkDerivation (self: { snapServer stm syb text time transformers unorderedContainers utf8String vector vectorAlgorithms xmlhtml ]; + patchPhase = '' + sed -i snap.cabal -e 's|clientsession.*,|clientsession,|' + ''; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; From e0c204a940b9c0ee77baa883f52041eca9904814 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 11:54:22 +0200 Subject: [PATCH 0522/1120] haskell-hakyll: patch to allow building with latest version of 'hamlet' --- pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 8dfeb9413d38..8908597d488b 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup text time ]; + patchPhase = '' + sed -i hakyll.cabal -e 's|hamlet.*,|hamlet,|' + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 63a87e38c608e105acebdb02d9d1fbe0574b69da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:49 +0200 Subject: [PATCH 0523/1120] haskell-HStringTemplate: update to version 0.6.9 --- .../development/libraries/haskell/HStringTemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0048a9c470de..6754c15f3f49 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.8"; - sha256 = "1fybvb3v2b786n1hfzcvyanj3yfm5j8z4fm48vaskcggawh6rlkr"; + version = "0.6.9"; + sha256 = "0xa665q5gya51vjkg1i6f6qk67jx28xcbxs5v1d9yr1f8djh5d9v"; buildDepends = [ deepseq filepath mtl parsec syb sybWithClass text time utf8String ]; From f061cfe2f32a2a60a7c23a9514ee6b66287657b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:49 +0200 Subject: [PATCH 0524/1120] haskell-attoparsec-conduit: update to version 0.5.0 --- .../libraries/haskell/attoparsec-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index d59ebcaf2677..db4ebc6799d0 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.4.0.1"; - sha256 = "1r01xaaw439qpbfnanv2yfw9fz6id8cy17yqdm6x6vk35hmv59kc"; + version = "0.5.0"; + sha256 = "17l98kbv2pxcchacy7r4ja0czdklc7r4j8vzv3pi0pjb2s9ih6sq"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; - description = "Turn attoparsec parsers into sinks"; + description = "Consume attoparsec parsers via conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From caa14bb60b2cbdcd779549773939efe1fb7de355 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:49 +0200 Subject: [PATCH 0525/1120] haskell-authenticate: update to version 1.3.0.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 679e9d39e025..9620fb9ecc59 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.2.1.1"; - sha256 = "0kfzsi8za87lgr52b9n6m9fby95d4hm21z7dbaqjv5whr90nwy54"; + version = "1.3.0.1"; + sha256 = "12s1ri2k0hmaws1rnr4s8ck1wa14lhcih0pzi89hjh7jh8si3dl3"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From ae1cb6006cdb67831d90ed70e3676f0f7924d2e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:49 +0200 Subject: [PATCH 0526/1120] haskell-blaze-builder-conduit: update to version 0.5.0 --- .../libraries/haskell/blaze-builder-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 127ac09edf54..db3e1e8a71fb 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.4.0.2"; - sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih"; + version = "0.5.0"; + sha256 = "1saviq46670khz3pcw2ldvbhhgqs522lvbpm62mxjfvrynjw1gwg"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 19a790ddb82dc4f587ae4a5b27fa3865b55f31f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0527/1120] haskell-clientsession: update to version 0.8.0 --- pkgs/development/libraries/haskell/clientsession/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 08e81eaa98fd..da933207e23e 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.7.5"; - sha256 = "1q2zlq06s0d476ywvb1fkxw34aagcaiqw7jrrmr3lj89q3ylhivr"; + version = "0.8.0"; + sha256 = "1ypd5ki4lvwriw922p65hmj41sargawah1gnwi0q08vc7iagq64k"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged From 106e21f216da91e7469800cef68d24bc18185d70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0528/1120] haskell-conduit: update to version 0.5.2.3 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 9c2b377aa8a3..6ed4ae90221a 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.4.2"; - sha256 = "1v8s80g8gyxb139dzqbbh4qv6ax08g5smrvx2zc5sd2773wwqwz0"; + version = "0.5.2.3"; + sha256 = "1snyh9zxdmvjb1ilaz6c2z5220r7ygshmcq013nch44b6w3r3cp9"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void From 82ad60c861e1a11405f1fd1397f09b5dbbc5ac70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0529/1120] haskell-crypto-conduit: update to version 0.4.0 --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 747cbbf2864d..e76d59678368 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.3.2"; - sha256 = "09f6l60wcblp15hx3hppskjsyah9bh6jwqqr4dvl6j03011gx4id"; + version = "0.4.0"; + sha256 = "15x7v6vmmd90mrb60wllvdai8fk8cvm5bkxzzqyjikshldvlhmas"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; From 626f0fa4c74ee904935cad5a5ee45fbff3643335 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0530/1120] haskell-data-default: update to version 0.5.0 --- pkgs/development/libraries/haskell/data-default/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 41728d393f83..893f2121f0ab 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-default"; - version = "0.4.0"; - sha256 = "1pil8dxbk0zl2zw1xj9h2bpwpdriwfd7aj48kh0xpw9yazg3m802"; + version = "0.5.0"; + sha256 = "1wv8wjd9j40s7h19aph5pqph7rby5ma1nlagqywn9q0634iq9n2a"; buildDepends = [ dlist ]; meta = { description = "A class for types with a default value"; From 33cd3511ace308b305d3e92cd43127a22ce1cfa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0531/1120] haskell-fast-logger: update to version 0.2.1 --- .../development/libraries/haskell/fast-logger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 562489977236..6491515624a0 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, filepath }: +{ cabal, blazeBuilder, filepath, text, unixTime }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.0.2"; - sha256 = "1pwxhgcy4lmc63dnr9fihkmiclf60hrnsv8wzbsdg0jcj4qi0zr7"; - buildDepends = [ blazeBuilder filepath ]; + version = "0.2.1"; + sha256 = "12avan85dkwipp8hqsya8yslirykz2yvqmns3wjhwl9j30idj7r3"; + buildDepends = [ blazeBuilder filepath text unixTime ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; From b477528c8019caf5541f7e5b3c03ddc30e601129 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0532/1120] haskell-hamlet: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index addc495d867d..98123e6d5510 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.0.1.4"; - sha256 = "0rvsp54wrhaz5pnn136w1xlny9dkwv48ihyhq02yg5gg510v08v7"; + version = "1.1.0.1"; + sha256 = "14qlpdfnj90ilgcgll96rrpc4cjc218q7p7kc6y391rkf393453p"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 7e40c4950c29c3c2d06d4ec87d6daebd8024a254 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0533/1120] haskell-happstack-server: update to version 7.0.4 --- .../libraries/haskell/happstack/happstack-server.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 39f93102da00..d171795d266d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,10 +6,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.3"; - sha256 = "06r5h1jhb4h9hra7radhr3rq404283nwv4mhppfxsh4adk5ng0qy"; - isLibrary = true; - isExecutable = true; + version = "7.0.4"; + sha256 = "168201z5slm6mrkckpdpshgaiz29k9j1j97vmbrybprj0zhcrl7r"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From 7294f7e31a0804eed60696b934fdc21096b37772 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:50 +0200 Subject: [PATCH 0534/1120] haskell-hoogle: update to version 4.2.12 --- 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 9db10b33b1d7..db5dc38e38f8 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.11"; - sha256 = "0m708qlj3q8s9vywg51gj7bwwasz5nxqxqhqh8f0k96iawqd9gid"; + version = "4.2.12"; + sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy"; isLibrary = true; isExecutable = true; buildDepends = [ From 58aac6b0b842d6b2414b54dc0ea3c6f48cdc3f51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0535/1120] haskell-http-conduit: update to version 1.5.0.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 224e5ff6e967..6d1c7a28a222 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1.10"; - sha256 = "0a2014bzh4vvm3qx5yarxgirzlngzy2xrwpi3bvnz1h3q0hggq01"; + version = "1.5.0.3"; + sha256 = "1l00wyisb5jkq1c2ikzq0iwhjx6s66bz5s8gricfbrr15bdx1iay"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From 0d16a90c9656c19b4355d333af248bda803eec67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0536/1120] haskell-http-types: update to version 0.7.1 --- 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 b3ae70bbb368..2dcd97e0aef0 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.6.11"; - sha256 = "1waxhicqwp0nmvmpmfadpq9gdldbcx9wh6jz717ghi6y9l485vhf"; + version = "0.7.1"; + sha256 = "1vfaffraiqdsjbw4b0xwk8h8d4pl94mbxlwyqk8ry786v9aafyqx"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From 7e50fc4bc5508e4face3aebf46fe9be3c93a00ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0537/1120] haskell-network-conduit: update to version 0.5.0 --- .../development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 2c1fc014ade3..f05d191ed176 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.4.0.1"; - sha256 = "0xmfhar4knyn01xyigrp4lymb1vcsahd9v12i6rrqzi10mdcz6bl"; + version = "0.5.0"; + sha256 = "0q7smsrv3gp5kvzqfgw2mw9w70gjr5pkx2bmk58dvbnz6al85abn"; buildDepends = [ conduit liftedBase monadControl network transformers ]; From 155895087cf107dfe637a2446ff3a37ff9108836 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0538/1120] haskell-persistent-postgresql: update to version 1.0.0 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index c1022e137491..9b545ad15242 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "0.9.1"; - sha256 = "0kzw4lq4i6lj149aws4ca4z43jmwvcbjr5gf5lk0pwcmzp6chr32"; + version = "1.0.0"; + sha256 = "149vv6wd0a85gphwrqcyd66ivdzyy7yc37c99ngq7377fdnszzhn"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers From 33906970d7ba37269971d70d0828bac360508d56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0539/1120] haskell-persistent-sqlite: update to version 1.0.0 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 1482eec87e4e..5b3ecd5ebc41 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "0.9.0.2"; - sha256 = "19wmz13k3qbpam2siykczgacgaj48yw4p7iz3y6v8a2z8wha73zb"; + version = "1.0.0"; + sha256 = "0ak9x6w9566mjc0ggsqxr69x4w5w7igdxkq6wwm6ysy5cvs8fwc8"; buildDepends = [ aeson conduit monadControl persistent text transformers ]; From 3bc886d04b2b28e319252f2deca720bc4e67bc48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0540/1120] haskell-persistent-template: update to version 1.0.0 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index a4bbb10a5ddb..13c40c6781f9 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "0.9.0.2"; - sha256 = "1x3xn5dxv41hbadb0riss046lcr3k0h4rg6cvk60x8zxblrswabw"; + version = "1.0.0"; + sha256 = "14hg2f0v14m34qvj9m75nn3h4c33bh3gg1xixn0q318hwj9vpfcn"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 7dbc731dcaac043f72300711262bd4e9e857962d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:51 +0200 Subject: [PATCH 0541/1120] haskell-persistent: update to version 1.0.0 --- .../libraries/haskell/persistent/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 27b7db94fd24..6820e92f7eb5 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,17 +1,18 @@ { cabal, aeson, attoparsec, base64Bytestring, blazeHtml -, blazeMarkup, conduit, liftedBase, monadControl, pathPieces -, poolConduit, resourcet, sqlite, text, time, transformers -, transformersBase, unorderedContainers, vector +, blazeMarkup, conduit, liftedBase, monadControl, monadLogger +, pathPieces, poolConduit, resourcet, sqlite, text, time +, transformers, transformersBase, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "persistent"; - version = "0.9.0.4"; - sha256 = "1igml2hmc8ga9871dfq4mxqvy639vvlgl3cs48j3b27ci3qwd9jr"; + version = "1.0.0"; + sha256 = "1rrvq3girsjxfvdvvr9zxgc3252hrwcy84zj2mj0a5w057jahhhg"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit - liftedBase monadControl pathPieces poolConduit resourcet text time - transformers transformersBase unorderedContainers vector + liftedBase monadControl monadLogger pathPieces poolConduit + resourcet text time transformers transformersBase + unorderedContainers vector ]; extraLibraries = [ sqlite ]; meta = { From 6cf377b963b368b1d3711b8e114b54252f282a5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:52 +0200 Subject: [PATCH 0542/1120] haskell-postgresql-simple: update to version 0.2.2.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index a142abdbceb8..8fc10e8b7e69 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.1.4.3"; - sha256 = "0q0mkkd22hji7ns25i86shy1504d0d4mc3fqljpfffm6m36855kc"; + version = "0.2.2.0"; + sha256 = "1saxdvnhjxa9faxzi9sylg2jxpdhzf6p461mas7xvl02m24dfwpc"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 8387a3e51b2a6b8055e01a2d314039a670148041 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:52 +0200 Subject: [PATCH 0543/1120] haskell-terminfo: update to version 0.3.2.5 --- pkgs/development/libraries/haskell/terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/terminfo/default.nix b/pkgs/development/libraries/haskell/terminfo/default.nix index 0072dde1e6ef..24221912025a 100644 --- a/pkgs/development/libraries/haskell/terminfo/default.nix +++ b/pkgs/development/libraries/haskell/terminfo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "terminfo"; - version = "0.3.2.4"; - sha256 = "06kwyp8maf9ylhz8rypy086dfdfs1k1h1b8xyyfvz1bzxsw63k7y"; + version = "0.3.2.5"; + sha256 = "1hadb1gv28c43xq78scalb4zzvbs6im2s0hq7ycrbsdgm6iryhbg"; extraLibraries = [ ncurses ]; meta = { homepage = "http://code.haskell.org/terminfo"; From 34af15ebe0107e4b4ae5a8b5a381bae994685681 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:52 +0200 Subject: [PATCH 0544/1120] haskell-vacuum: update to version 2.0.0.0 --- pkgs/development/libraries/haskell/vacuum/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 764a55402e7e..11f74432be63 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,13 +2,13 @@ cabal.mkDerivation (self: { pname = "vacuum"; - version = "1.0.0.2"; - sha256 = "1amlzd89952fvw1sbajf9kv3f2s2i6xbqs1zjxw442achg465y7i"; + version = "2.0.0.0"; + sha256 = "0a810ql4lp1pyvys9a5aw28gxn7h2p4hkc0by4pmpw5d7kdhn9y3"; extraLibraries = [ ghcPaths ]; meta = { - homepage = "http://web.archive.org/web/20100410115820/http://moonpatio.com/vacuum/"; - description = "Extract graph representations of ghc heap values"; - license = "LGPL"; + homepage = "http://thoughtpolice.github.com/vacuum"; + description = "Graph representation of the GHC heap"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; From 34e06423597063bfb16b9eafcb543eda149dc7a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0545/1120] haskell-wai-app-static: update to version 1.3.0 --- .../libraries/haskell/wai-app-static/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 0653352d87e7..ea4ddd7ae827 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,15 +1,17 @@ -{ cabal, base64Bytestring, blazeBuilder, blazeHtml, cryptohash -, fileEmbed, httpDate, httpTypes, text, time, transformers +{ cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup +, cereal, cryptoConduit, cryptohash, fileEmbed, httpDate, httpTypes +, mimeTypes, systemFileio, systemFilepath, text, time, transformers , unixCompat, wai }: cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.2.0.4"; - sha256 = "06j9k93kzzzqznp61kwclvnnfas77jry4x93r5jn5n22198szcyi"; + version = "1.3.0"; + sha256 = "1xsjq0xip9anbd4cpami8w6d2p0pdp375hzw1jx6pvajjmkjksqn"; buildDepends = [ - base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed - httpDate httpTypes text time transformers unixCompat wai + base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal + cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes + systemFileio systemFilepath text time transformers unixCompat wai ]; meta = { homepage = "http://www.yesodweb.com/book/wai"; From 54f1ff4cffd17c50ca8636f3758931d176d89798 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0546/1120] haskell-wai-extra: update to version 1.3.0 --- .../libraries/haskell/wai-extra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 3c808dd430b7..c7732cc6e2bd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,17 +1,17 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit , caseInsensitive, conduit, dataDefault, fastLogger, httpTypes -, network, resourcet, stringsearch, text, time, transformers, wai -, zlibConduit +, network, resourcet, stringsearch, text, time, transformers, void +, wai, waiLogger, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.2.0.5"; - sha256 = "0m9zdn6cdh2j7bwsf17225rdn7jwj7iy97khbd9g7p9rv1lpdain"; + version = "1.3.0"; + sha256 = "1j76iaymnsyrin014slkv06p3zdk8lfff94abwvvanxl7gs9b286"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes network resourcet - stringsearch text time transformers wai zlibConduit + stringsearch text time transformers void wai waiLogger zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 89a0de93f5479fb7349434be950ad1a7390822fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0547/1120] haskell-wai-logger: update to version 0.2.0 --- pkgs/development/libraries/haskell/wai-logger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index d943e2495e6a..49e643b4e20c 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ { cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger -, httpTypes, network, time, wai +, httpTypes, network, wai }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.1.4"; - sha256 = "1rvcqq4jlkcjavy8a3vf61jclwpnjmj6cp3whrzwvay9b1qfsck3"; + version = "0.2.0"; + sha256 = "1p89k71y0y5kpvy9iniqfyz3wmaw1q75s2324df1m1w1hcc0lgb6"; buildDepends = [ blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - time wai + wai ]; meta = { description = "A logging system for WAI"; From d58036f54249fceb79cb117738dd3856e7be9592 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0548/1120] haskell-wai: update to version 1.3.0 --- 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 2e0f723aba0d..a67da394a654 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.2.0.3"; - sha256 = "0pl6zc29z58vpvsn37siiyr89mxc4khsnmzv2408i5vhlv2ks01p"; + version = "1.3.0"; + sha256 = "08y0s7b5db5nyvxv0bvraj6ih7054h5n4lkwdlm3nkbm8s9k8hwv"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; From 655c7d61d74c9811c8c735b936bf8976dbb5b43d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0549/1120] haskell-warp: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 0a3791a7f8df..e066196cd4d5 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.2.2"; - sha256 = "0jja9fjjd0f54awbx2p865w1mxj75qxy17skj1sc83i5ck32n6f0"; + version = "1.3.0.1"; + sha256 = "0bgmz2kd2z9agpid0w2whfz1cyrmiaiyap20za1l56d88m0p1z45"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers From 3a6a59920b42cd2220e2d15eaad69dec7838ceb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0550/1120] haskell-xml-conduit: update to version 1.0.3 --- .../libraries/haskell/xml-conduit/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 9e2d0c59a522..e321d2b08d94 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,16 +1,17 @@ { cabal, attoparsec, attoparsecConduit, blazeBuilder -, blazeBuilderConduit, conduit, dataDefault, failure, monadControl -, resourcet, systemFilepath, text, transformers, xmlTypes +, blazeBuilderConduit, blazeHtml, blazeMarkup, conduit, dataDefault +, failure, monadControl, resourcet, systemFilepath, text +, transformers, xmlTypes }: cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.7.0.3"; - sha256 = "143cd8mjxckknlza327cmn63prw89ypnw32bk762s72vbqm1xvvv"; + version = "1.0.3"; + sha256 = "1pci21zwdclv018fk5hjfmif2wg6zfm9b4g1w3srgm6wdh5013r7"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit - conduit dataDefault failure monadControl resourcet systemFilepath - text transformers xmlTypes + blazeHtml blazeMarkup conduit dataDefault failure monadControl + resourcet systemFilepath text transformers xmlTypes ]; meta = { homepage = "http://github.com/snoyberg/xml"; From d2be882ab1efe0ff01a8d78c74b03f72bc92083b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0551/1120] haskell-yaml: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e3228d039c11..c6a456bf9a4c 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.7.0.3"; - sha256 = "1w9xsg48np3wi859jdg5vm3dxihbdrbvd1i364lsfblbmry964mr"; + version = "0.8.0.1"; + sha256 = "0frps30spsxkr479h4hpzsc9gkaazgmdjp5p4pmzy9mf174qacs8"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From f40657e94b51c3999a61e1272ce2072102fd1d1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:53 +0200 Subject: [PATCH 0552/1120] haskell-yesod-auth: update to version 1.1.0 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 3b92570989e8..a540c56e54c7 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.0.2.1"; - sha256 = "0fkk9vyb8z9hr77d771f74ka6s95fbzk5zw359cx8m2d5rc9fqvr"; + version = "1.1.0"; + sha256 = "1bvvd1fl2id7zw51g5mrm047zm2jy5hr5l1xxas6zin2dv0ix5p1"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 From 19dca37062a57c94b9fd9353451d34083dda21fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0553/1120] haskell-yesod-core: update to version 1.1.0 --- .../libraries/haskell/yesod-core/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 17d3eb4427e0..558c7fe6ea50 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,21 +1,22 @@ { cabal, aeson, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cereal, clientsession, conduit, cookie, failure -, fastLogger, hamlet, httpTypes, liftedBase, monadControl, parsec -, pathPieces, random, resourcet, shakespeare, shakespeareCss -, shakespeareI18n, shakespeareJs, text, time, transformers -, transformersBase, vector, wai, waiExtra, waiLogger, yesodRoutes +, fastLogger, hamlet, httpTypes, liftedBase, monadControl +, monadLogger, parsec, pathPieces, random, resourcet, shakespeare +, shakespeareCss, shakespeareI18n, shakespeareJs, text, time +, transformers, transformersBase, vector, wai, waiExtra +, yesodRoutes }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.0.1.3"; - sha256 = "1rdj622zi12v9d7cxkn8w4q43k8c6gfz8wrpmvya76gqmg6h2gil"; + version = "1.1.0"; + sha256 = "01jxb6skpwckvkgar847limqrcl91l50pr7iza2sfp0a6j5a2hmk"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes - liftedBase monadControl parsec pathPieces random resourcet - shakespeare shakespeareCss shakespeareI18n shakespeareJs text time - transformers transformersBase vector wai waiExtra waiLogger + liftedBase monadControl monadLogger parsec pathPieces random + resourcet shakespeare shakespeareCss shakespeareI18n shakespeareJs + text time transformers transformersBase vector wai waiExtra yesodRoutes ]; meta = { From fcd1e9eee45d4836009df48aaed93af2e40f2112 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0554/1120] haskell-yesod-default: update to version 1.1.0 --- .../libraries/haskell/yesod-default/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index d801d36e9c41..c3dce8ca7d38 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,15 +1,15 @@ -{ cabal, networkConduit, shakespeareCss, shakespeareJs, text -, transformers, unorderedContainers, wai, waiExtra, warp, yaml -, yesodCore +{ cabal, dataDefault, hamlet, networkConduit, shakespeareCss +, shakespeareJs, text, transformers, unorderedContainers, wai +, waiExtra, warp, yaml, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.0.1.1"; - sha256 = "0jv7fxrgh2x93saz0vrba0mzafq3wmq85b3idcsny4d8mgj6ngv0"; + version = "1.1.0"; + sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq"; buildDepends = [ - networkConduit shakespeareCss shakespeareJs text transformers - unorderedContainers wai waiExtra warp yaml yesodCore + dataDefault hamlet networkConduit shakespeareCss shakespeareJs text + transformers unorderedContainers wai waiExtra warp yaml yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From 5cd5c8df14d8d1556c7c879a95e6b27f38c53ac8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0555/1120] haskell-yesod-form: update to version 1.1.0 --- .../libraries/haskell/yesod-form/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 512c0ca1b6d1..172a83d8a95b 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,18 +1,20 @@ -{ cabal, blazeBuilder, blazeHtml, blazeMarkup, dataDefault -, emailValidate, hamlet, network, persistent, shakespeareCss -, shakespeareJs, text, time, transformers, wai, xssSanitize -, yesodCore, yesodPersistent +{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup +, cryptoApi, dataDefault, emailValidate, hamlet, network +, persistent, shakespeareCss, shakespeareJs, text, time +, transformers, wai, xssSanitize, yesodCore, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.0.0.4"; - sha256 = "1wc7nrsf7r9zs24q2amy1zij5sfycs1arnrf8g769c7gihjhdqfd"; + version = "1.1.0"; + sha256 = "1xig1va8qya78g6rlymz2w2ncyp8fj76sinyhjpr1ikw8my5hgw0"; buildDepends = [ - blazeBuilder blazeHtml blazeMarkup dataDefault emailValidate hamlet - network persistent shakespeareCss shakespeareJs text time - transformers wai xssSanitize yesodCore yesodPersistent + attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault + emailValidate hamlet network persistent shakespeareCss + shakespeareJs text time transformers wai xssSanitize yesodCore + yesodPersistent ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; From 959c23183b4ca1745020691de6ef28361bd63cde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0556/1120] haskell-yesod-json: update to version 1.1.0 --- pkgs/development/libraries/haskell/yesod-json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index b91ca879afad..4a2a2346a873 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.0.1.0"; - sha256 = "0baxyy4mddgpfzm4scfizz8pi6y7a135kjwfhss51m6xx36s84zl"; + version = "1.1.0"; + sha256 = "13dbajs51nyrvch13xz05h6jrnhc097s0iykw5z43x05a6xwj20n"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes From 75342a50e491cd72a93759ae62afe7d0c1a48d7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0557/1120] haskell-yesod-persistent: update to version 1.1.0 --- .../libraries/haskell/yesod-persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index c6cf7f22159a..a094f4722336 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-persistent"; - version = "1.0.0.1"; - sha256 = "1v4ip4g9x2a5byl0a9a1raad3aba7hs618vx7fnc5n2ajjji84mx"; + version = "1.1.0"; + sha256 = "0c8cvc2gy9ixa0h79ycnyi86indny2i86g5xcg30a2rvc4mjbaaj"; buildDepends = [ persistent persistentTemplate transformers yesodCore ]; From 55dc4972cb1d0f43ed86d9baa513b03dca9b5b33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0558/1120] haskell-yesod-routes: update to version 1.1.0 --- 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 8b3a685105a7..9a801d62df83 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.0.1.2"; - sha256 = "15ar99ywxrsd6pgqwmql7vg801n53l3jw0s2iynddq9jjl4yqpf7"; + version = "1.1.0"; + sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; From 4d67ae81f5e4a40544572ffe6de9f2ed01b40605 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0559/1120] haskell-yesod-static: update to version 1.1.0 --- .../libraries/haskell/yesod-static/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 72a1fed8db95..d7e9498c968f 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,15 +1,16 @@ { cabal, base64Bytestring, cereal, conduit, cryptoConduit -, cryptohash, fileEmbed, httpTypes, text, transformers, unixCompat -, wai, waiAppStatic, yesodCore +, cryptohash, fileEmbed, httpTypes, systemFilepath, text +, transformers, unixCompat, wai, waiAppStatic, yesodCore }: cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.0.0.3"; - sha256 = "1nl7cf8yw5akldlrkamnkbypwnj7g1pjkx7nkmlc38jbx58izf5d"; + version = "1.1.0"; + sha256 = "07aynfgr5hbm98yimlbw9scph387rkxh4mdij4is1mcv2rdhvhxm"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed - httpTypes text transformers unixCompat wai waiAppStatic yesodCore + httpTypes systemFilepath text transformers unixCompat wai + waiAppStatic yesodCore ]; meta = { homepage = "http://www.yesodweb.com/"; From edd12bf490969c2df6d7e87dab2ce65c0bd57f88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0560/1120] haskell-yesod: update to version 1.1.0 --- .../libraries/haskell/yesod/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 256c398cfe4c..9a9e9d9c9e88 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,22 +1,23 @@ { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, Cabal -, fastLogger, filepath, hamlet, httpTypes, monadControl, parsec -, shakespeareCss, shakespeareJs, shakespeareText, text, time -, transformers, unixCompat, wai, waiExtra, waiLogger, warp -, yesodAuth, yesodCore, yesodForm, yesodJson, yesodPersistent +, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss +, shakespeareJs, shakespeareText, systemFileio, systemFilepath, tar +, text, time, transformers, unixCompat, unorderedContainers, wai +, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm, yesodJson +, yesodPersistent, zlib }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.0.1.6"; - sha256 = "0w5k5bcv50fjpyja6ydknk78dk50swx6b0myhizj8rcf851xga43"; + version = "1.1.0"; + sha256 = "01jwp9i77rmk4iwjqri9jafm809nzlb5bvgyz5my8dnpcfvnf2sz"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder blazeHtml blazeMarkup Cabal fastLogger - filepath hamlet httpTypes monadControl parsec shakespeareCss - shakespeareJs shakespeareText text time transformers unixCompat wai - waiExtra waiLogger warp yesodAuth yesodCore yesodForm yesodJson - yesodPersistent + attoparsec blazeBuilder blazeHtml blazeMarkup Cabal filepath hamlet + httpTypes monadControl parsec shakespeareCss shakespeareJs + shakespeareText systemFileio systemFilepath tar text time + transformers unixCompat unorderedContainers wai waiExtra warp yaml + yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From 63bcec08b39a8d0353e84eeabe2812e1e1dd70d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 9 Aug 2012 12:10:54 +0200 Subject: [PATCH 0561/1120] haskell-zlib-conduit: update to version 0.5.0 --- .../libraries/haskell/zlib-conduit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index e8b635643220..0f6a3656126a 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, transformers, zlibBindings }: +{ cabal, conduit, transformers, void, zlibBindings }: cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.4.0.2"; - sha256 = "1pwgyawc308rm1xcvzfz96ar11mngx79any7lragffj6f132qlm7"; - buildDepends = [ conduit transformers zlibBindings ]; + version = "0.5.0"; + sha256 = "0mba63wx11vb9xir4fbp031ay71xv8b3rnj8gnihsxf3yqq09b99"; + buildDepends = [ conduit transformers void zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits"; From cff9e132e73ae57011e9937704d4bbb73496a251 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 9 Aug 2012 07:12:20 -0400 Subject: [PATCH 0562/1120] binary-tarball.nix: Forgot to source functions.sh --- pkgs/build-support/release/binary-tarball.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 93331707ceef..41fab231ee34 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation ( postHook = '' mkdir -p $out/nix-support echo "$system" > $out/nix-support/system + . ${./functions.sh} origSrc=$src src=$(findTarballs $src | head -1) From 711d1fc6f0d17cbcdd73b0be654cbcb45ac6a201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Aug 2012 18:32:53 +0200 Subject: [PATCH 0563/1120] nettle: allow GMP to be found on OpenSolaris --- pkgs/development/libraries/nettle/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 22c2fb14acab..6c7383435a8a 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gmp, gnum4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "nettle-2.4"; src = fetchurl { @@ -51,3 +51,13 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isSunOS { + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + configureFlags = [ "--with-include-path=${gmp}/include" ]; +}) From 55cf14217563373dec757ab0197c437c244fbad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 9 Aug 2012 18:39:30 +0200 Subject: [PATCH 0564/1120] guile: allow GMP to be found on OpenSolaris --- pkgs/development/interpreters/guile/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 0e1e21ed9621..d217099f3b78 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -81,6 +81,17 @@ // +(stdenv.lib.optionalAttrs stdenv.isSunOS { + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + # TODO: Move me above. + configureFlags = [ "--with-libgmp-prefix=${gmp}" ]; +}) + +// + (if stdenv.isFreeBSD then { # XXX: Thread support is currently broken on FreeBSD (namely the From 77b1a7ff42854183ef4a40ec040307b54967f381 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 9 Aug 2012 18:58:51 +0200 Subject: [PATCH 0565/1120] boomerang: New package from the fork. This adds the boomerang decompiler, which has been forked on github because of some years of inactivity. --- pkgs/development/tools/boomerang/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/boomerang/default.nix diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix new file mode 100644 index 000000000000..3cfa5e8eb5bc --- /dev/null +++ b/pkgs/development/tools/boomerang/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, boehmgc, expat, cppunit }: + +stdenv.mkDerivation { + name = "boomerang-1.0pre"; + + buildInputs = [ cmake boehmgc expat cppunit ]; + + installPhase = '' + for loaderfile in loader/*.so + do + install -vD "$loaderfile" "$out/lib/$(basename "$loaderfile")" + done + + install -vD boomerang "$out/bin/boomerang" + ''; + + src = fetchgit { + url = "git://github.com/andrew-aladev/boomerang.git"; + rev = "c0ad5c1f64091725b4ca7f63c57edd3d3bc74a57"; + sha256 = "76d8512db672bad1322943172046e4b450c5fa509e4141457b3dc60493852fcc"; + }; + + meta = { + homepage = http://boomerang.sourceforge.net/; + license = stdenv.lib.licenses.bsd3; + description = "A general, open source, retargetable decompiler"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79bd75833174..5cbc0f0fbeaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -437,6 +437,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + boomerang = callPackage ../development/tools/boomerang { }; + bootchart = callPackage ../tools/system/bootchart { }; bsod = callPackage ../misc/emulators/bsod { }; From 389a76c0856d20da6ac062bb9cb90dd2e263c367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 9 Aug 2012 23:39:57 +0200 Subject: [PATCH 0566/1120] minecraft: update to 1.3.1 --- pkgs/games/minecraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 171e73896c65..3281f07335b0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -2,11 +2,11 @@ , mesa, openal}: stdenv.mkDerivation { - name = "minecraft-1.2.5"; + name = "minecraft-1.3.1"; src = fetchurl { url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar"; - sha256 = "0yp3wgy93wm746dkv6kbljhmzdqbcg4qhwkvnaaq4ml84mvvjp38"; + sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj"; }; phases = "installPhase"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "A sandbox-building game"; homepage = http://www.minecraft.net; - maintainers = [ "Carles Pagès " stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.page stdenv.lib.maintainers.shlevy ]; license = "unfree-redistributable"; }; } From cbb2c3abf25ec4145083ef22e1bd1560607a7d71 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 08:20:56 +0200 Subject: [PATCH 0567/1120] linux-3.5: upgrade to 3.5.1 --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 364d0545583a..a34badc8a041 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -240,8 +240,7 @@ in import ./generic.nix ( rec { - version = "3.5"; - modDirVersion = "3.5.0"; + version = "3.5.1"; testing = false; preConfigure = '' @@ -250,7 +249,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0hmkzlk1y93q0r19phm8mhkq60lr92l9jk4dk06r9z8c7wwcx1dr"; + sha256 = "08rmhcgcxhwxv3cnnbhc86mvjmxkdk3aay4db6jbn90jlzf7kclz"; }; config = configWithPlatform stdenv.platform; From d6befca29645a3a253e51ce671417e5efe7abc43 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 08:21:56 +0200 Subject: [PATCH 0568/1120] emacs/js2-mode: upgrade --- pkgs/applications/editors/emacs-modes/js2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 87661d75ff51..cbd883304348 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20120601"; + name = "js2-mode-0-20120712"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "81bcbf7df7077db27facf0470cf9e31c18b8333e"; - sha256 = "1bec62816ec9d5f5882832902020573d95d038fff25b17bf1975b84a3ab535c3"; + rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b"; + sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047"; }; buildInputs = [ emacs ]; From 260650e7e29c959ea38458ac38519bbd043f45bf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 08:22:27 +0200 Subject: [PATCH 0569/1120] emacs: add "coffee-mode" --- .../editors/emacs-modes/coffee/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/coffee/default.nix diff --git a/pkgs/applications/editors/emacs-modes/coffee/default.nix b/pkgs/applications/editors/emacs-modes/coffee/default.nix new file mode 100644 index 000000000000..c40b3d4cd650 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/coffee/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation rec { + name = "coffee-mode-0.4.1"; + + src = fetchgit { + url = "https://github.com/defunkt/coffee-mode.git"; + rev = "c45c5f7a529363bc7aa57db0f3df26389fd233d8"; + sha256 = "36a7792b5ffbcc5a580e8d5b2425494c60a8015cfde0e3f8a946a685da231ce2"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -f batch-byte-compile coffee-mode.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install coffee-mode.el coffee-mode.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "An Emacs major mode for CoffeeScript, unfancy JavaScript."; + homepage = https://github.com/defunkt/coffee-mode; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79bd75833174..c7a2a98bfbb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6662,6 +6662,8 @@ let calfw = callPackage ../applications/editors/emacs-modes/calfw { }; + coffee = callPackage ../applications/editors/emacs-modes/coffee { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; ecb = callPackage ../applications/editors/emacs-modes/ecb { }; From c0a455b370d7134ad4d3862eef9a578a011642af Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 08:22:43 +0200 Subject: [PATCH 0570/1120] emacs: add "auto-complete" mode --- .../emacs-modes/auto-complete/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/auto-complete/default.nix diff --git a/pkgs/applications/editors/emacs-modes/auto-complete/default.nix b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix new file mode 100644 index 000000000000..75f484d295b5 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/auto-complete/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "auto-complete-1.3.1"; + + src = fetchurl { + url = "http://cx4a.org/pub/auto-complete/${name}.tar.bz2"; + sha256 = "124qxfp0pcphwlmrasbfrci48brxnrzc38h4wcf2sn20x1mvcrlj"; + }; + + buildInputs = [ emacs ]; + + preInstall = '' + install -d $out/share/emacs/site-lisp + ''; + + installFlags = "DIR=$(out)/share/emacs/site-lisp"; + + postInstall = '' + ln -s javascript-mode $out/share/emacs/site-lisp/ac-dict/js2-mode + ''; + + meta = { + description = "Auto-complete extension for Emacs"; + homepage = http://cx4a.org/software/auto-complete/; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7a2a98bfbb0..9f8e4a37a96d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6656,6 +6656,8 @@ let emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; + autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; + bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; cedet = callPackage ../applications/editors/emacs-modes/cedet { }; From 7fd5e6d668a0ae3ff8d97fe7e1bde001b2a87d73 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 08:23:06 +0200 Subject: [PATCH 0571/1120] emacs: upgrade "haskell-mode" to more recent git version --- pkgs/applications/editors/emacs-modes/haskell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index f58b66a506ee..c8de8726284b 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "haskell-mode-2.8.0.29-g7682f99"; + name = "haskell-mode-2.8.0.29-gae3e4499d2"; src = fetchgit { url = "http://github.com/haskell/haskell-mode.git"; - rev = "7682f991acd63d9400597d5f4980f62d7b1c4c0b"; - sha256 = "f4508a11fa65ece237c9ee9f623bc4e9ad3d3d58ab2fcacc8ddb080c29aac717"; + rev = "ae3e4499d27a1468bdf88ffe0ce15cd7e4bb9f2a"; + sha256 = "29a1725da620c13ff2b3b56906e76dd9f19317eee92bd5750b3aa9a4264effae"; }; buildInputs = [emacs]; From 186601f461d5b4818936af8ba43ca3cef7614968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 9 Aug 2012 17:10:46 +0200 Subject: [PATCH 0572/1120] opencascade: fixing build by downgrading the automake used --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f8e4a37a96d..b576eb3305fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4504,6 +4504,7 @@ let openbabel = callPackage ../development/libraries/openbabel { }; opencascade = callPackage ../development/libraries/opencascade { + automake = automake111x; ftgl = ftgl212; }; From 734bb84f09f8e3dee4bd38dcbe0931a7e2064502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Aug 2012 09:41:43 +0200 Subject: [PATCH 0573/1120] linux-3.5: fix perf build with a patch from the perf mailing list --- pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ pkgs/os-specific/linux/kernel/perf-3.5.patch | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 23 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/perf-3.5.patch diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a8c03d0ffb12..e9cd15bb31ce 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -226,6 +226,11 @@ rec { patch = ./dell-rfkill.patch; }; + perf3_5 = + { name = "perf-3.5"; + patch = ./perf-3.5.patch; + }; + sheevaplug_modules_2_6_35 = { name = "sheevaplug_modules-2.6.35"; patch = ./sheevaplug_modules-2.6.35.patch; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch new file mode 100644 index 000000000000..6d62a1db80e7 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf-3.5.patch @@ -0,0 +1,17 @@ +http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 + +Fix to build perf. + +diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c +index 9f6cebd..d5491f1 100644 +--- a/tools/perf/util/evsel.c ++++ b/tools/perf/util/evsel.c +@@ -15,7 +15,7 @@ + #include "cpumap.h" + #include "thread_map.h" + #include "target.h" +-#include "../../include/linux/perf_event.h" ++#include "../../../include/linux/perf_event.h" + + #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) + #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b576eb3305fa..753fb893e09d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5757,6 +5757,7 @@ let [ kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_5 + kernelPatches.perf3_5 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From 691d069af99be1e7a32c1c9e0564948b22127a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Aug 2012 10:03:53 +0200 Subject: [PATCH 0574/1120] perf: make it take the linux patches Otherwise the previous patch I added does not get used for perf. --- pkgs/os-specific/linux/kernel/perf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 669f61556fc2..01d989e75b10 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -7,7 +7,7 @@ assert withGtk -> gtk != null; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src; + inherit (kernel) src patches; preConfigure = '' cd tools/perf From bcafa07c25aacf7b766f7ec353ec8f5ad8753409 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 11:47:48 +0200 Subject: [PATCH 0575/1120] haskell-lrucache: add version 1.1.1 --- .../libraries/haskell/lrucache/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lrucache/default.nix diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix new file mode 100644 index 000000000000..d92bd8203487 --- /dev/null +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "lrucache"; + version = "1.1.1"; + sha256 = "05y0b2dbbp017hkbr0pz943956dm31g5xhma4bqnh49yd4lyn5l9"; + meta = { + homepage = "http://github.com/chowells79/lrucache"; + description = "a simple, pure LRU cache"; + 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 8ad566503684..7a40423c9986 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1020,6 +1020,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ListLike = callPackage ../development/libraries/haskell/ListLike {}; + lrucache = callPackage ../development/libraries/haskell/lrucache {}; + ltk = callPackage ../development/libraries/haskell/ltk {}; logfloat = callPackage ../development/libraries/haskell/logfloat {}; From 59e78c12e4dd613e780df887af975f28b4f69161 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 11:48:20 +0200 Subject: [PATCH 0576/1120] haskell-hakyll: update to version 3.4.1.0 --- .../libraries/haskell/hakyll/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 8908597d488b..4224bfe1216a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,20 +1,17 @@ { cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash -, filepath, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa -, snapCore, snapServer, tagsoup, text, time +, filepath, hamlet, lrucache, mtl, pandoc, parsec, regexBase +, regexTdfa, snapCore, snapServer, tagsoup, text, time }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.4.0.0"; - sha256 = "1m69kzjbsspf69qc3yq6qhpnk3vd3k5qa7zssazm8717sgrb2z9m"; + version = "3.4.1.0"; + sha256 = "028wq61kvh2nkz8dxbpcnvic1vlqnz1a2l1xrvficmvk25qyqmvy"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet - mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup - text time + lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer + tagsoup text time ]; - patchPhase = '' - sed -i hakyll.cabal -e 's|hamlet.*,|hamlet,|' - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; From 78aa1ccfb2be8afca0af9c993854539870511a6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 11:48:20 +0200 Subject: [PATCH 0577/1120] haskell-postgresql-simple: update to version 0.2.3.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 8fc10e8b7e69..da78cafde6c0 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.2.0"; - sha256 = "1saxdvnhjxa9faxzi9sylg2jxpdhzf6p461mas7xvl02m24dfwpc"; + version = "0.2.3.0"; + sha256 = "0lbvd7mq7xqz1cala4vvw5zj96sbqi0qqnmfj5h0844ci2f25i97"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 94598606789cf1384e557f561a80a4eea6b94f12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 11:48:20 +0200 Subject: [PATCH 0578/1120] haskell-unix-time: update to version 0.1.1 --- pkgs/development/libraries/haskell/unix-time/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index f9313532b29e..308e59ba2547 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,11 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.0"; - sha256 = "063mssiq57g4bsalp653fa4yj9wmaynvg0x7vk67gds2l2zpd2gy"; - patchPhase = '' - sed -i Setup.hs -e 's|main = defaultMain|main = defaultMainWithHooks autoconfUserHooks|' - ''; + version = "0.1.1"; + sha256 = "1b7njfs33vqmprpmbpi8hvy1lc5ryvdiy5526q8s7vkzsi2iky1p"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; From f77a3a15ee4c319a7db662888e41dbde1d7a1a5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 11:56:22 +0200 Subject: [PATCH 0579/1120] netperf: update to version 2.6.0 --- pkgs/applications/networking/netperf/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index 7ef6a86c5eb7..705f1455c458 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,11 +1,19 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "netperf-2.5.0"; + name = "netperf-2.6.0"; src = fetchurl { url = "ftp://ftp.netperf.org/netperf/${name}.tar.bz2"; - sha256 = "1l06bb99b4wfnmq247b8rvp4kn3w6bh1m46ri4d74z22li7br545"; + sha256 = "cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"; + }; + + meta = { + description = "benchmark to measure the performance of many different types of networking"; + homepage = "http://www.netperf.org/netperf/"; + license = "Hewlett-Packard BSD-like license"; + + platforms = stdenv.lib.platforms.linux; + maintainers = []; }; } - From a6e266306f5852a850ce4838dc1634622ad6122b Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 10 Aug 2012 14:59:05 +0200 Subject: [PATCH 0580/1120] boomerang: Fix endless loop in createDirectory(). Fix is on GitHub, so changing the git URL to point to the commit ID of my fix. --- pkgs/development/tools/boomerang/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 3cfa5e8eb5bc..0f9035f9d391 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation { ''; src = fetchgit { - url = "git://github.com/andrew-aladev/boomerang.git"; - rev = "c0ad5c1f64091725b4ca7f63c57edd3d3bc74a57"; - sha256 = "76d8512db672bad1322943172046e4b450c5fa509e4141457b3dc60493852fcc"; + url = "git://github.com/aszlig/boomerang.git"; + rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; + sha256 = "6cfd95a3539ff45c18b17de76407568b0d0c17fde4e45dda54486c7eac113969"; }; meta = { From d10772ec8a4d3f2bd24f663d4c317429c46389a8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 10 Aug 2012 15:02:19 +0200 Subject: [PATCH 0581/1120] boomerang: Fix prefix in dlopen(). We already have the correct library dir in our search path, so we don't need to prepend lib/ again. --- pkgs/development/tools/boomerang/default.nix | 2 ++ pkgs/development/tools/boomerang/dlopen_path.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/tools/boomerang/dlopen_path.patch diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 0f9035f9d391..eadeb51d1b39 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { install -vD boomerang "$out/bin/boomerang" ''; + patches = [ ./dlopen_path.patch ]; + src = fetchgit { url = "git://github.com/aszlig/boomerang.git"; rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; diff --git a/pkgs/development/tools/boomerang/dlopen_path.patch b/pkgs/development/tools/boomerang/dlopen_path.patch new file mode 100644 index 000000000000..1e4bf3c75a30 --- /dev/null +++ b/pkgs/development/tools/boomerang/dlopen_path.patch @@ -0,0 +1,13 @@ +diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp +index 889a4ed..ca86765 100644 +--- a/loader/BinaryFileFactory.cpp ++++ b/loader/BinaryFileFactory.cpp +@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) { + + // Load the specific loader library + #ifndef _WIN32 // Cygwin, Unix/Linux +- libName = std::string("lib/lib") + libName; ++ libName = std::string("lib") + libName; + #ifdef __CYGWIN__ + libName += ".dll"; // Cygwin wants .dll, but is otherwise like Unix + #else From 9b70bc6e34345b868aaad2defa426dc331b505d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Aug 2012 16:30:28 +0200 Subject: [PATCH 0582/1120] guile: allow libunistring and Readline to be found on OpenSolaris --- pkgs/development/interpreters/guile/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index d217099f3b78..93676a9b11a3 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -82,12 +82,19 @@ // (stdenv.lib.optionalAttrs stdenv.isSunOS { - # Make sure the right is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # - # for details. # TODO: Move me above. - configureFlags = [ "--with-libgmp-prefix=${gmp}" ]; + configureFlags = + [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp}" + + # Same for these (?). + "--with-libreadline-prefix=${readline}" + "--with-libunistring-prefix=${libunistring}" + ]; }) // From 13f133f71f349164b74cd518955d02e342504cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Aug 2012 16:38:41 +0200 Subject: [PATCH 0583/1120] libgpg-error: re-run `config.status' with Bash on OpenIndiana --- .../libraries/libgpg-error/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 255057b5134a..f7052b90b42c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "libgpg-error-1.10"; src = fetchurl { @@ -26,3 +26,16 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isSunOS { + # For some reason, /bin/sh on OpenIndiana leads to this at the end of the + # `config.status' run: + # ./config.status[1401]: shift: (null): bad number + # (See .) + # Thus, re-run it with Bash. + postConfigure = + '' ${bash}/bin/sh config.status + ''; +})) From c88f2ecbcdddc2ba360dc63409ae44ee7fb51f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 10 Aug 2012 16:53:20 +0200 Subject: [PATCH 0584/1120] gtkwave: updating to 3.3.39 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 697d0e925cde..bb4b969f0621 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { - name = "gtkwave-3.3.28"; + name = "gtkwave-3.3.39"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0"; + sha256 = "1va506anlbpbha7l6h94s44xjdy6ch22iv629swn4bh5m3qi33bg"; }; buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; From a9764e7599d2be6f0355eea8c1084453d0ddd708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Aug 2012 17:17:32 +0200 Subject: [PATCH 0585/1120] gnutls: update to 3.0.22 --- pkgs/development/libraries/gnutls/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 4bd0dfdc5291..06dc0c40b342 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, perl, psmisc }: +, guileBindings, guile, perl }: assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.0.18"; + name = "gnutls-3.0.22"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1ynqnj1j6rrzplk2i64dik34829r0y7lwk4qlvjx993q3mj7z863"; + sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; }; configurePhase = '' @@ -29,13 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nettle libtasn1 ]; - # XXX: Disable tests on non-Linux because of the `mini-loss-time' hack - # below, which is Linux-specific. - doCheck = stdenv.isLinux; - - postCheck = - # Kill a process that's left behind. - stdenv.lib.optionalString doCheck "${psmisc}/bin/killall mini-loss-time"; + doCheck = true; meta = { description = "The GNU Transport Layer Security Library"; From 397f1d73ee9b626ad823d87d7454b511542f6a35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 18:43:49 +0200 Subject: [PATCH 0586/1120] ikiwiki: enable OpenID support * added perl-Crypt-DH-GMP-0.00010 * added perl-Devel-CheckLib-0.98 * added perl-HTTP-Message-6.03 * added perl-IO-CaptureOutput-1.1102 * added perl-Net-OpenID-Common-1.14 * added perl-Net-OpenID-Consumer-1.13 --- pkgs/applications/misc/ikiwiki/default.nix | 5 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 71 +++++++++++++++++++--- 3 files changed, 67 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 73dfe29a572c..e0a17e0e5f0c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, gettext, makeWrapper, PerlMagick, YAML , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple -, YAMLLibYAML, which, HTMLTree, AuthenPassphrase +, YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -36,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase ] + RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase + NetOpenIDConsumer ] ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 753fb893e09d..074b7c262958 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7061,7 +7061,7 @@ let inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir - AuthenPassphrase; + AuthenPassphrase NetOpenIDConsumer; }; imagemagick = callPackage ../applications/graphics/ImageMagick { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7fc3a0442e88..25bdcdd27fce 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -936,6 +936,17 @@ rec { buildInputs = [CryptCBC]; }; + CryptDHGMP = buildPerlPackage rec { + name = "Crypt-DH-GMP-0.00010"; + src = fetchurl { + url = "mirror://cpan/authors/id//D/DM/DMAKI/${name}.tar.gz"; + sha256 = "7d947cd48a98880df4fb5b0785758bef9ae1357eba7c376ad0fca3fd262a5fe9"; + }; + buildInputs = [ DevelChecklib TestRequires pkgs.gmp ]; + NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp"; + }; + CryptEksblowfish = buildPerlPackage rec { name = "Crypt-Eksblowfish-0.009"; src = fetchurl { @@ -986,6 +997,14 @@ rec { }; }; + CryptUnixCryptXS = buildPerlPackage rec { + name = "Crypt-UnixCrypt_XS-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; + sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; + }; + }; + CryptSmbHash = buildPerlPackage rec { name = "Crypt-SmbHash-0.12"; src = fetchurl { @@ -1201,6 +1220,15 @@ rec { propagatedBuildInputs = [ ClassLoad ClassSingleton ParamsValidate TryTiny ]; }; + DevelChecklib = buildPerlPackage rec { + name = "Devel-CheckLib-0.98"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MATTN/${name}.tar.gz"; + sha256 = "2b6b62665403bcdce67b53eb3bee7b57b6576026640c01aa57c7126e32ce20da"; + }; + propagatedBuildInputs = [ IOCaptureOutput ]; + }; + DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; inherit (pkgs) sqlite; @@ -1945,6 +1973,15 @@ 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 { @@ -1981,6 +2018,14 @@ rec { }; }; + IOCaptureOutput = buildPerlPackage rec { + name = "IO-CaptureOutput-1.1102"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; + sha256 = "2ea16dbecb21a3c2be49a93fb1e7e51275bed3f7ef3ac30cbdbff5d0178d43c7"; + }; + }; + IOCompress = buildPerlPackage rec { name = "IO-Compress-2.037"; src = fetchurl { @@ -2854,6 +2899,24 @@ rec { }; }; + NetOpenIDCommon = buildPerlPackage rec { + name = "Net-OpenID-Common-1.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "24ac83539b188d85bd2c7bd67e355aab0ede3f98170b23cb50bd30b11b4387ff"; + }; + propagatedBuildInputs = [ CryptDHGMP URI HTMLParser HTTPRequest XMLSimple ]; + }; + + NetOpenIDConsumer = buildPerlPackage rec { + name = "Net-OpenID-Consumer-1.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WR/WROG/${name}.tar.gz"; + sha256 = "4ab927b6756366fa4cef2b54088645849f32fc7e0cd8de0a50001bbf62946fd8"; + }; + propagatedBuildInputs = [ NetOpenIDCommon JSON ]; + }; + PackageDeprecationManager = buildPerlPackage rec { name = "Package-DeprecationManager-0.11"; src = fetchurl { @@ -4019,14 +4082,6 @@ rec { }; }; - CryptUnixCryptXS = buildPerlPackage rec { - name = "Crypt-UnixCrypt_XS-0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BORISZ/${name}.tar.gz"; - sha256 = "527c32b8b6eb50d52b081ceae4be2d748e718e40ea85940da59a3adeb3a33156"; - }; - }; - URI = buildPerlPackage rec { name = "URI-1.59"; src = fetchurl { From f20913e51fb6510ddd74d558a5b532764c92abdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 10 Aug 2012 18:57:57 +0200 Subject: [PATCH 0587/1120] ikiwiki: support OpenID via HTTPS Also enable Perl LWPxParanoidAgent for "additional security". --- pkgs/applications/misc/ikiwiki/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/perl-packages.nix | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index e0a17e0e5f0c..d061495b1764 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -2,6 +2,7 @@ , TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate , CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple , YAMLLibYAML, which, HTMLTree, AuthenPassphrase, NetOpenIDConsumer +, LWPxParanoidAgent, CryptSSLeay , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -37,7 +38,7 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML which HTMLTree AuthenPassphrase - NetOpenIDConsumer ] + NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay ] ++ lib.optionals docutilsSupport [python docutils] ++ lib.optionals gitSupport [git] ++ lib.optionals monotoneSupport [monotone] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 074b7c262958..7ec4377bbe71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7061,7 +7061,7 @@ let inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir - AuthenPassphrase NetOpenIDConsumer; + AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; }; imagemagick = callPackage ../applications/graphics/ImageMagick { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25bdcdd27fce..d33f5a78b8fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2406,6 +2406,16 @@ rec { doCheck = false; # tries to connect to https://www.apache.org/. }; + LWPxParanoidAgent = buildPerlPackage rec { + name = "LWPx-ParanoidAgent-1.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BR/BRADFITZ/${name}.tar.gz"; + sha256 = "bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a"; + }; + doCheck = false; # 3 tests fail, probably because they try to connect to the network + propagatedBuildInputs = [ LWP NetDNS ]; + }; + maatkit = import ../development/perl-modules/maatkit { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; From 986f04c87efed848a27f5b571c15937acf12923b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Aug 2012 23:16:02 +0200 Subject: [PATCH 0588/1120] guile: disable thread support on Solaris --- pkgs/development/interpreters/guile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 93676a9b11a3..78a7a8e793ee 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -99,10 +99,10 @@ // -(if stdenv.isFreeBSD +(if (stdenv.isFreeBSD || stdenv.isSunOS) then { - # XXX: Thread support is currently broken on FreeBSD (namely the - # `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) + # XXX: Thread support is currently broken on FreeBSD and Solaris (namely + # the `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) configureFlags = [ "--without-threads" ]; } else {})) From aa5220c7010290e93ccbd22ae67994028ef257d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 10 Aug 2012 23:28:23 +0200 Subject: [PATCH 0589/1120] gnutls: fix FreeBSD builds --- pkgs/development/libraries/gnutls/default.nix | 9 ++++++++- .../gnutls/guile-gnulib-includes.patch | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gnutls/guile-gnulib-includes.patch diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 06dc0c40b342..401433343da8 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -3,7 +3,7 @@ assert guileBindings -> guile != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gnutls-3.0.22"; @@ -54,3 +54,10 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isFreeBSD { + # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. + patches = [ ./guile-gnulib-includes.patch ]; +})) diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch new file mode 100644 index 000000000000..3e7f46e7699a --- /dev/null +++ b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch @@ -0,0 +1,19 @@ +commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860 +Author: Simon Josefsson +Date: Thu Aug 9 15:24:11 2012 +0200 + + Add gnulib -I's to guile-snarf command. + +diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am +index 7b55500..f52eee9 100644 +--- a/guile/src/Makefile.am ++++ b/guile/src/Makefile.am +@@ -95,7 +95,7 @@ priorities.i.c: $(srcdir)/make-session-priorities.scm + # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be + # included here, even though we'd really want `$(GUILE_CPPFLAGS)'. + snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS) ++ $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS) + + .c.x: $(BUILT_SOURCES) + $(guile_snarf) -o $@ $< $(snarfcppopts) From 1966010ec7e45faab52c5e7d858a309f31202f92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Aug 2012 10:51:48 -0400 Subject: [PATCH 0590/1120] systemd: Update to 188 --- pkgs/os-specific/linux/systemd/default.nix | 13 ++++++++----- .../systemd/fail-after-reaching-respawn-limit.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a6889e3e4403..f15043c6328d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,13 +6,15 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-187"; + name = "systemd-188"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1m7fzcqqgwqdjrrdp41i81q6y0cgjbknrznsvjqwh7nc027k6fqs"; + sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8"; }; + patches = [ ./fail-after-reaching-respawn-limit.patch ]; + buildInputs = [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl cryptsetup libuuid m4 usbutils pciutils glib @@ -47,7 +49,8 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\""; + # ‘-fstack-protector’ is necessary to build the PAM module correctly. + NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fstack-protector"; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; @@ -64,12 +67,12 @@ stdenv.mkDerivation rec { mkdir -p $out/sbin ln -s $out/lib/systemd/systemd $out/sbin/telinit for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i + ln -s $out/bin/systemctl $out/sbin/$i done ''; enableParallelBuilding = true; - + # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes diff --git a/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch b/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch new file mode 100644 index 000000000000..7271b5578d52 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/service.c b/src/core/service.c +index 1c127bd..eafdbe5 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2487,6 +2487,7 @@ static int service_start(Unit *u) { + r = service_start_limit_test(s); + if (r < 0) { + service_notify_sockets_dead(s, true); ++ service_set_state(s, SERVICE_FAILED); + return r; + } + From b4aa7cd47535f9382cd2163880dfba1719b12ae2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Aug 2012 16:09:28 -0400 Subject: [PATCH 0591/1120] systemd: Drop bogus dependency on udev --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f15043c6328d..b6497e0b0b3e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, udev, dbus, kmod +{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils , glib, kbd }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./fail-after-reaching-respawn-limit.patch ]; buildInputs = - [ pkgconfig intltool gperf libcap udev dbus kmod xz pam acl + [ pkgconfig intltool gperf libcap dbus kmod xz pam acl cryptsetup libuuid m4 usbutils pciutils glib ]; From 36e604ed1a78ec10d6d401d1de35e12ffb02248c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Aug 2012 16:42:29 -0400 Subject: [PATCH 0592/1120] cryptsetup: Update to 1.5.0 --- pkgs/os-specific/linux/cryptsetup/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 89a9d2b8506c..9e762f649041 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt, udev }: +{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }: stdenv.mkDerivation rec { - name = "cryptsetup-1.4.2"; - + name = "cryptsetup-1.5.0"; + src = fetchurl { url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; - sha256 = "1ryzc36wfbfqi69c3xzx2x6jr7l5xp7xwip4s9jkyjyj35xhvs0z"; + sha256 = "1l7qcmaq092k28k8sbw845hs6jwn0f05h68rmb7iwh52232m8wa0"; }; + configureFlags = "--enable-cryptsetup-reencrypt"; + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]; meta = { From 6020d52cbeab013e7727928d241df34230dff921 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Aug 2012 18:23:53 -0400 Subject: [PATCH 0593/1120] strace: Update to 4.7 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index b3cf2fcbddae..3589ffb5a070 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "strace-4.6"; + name = "strace-4.7"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "12n2faqq7whmszpjhv2lcb06r7900j53p0zl7vipi18inr0smycy"; + sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764"; }; buildNativeInputs = [ perl ]; From e69a6c57bc6d2d271267e39b02b49f44cfdf7887 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Aug 2012 18:53:14 -0400 Subject: [PATCH 0594/1120] linux: Update to 3.2.27 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 2570bf2e2a54..df457bcb7e22 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.26"; + version = "3.2.27"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1prchrid14sl29480g8a92lb7nn1hxrhcyx2mz4wi7wyr34lrv5z"; + sha256 = "1lchjh6s6mld83yq8gmcla6pydyap412bkyg3qb591ylnhdmg51k"; }; config = configWithPlatform stdenv.platform; From a6f17bd1a9e50d586a4a37d9c47ced3b2f6e686a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 10 Aug 2012 14:47:16 +0200 Subject: [PATCH 0595/1120] emacs: add "flymake-cursor" --- .../emacs-modes/flymake-cursor/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix new file mode 100644 index 000000000000..8aa4787a281e --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, emacs }: + +stdenv.mkDerivation rec { + name = "flymake-cursor-0.1.4"; + + src = fetchurl { + url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el"; + sha256 = "1wxqqmn2fk2b778nksvgn1mi7ajarcpc5lla90xx9jwz47d9hx02"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src flymake-cursor.el + emacs --batch -f batch-byte-compile flymake-cursor.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install flymake-cursor.el flymake-cursor.elc $out/share/emacs/site-lisp + ''; + + meta = { + description = "Displays flymake error msg in minibuffer after delay."; + homepage = http://www.emacswiki.org/emacs/flymake-cursor.el; + license = stdenv.lib.licences.publicDomain; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ec4377bbe71..7bd8ee276e30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6680,6 +6680,8 @@ let emms = callPackage ../applications/editors/emacs-modes/emms { }; + flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { }; + gh = callPackage ../applications/editors/emacs-modes/gh { }; gist = callPackage ../applications/editors/emacs-modes/gist { }; From b62acd88557b7c9be3721c8c246d2fba890f3cc9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 11 Aug 2012 11:32:21 +0200 Subject: [PATCH 0596/1120] oops typo --- .../applications/editors/emacs-modes/flymake-cursor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix index 8aa4787a281e..b629186033f0 100644 --- a/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix +++ b/pkgs/applications/editors/emacs-modes/flymake-cursor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Displays flymake error msg in minibuffer after delay."; homepage = http://www.emacswiki.org/emacs/flymake-cursor.el; - license = stdenv.lib.licences.publicDomain; + license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.all; }; From 58ccf70f479d6216781ecaf6fdb0329315ae689f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 11 Aug 2012 11:45:31 +0200 Subject: [PATCH 0597/1120] it seems fetchgit does not like version tags I think they built ok on my system before, because I nix-prefetch-git'd them. --- pkgs/applications/editors/emacs-modes/gh/default.nix | 2 +- pkgs/applications/editors/emacs-modes/logito/default.nix | 2 +- pkgs/applications/editors/emacs-modes/pcache/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/gh/default.nix b/pkgs/applications/editors/emacs-modes/gh/default.nix index a92512686823..28773e97c409 100644 --- a/pkgs/applications/editors/emacs-modes/gh/default.nix +++ b/pkgs/applications/editors/emacs-modes/gh/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/sigma/gh.el.git"; - rev = "v0.5.3"; + rev = "ef03b63d063ec22f03af449aa955c98dfad7f80e"; sha256 = "efa231e0091e8c7785385149dc97b2d8dc24aba65f4b0974b8ed7f62b7596ad3"; }; diff --git a/pkgs/applications/editors/emacs-modes/logito/default.nix b/pkgs/applications/editors/emacs-modes/logito/default.nix index 00b3add342e7..09161ec80678 100644 --- a/pkgs/applications/editors/emacs-modes/logito/default.nix +++ b/pkgs/applications/editors/emacs-modes/logito/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/sigma/logito.git"; - rev = "v0.1"; + rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052"; sha256 = "b9a7433417eafc5bc158f63dddf559b2044368eb3061f0264169de319c68fe4a"; }; diff --git a/pkgs/applications/editors/emacs-modes/pcache/default.nix b/pkgs/applications/editors/emacs-modes/pcache/default.nix index fee67119d99f..c0aa07726788 100644 --- a/pkgs/applications/editors/emacs-modes/pcache/default.nix +++ b/pkgs/applications/editors/emacs-modes/pcache/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/sigma/pcache.git"; - rev = "v0.2.3"; + rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6"; sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0"; }; From 2ecb9fdb5870c4eb7eb3ef8636ab9027d4fe4a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 11 Aug 2012 14:40:54 +0200 Subject: [PATCH 0598/1120] aircrackng, kismet: update them to latest trunk and release respectively --- pkgs/applications/networking/sniffers/kismet/default.nix | 6 +++--- pkgs/tools/networking/aircrack-ng/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index a7831785db81..9e41e8b7aaf6 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libpcap, ncurses, expat, pcre}: stdenv.mkDerivation { - name = "kismet-2010-01-r1"; + name = "kismet-2011-03-r2"; src = fetchurl { - url = http://www.kismetwireless.net/code/kismet-2010-01-R1.tar.gz; - sha256 = "106qird64x1v29nz6k5zs9dxxdq6q7fb7d6np0pnwm3dd2p1w7cx"; + url = http://www.kismetwireless.net/code/kismet-2011-03-R2.tar.gz; + sha256 = "0r1admlaiq7k0v13d9ci9i9mf5m25i1r5r18bkawsla9fbxrk83i"; }; buildInputs = [libpcap ncurses expat pcre]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 394022c2d08e..9ecaf183f1f6 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}: let - rev = "1859"; + rev = "2178"; in stdenv.mkDerivation rec { name = "aircrack-ng-1.1-${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://trac.aircrack-ng.org/svn/trunk"; inherit rev; - sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a"; + sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw"; }; buildInputs = [libpcap openssl zlib]; From 2c0b9301497e92f5a97a45dd9f6fc6c284484d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 11 Aug 2012 14:47:15 +0200 Subject: [PATCH 0599/1120] Removing rt73fw. The url was broken, and ralink_fw contains it. ralink_fw attribute contains the rt73 firmware, among others from ralink. --- .../linux/firmware/rt73/default.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/rt73/default.nix diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix deleted file mode 100644 index 953931001394..000000000000 --- a/pkgs/os-specific/linux/firmware/rt73/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - name = "rt73-fw-1.8"; - src = fetchurl { - url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D"; - name = "rt73-fw-1.8.zip"; - sha256 = "1gskm6wqp8nnz3qk44rmab6h81pkarzzphqvag4y05a8mwdarlz2"; - }; - - buildInputs = [ unzip ]; - - buildPhase = "true"; - - # Installation copies the firmware AND the license. The license - # says: "Your rights to redistribute the Software shall be - # contingent upon your installation of this Agreement in its - # entirety in the same directory as the Software." - installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; - - meta = { - description = "Firmware for the Ralink RT73 wireless card"; - homepage = http://www.ralinktech.com/; - license = "non-free"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bd8ee276e30..cf4bd46292be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6045,8 +6045,6 @@ let rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; - rt73fw = callPackage ../os-specific/linux/firmware/rt73 { }; - rtkit = callPackage ../os-specific/linux/rtkit { }; rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { }; From 3b78bd796d4e756d9606bf4376ebf581584a6e31 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 11 Aug 2012 14:10:06 -0400 Subject: [PATCH 0600/1120] microcodeIntel: Bump version --- pkgs/os-specific/linux/microcode/intel.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index d17663b7a65a..e85ab29078b2 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, microcode2ucode }: -let version = "20111110"; - num = "20728"; +let version = "20120606"; + num = "21385"; in stdenv.mkDerivation { name = "microcode-intel-${version}"; src = fetchurl { url = "http://downloadmirror.intel.com/${num}/eng/microcode-${version}.tgz"; - sha256 = "16f532cdf9cce03e01e714619ad9406a465aa965bbd1288035398db79921cbc1"; + sha256 = "0hs95lj24zx3jscc64zg3hf8xc95vrnsyqlid66h453ib0wf8fg1"; }; buildInputs = [ microcode2ucode ]; @@ -25,4 +25,4 @@ in stdenv.mkDerivation { homepage = http://www.intel.com/; description = "Microcode for Intel processors"; }; -} \ No newline at end of file +} From 88f3b097eed6fd69a88e89f5287d40f01cf4b4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 11 Aug 2012 19:54:44 +0200 Subject: [PATCH 0601/1120] Adding linux iw. --- pkgs/os-specific/linux/iw/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/os-specific/linux/iw/default.nix diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix new file mode 100644 index 000000000000..7110754357c1 --- /dev/null +++ b/pkgs/os-specific/linux/iw/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, libnl, pkgconfig}: + +stdenv.mkDerivation { + name = "iw-3.6"; + + src = fetchurl { + url = http://wireless.kernel.org/download/iw/iw-3.6.tar.bz2; + sha256 = "0my8nv6liya0b15nqn8wq2kxwjy7x6k65a9x1121zwqxq5m064fz"; + }; + + buildInputs = [ libnl pkgconfig ]; + + preBuild = " + makeFlagsArray=(PREFIX=$out) + "; + + meta = { + description = "Tool to use nl80211"; + homepage = http://wireless.kernel.org/en/users/Documentation/iw; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf4bd46292be..466be2abbacc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5577,6 +5577,8 @@ let ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { }; + iw = callPackage ../os-specific/linux/iw { }; + iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { }; iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; From cb76c03216fbc042bad2a603e0bcdd7d74ffa86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 11 Aug 2012 21:53:43 +0200 Subject: [PATCH 0602/1120] guile: fix Solaris builds --- pkgs/development/interpreters/guile/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 78a7a8e793ee..cc49ab87af89 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -94,12 +94,15 @@ # Same for these (?). "--with-libreadline-prefix=${readline}" "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" ]; }) // -(if (stdenv.isFreeBSD || stdenv.isSunOS) +(if stdenv.isFreeBSD then { # XXX: Thread support is currently broken on FreeBSD and Solaris (namely # the `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) From 0dea12ff8d7b210d735b5d555c67008f40983f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 11 Aug 2012 21:57:17 +0200 Subject: [PATCH 0603/1120] gnutls: FreeBSD: patch Makefile.in, not Makefile.am --- .../libraries/gnutls/guile-gnulib-includes.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch index 3e7f46e7699a..1624d1f7ab9d 100644 --- a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch +++ b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch @@ -4,16 +4,14 @@ Date: Thu Aug 9 15:24:11 2012 +0200 Add gnulib -I's to guile-snarf command. -diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am -index 7b55500..f52eee9 100644 ---- a/guile/src/Makefile.am -+++ b/guile/src/Makefile.am -@@ -95,7 +95,7 @@ priorities.i.c: $(srcdir)/make-session-priorities.scm +--- gnutls-3.0.22/guile/src/Makefile.in 2012-08-04 20:52:39.000000000 +0200 ++++ gnutls-3.0.22/guile/src/Makefile.in 2012-08-11 21:55:20.000000000 +0200 +@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \ # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be # included here, even though we'd really want `$(GUILE_CPPFLAGS)'. snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS) -+ $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS) +- $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS) ++ $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS) - .c.x: $(BUILT_SOURCES) - $(guile_snarf) -o $@ $< $(snarfcppopts) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am From 0c18551c93d1d9f8555fadc8edbc460d1493a889 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 11 Aug 2012 21:02:09 -0400 Subject: [PATCH 0604/1120] linux/manual-config: Do source unpacking/patching in a separate derivation. Since we keep the source in the kernel build anyway, no space is wasted by having a separate store path for the unpacked source. The upside is that the same source can be used to build the kernel multiple times, or generate configurations for later kernel builds, without going through the (fairly long) unpack and patch process multiple times. --- .../linux/kernel/manual-config.nix | 56 ++++++++++++------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index f9806c45451a..aa00bd2786a5 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -74,40 +74,58 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); commonMakeFlags = [ - "O=../build" + "O=$(buildRoot)" "INSTALL_PATH=$(out)" ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; in -stdenv.mkDerivation { +let self = stdenv.mkDerivation { name = "linux-${version}"; enableParallelBuilding = true; passthru = { - inherit version modDirVersion config kernelPatches; + inherit version modDirVersion config kernelPatches src; + + source = stdenv.mkDerivation { + name = "linux-${version}-source"; + + inherit src; + + patches = map (p: p.patch) kernelPatches; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + prePatch = '' + for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' + done + sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' + ''; + + installPhase = '' + cd .. + mv $sourceRoot $out + ''; + }; }; - inherit src; - - patches = map (p: p.patch) kernelPatches; - - prePatch = '' - for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do - echo "stripping FHS paths in \`$mf'..." - sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' - done - sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' + unpackPhase = '' + ln -sv ${self.source} src + export sourceRoot="$(pwd)/src" + mkdir build + export buildRoot="$(pwd)/build" + cd $sourceRoot ''; configurePhase = '' runHook preConfigure - mkdir ../build make $makeFlags "''${makeFlagsArray[@]}" mrproper - ln -sv ${configfile} ../build/.config + ln -sv ${configfile} $buildRoot/.config make $makeFlags "''${makeFlagsArray[@]}" oldconfig - rm ../build/.config.old + rm $buildRoot/.config.old runHook postConfigure ''; @@ -131,9 +149,9 @@ stdenv.mkDerivation { rm -f $out/lib/modules/${modDirVersion}/{build,source} cd .. mv $sourceRoot $out/lib/modules/${modDirVersion}/source - mv build $out/lib/modules/${modDirVersion}/build + mv $buildRoot $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/build/source - ln -sv $out/lib/modules/${modDirVersion}/{,build/}source + ln -sv ${self.source} $out/lib/modules/${modDirVersion}/build/source '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" @@ -154,4 +172,4 @@ stdenv.mkDerivation { ]; platforms = lib.platforms.linux; }; -} +}; in self From 9ac776ab221317fdac18cbcb14c61e46cd2fa1a2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 11 Aug 2012 21:07:37 -0400 Subject: [PATCH 0605/1120] linux/manual-config.nix: Set sourceRoot directly to the pre-unpacked source rather than using a symlink --- pkgs/os-specific/linux/kernel/manual-config.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index aa00bd2786a5..78b468176f28 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -113,8 +113,7 @@ let self = stdenv.mkDerivation { }; unpackPhase = '' - ln -sv ${self.source} src - export sourceRoot="$(pwd)/src" + export sourceRoot="${self.source}" mkdir build export buildRoot="$(pwd)/build" cd $sourceRoot @@ -146,12 +145,9 @@ let self = stdenv.mkDerivation { '' + (if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" - rm -f $out/lib/modules/${modDirVersion}/{build,source} - cd .. - mv $sourceRoot $out/lib/modules/${modDirVersion}/source + rm -f $out/lib/modules/${modDirVersion}/build + cd $buildRoot/.. mv $buildRoot $out/lib/modules/${modDirVersion}/build - unlink $out/lib/modules/${modDirVersion}/build/source - ln -sv ${self.source} $out/lib/modules/${modDirVersion}/build/source '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" From 839c58f5b1296f694b4b4dffa3810914438df560 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 11 Aug 2012 21:21:06 -0400 Subject: [PATCH 0606/1120] linux/manual-config: Cleanup --- .../linux/kernel/manual-config.nix | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 78b468176f28..52e284827d02 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -80,51 +80,48 @@ let ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; in -let self = stdenv.mkDerivation { +stdenv.mkDerivation { name = "linux-${version}"; enableParallelBuilding = true; passthru = { inherit version modDirVersion config kernelPatches src; + }; - source = stdenv.mkDerivation { - name = "linux-${version}-source"; + sourceRoot = stdenv.mkDerivation { + name = "linux-${version}-source"; - inherit src; + inherit src; - patches = map (p: p.patch) kernelPatches; + patches = map (p: p.patch) kernelPatches; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - prePatch = '' - for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do - echo "stripping FHS paths in \`$mf'..." - sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' - done - sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' - ''; + prePatch = '' + for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g ; s|/sbin/||g' + done + sed -i Makefile -e 's|= depmod|= ${kmod}/sbin/depmod|' + ''; - installPhase = '' - cd .. - mv $sourceRoot $out - ''; - }; + installPhase = '' + cd .. + mv $sourceRoot $out + ''; }; unpackPhase = '' - export sourceRoot="${self.source}" mkdir build export buildRoot="$(pwd)/build" + ln -sv ${configfile} $buildRoot/.config cd $sourceRoot ''; configurePhase = '' runHook preConfigure - make $makeFlags "''${makeFlagsArray[@]}" mrproper - ln -sv ${configfile} $buildRoot/.config make $makeFlags "''${makeFlagsArray[@]}" oldconfig - rm $buildRoot/.config.old runHook postConfigure ''; @@ -146,7 +143,6 @@ let self = stdenv.mkDerivation { make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" rm -f $out/lib/modules/${modDirVersion}/build - cd $buildRoot/.. mv $buildRoot $out/lib/modules/${modDirVersion}/build '' else optionalString installsFirmware '' make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ @@ -168,4 +164,4 @@ let self = stdenv.mkDerivation { ]; platforms = lib.platforms.linux; }; -}; in self +} From d91b51c140ef29c5aade05b185d84eafbedd1c6b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 13 Aug 2012 00:24:14 +0200 Subject: [PATCH 0607/1120] Update: notmuch to 0.13.2 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9dd352857fb9..266035aa1bd3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.12"; + name = "notmuch-0.13.2"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1dbbbbba3567df9c67ecc642d1e63269a527952c557f6b0c8bafcd4e37893992"; + sha256 = "75ec5f5d04bb7e3a8cc6224859b691f704a2a35f2f6027ffb674e829268f1d68"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; From 78ac496dc57c4224c58c1c288fbf0751c71273f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Aug 2012 14:01:13 +0200 Subject: [PATCH 0608/1120] haskell-blaze-builder-enumerator: update to version 0.2.0.5 --- .../libraries/haskell/blaze-builder-enumerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index a953d9f45258..00176d215bae 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-enumerator"; - version = "0.2.0.4"; - sha256 = "1zwp9hcjsmy5p5i436ajvl86zl1z4pzcfp6c57sj8vfr08rrrkq9"; + version = "0.2.0.5"; + sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa"; buildDepends = [ blazeBuilder enumerator transformers ]; meta = { homepage = "https://github.com/meiersi/blaze-builder-enumerator"; From 156f399995ba49df5488b8881b9ce94f9314be3e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Aug 2012 14:01:13 +0200 Subject: [PATCH 0609/1120] haskell-highlighting-kate: update to version 0.5.2 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index d92d15d2a16f..55051901206b 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.1"; - sha256 = "0l0g71rg7cs9rm4i04h88fm20868s0kf2da89297xlrm58zfv0jj"; + version = "0.5.2"; + sha256 = "1a3aifknbxm3v0lvqisdc6zqgki9x9z12jdrmijxmxq1riwwalr2"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; From 4de2d810e09214a27ef6f31d43e08ac4b7aa44c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Aug 2012 14:01:13 +0200 Subject: [PATCH 0610/1120] haskell-process-extras: update to version 0.1.3 --- pkgs/development/libraries/haskell/process-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index 437347749baf..ac2950d49272 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "process-extras"; - version = "0.1.1"; - sha256 = "0qnkclmjd5y0jpdxp4y2ynqlcdlsvck65269k0j4hy5zkyydbpv6"; + version = "0.1.3"; + sha256 = "16hm1w34qnrpb6x8gaqv1bs1cd4p98kayf23275s6vd48kw9v0b0"; buildDepends = [ text ]; meta = { homepage = "https://github.com/davidlazar/process-extras"; From 59d4db07bcedd59238bcb37b6cf78b07188a9876 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Aug 2012 14:01:13 +0200 Subject: [PATCH 0611/1120] haskell-unix-time: update to version 0.1.2 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 308e59ba2547..61d8f86189d9 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.1"; - sha256 = "1b7njfs33vqmprpmbpi8hvy1lc5ryvdiy5526q8s7vkzsi2iky1p"; + version = "0.1.2"; + sha256 = "146m4b93bla0pbf76bmff6f3aq9zx60cwy58mkqa0a4dyndd3pid"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; From 04661ec85044e69ea82c963a1d10ffd5d39b43fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 13 Aug 2012 14:05:27 +0200 Subject: [PATCH 0612/1120] openssl: fix GNU/kFreeBSD builds --- .../development/libraries/openssl/default.nix | 5 +++ .../libraries/openssl/kfreebsd-gnu.patch | 36 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/openssl/kfreebsd-gnu.patch diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cd164b13f8e3..575b57eb8727 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -23,6 +23,11 @@ let ./gnu.patch # submitted upstream ] + ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu") + [ ./gnu.patch + ./kfreebsd-gnu.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; in diff --git a/pkgs/development/libraries/openssl/kfreebsd-gnu.patch b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch new file mode 100644 index 000000000000..66cedf746ba5 --- /dev/null +++ b/pkgs/development/libraries/openssl/kfreebsd-gnu.patch @@ -0,0 +1,36 @@ +Allow compilation on GNU/kFreeBSD. Ideally, there'd be a single way to process +all glibc-based system, but the build system is soooo broken. + +--- openssl-1.0.0i/config ++++ openssl-1.0.0i/config +@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${ + echo "${MACHINE}-whatever-linux1"; exit 0 + ;; + ++ GNU/kFreeBSD*) ++ echo "kfreebsd-gnu"; exit 0; ++ ;; ++ + GNU*) + echo "hurd-x86"; exit 0; + ;; +@@ -810,6 +814,7 @@ case "$GUESSOS" in + beos-*) OUT="$GUESSOS" ;; + x86pc-*-qnx6) OUT="QNX6-i386" ;; + *-*-qnx6) OUT="QNX6" ;; ++ kfreebsd-gnu) OUT="kfreebsd-gnu";; + *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; + esac + + +--- openssl-1.0.0i/Configure ++++ openssl-1.0.0i/Configure +@@ -565,6 +565,9 @@ my %table=( + ##### GNU Hurd + "hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", + ++##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64" ++"kfreebsd-gnu", "gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++ + ##### OS/2 EMX + "OS2-EMX", "gcc::::::::", From e093d7ea388100fd7ee7fb22b779b25259a365c3 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Mon, 13 Aug 2012 16:29:01 +0200 Subject: [PATCH 0613/1120] ghc-7.6.1-rc1: Add release candidate. --- pkgs/development/compilers/ghc/7.6.1.nix | 46 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/haskell-defaults.nix | 6 ++++ 3 files changed, 54 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.6.1.nix diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix new file mode 100644 index 000000000000..203a354c13c4 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.0.20120810"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/7.6.1-rc1/${name}-src.tar.bz2"; + sha256 = "04m8ms3a58590s4p8x6qma25rdanz0iai8rcla78ka798612pvjd"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + 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 466be2abbacc..812abb706447 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2295,6 +2295,8 @@ let haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); + # Release candidate. + haskellPackages_ghc761 = haskell.packages_ghc761; # 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 579b20fcc230..e076a92350d4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -256,6 +256,12 @@ prefFun = ghc741Prefs; }; + packages_ghc761 = + packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; + ghcBinary = ghc704Binary; + prefFun = ghcHEADPrefs; + }; + # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; From 50cc5629af2292c506f904f52ed2f722b82d75aa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 13 Aug 2012 16:17:31 +0200 Subject: [PATCH 0614/1120] emacs: add "jade-mode" --- .../editors/emacs-modes/jade/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/jade/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jade/default.nix b/pkgs/applications/editors/emacs-modes/jade/default.nix new file mode 100644 index 000000000000..0c99ceaca22b --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jade/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, emacs }: + +stdenv.mkDerivation { + name = "jade-mode-0-20120802"; + + src = fetchgit { + url = "https://github.com/brianc/jade-mode.git"; + rev = "275ab149edb0f6bcfae6ac17ba456f3351191604"; + sha256 = "3cd2bebcd66e59d60b8e5e538e65a8ffdfc9a53b86443090a284e8329d7cb09b"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs --batch -L . -f batch-byte-compile *.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc $out/share/emacs/site-lisp/ + ''; + + meta = { + description = "Emacs major mode for jade and stylus."; + homepage = https://github.com/brianc/jade-mode; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 812abb706447..743acccefb0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6688,6 +6688,8 @@ let gist = callPackage ../applications/editors/emacs-modes/gist { }; + jade = callPackage ../applications/editors/emacs-modes/jade { }; + jdee = callPackage ../applications/editors/emacs-modes/jdee { # Requires Emacs 23, for `avl-tree'. }; From 1baf48f0870d7077643e1ad92e2308b422a71e90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 00:01:41 -0400 Subject: [PATCH 0615/1120] Do some let-floating to prevent repeated evaluation of impureEnvVars --- pkgs/build-support/fetchurl/default.nix | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index ec3d45e652e8..cc59dd7fab1e 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -22,6 +22,21 @@ let then builtins.attrNames mirrors else [] /* backwards compatibility */; + impureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" + + # This variable allows the user to override hashedMirrors from the + # command-line. + "NIX_HASHED_MIRRORS" + ] ++ (map (site: "NIX_MIRRORS_${site}") sites); + in { # URL to fetch. @@ -83,23 +98,8 @@ stdenv.mkDerivation { if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; outputHash = if outputHash != "" then outputHash else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - # This variable allows the user to pass additional options to curl - "NIX_CURL_FLAGS" - - # This variable allows the user to override hashedMirrors from the - # command-line. - "NIX_HASHED_MIRRORS" - ] ++ (map (site: "NIX_MIRRORS_${site}") sites); - - inherit showURLs mirrorsFile; + inherit showURLs mirrorsFile impureEnvVars; # Doing the download on a remote machine just duplicates network # traffic, so don't do that. From 3bf4437622237e5c5c2d23358b0dcfe0839222e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 00:08:21 -0400 Subject: [PATCH 0616/1120] Remove obsolete backwards compatibility hack for getAttr --- pkgs/lib/attrsets.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 5e4e9df37110..8d1521812f9b 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -10,7 +10,7 @@ with { }; rec { - inherit (builtins) attrNames listToAttrs hasAttr isAttrs; + inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; /* Return an attribute from nested attribute sets. For instance @@ -33,15 +33,6 @@ rec { nameValuePair (head attrPath) (setAttrByPath (tail attrPath) value) )]; - - /* Backwards compatibility hack: lib.attrByPath used to be called - lib.getAttr, which was confusing given that there was also a - builtins.getAttr. Eventually we'll drop this hack and - lib.getAttr will just be an alias for builtins.getAttr. */ - getAttr = a: b: if isString a - then builtins.getAttr a b - else c: builtins.trace "Deprecated use of lib.getAttr!" (attrByPath a b c); - getAttrFromPath = attrPath: set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; From 431c55cbf1f99748cb28566a33d15fb22bf76fe6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 11:55:45 -0400 Subject: [PATCH 0617/1120] Use builtin filter, elem, concatLists functions if available --- pkgs/lib/attrsets.nix | 4 ++-- pkgs/lib/lists.nix | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 8d1521812f9b..982f23230c94 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; + inherit (import ./lists.nix) concatMap concatLists; inherit (import ./misc.nix) eqStrict; }; @@ -66,7 +66,7 @@ rec { catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}] => [1 2] */ - catAttrs = attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l; + catAttrs = attr: l: concatLists (map (s: if hasAttr attr s then [(getAttr attr s)] else []) l); /* Filter an attribute set by removing all attributes for which the diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 67b0add50dcb..dcb89aeec141 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -35,7 +35,7 @@ rec { # Concatenate a list of lists. - concatLists = fold (x: y: x ++ y) []; + concatLists = builtins.concatLists or (fold (x: y: x ++ y) []); # Map and concatenate the result. @@ -53,20 +53,24 @@ rec { # Filter a list using a predicate; that is, return a list containing # every element from `list' for which `pred' returns true. - filter = pred: list: - fold (x: y: if pred x then [x] ++ y else y) [] list; + filter = + builtins.filter or + (pred: list: + fold (x: y: if pred x then [x] ++ y else y) [] list); - # Remove elements 'e' from a list. Useful for buildInputs + # Remove elements equal to 'e' from a list. Useful for buildInputs. remove = e: filter (x: x != e); # Given two lists, removes all elements of the first list from the second list removeList = l: filter (x: elem x l); - - # Return true if `list' has an element `x': - elem = x: list: fold (a: bs: x == a || bs) false list; + + # Return true if `list' has an element `x'. + elem = + builtins.elem or + (x: list: fold (a: bs: x == a || bs) false list); # Find the sole element in the list matching the specified From c0a483632c3e0193678dd58c994528d88d42ea00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 14:19:31 -0400 Subject: [PATCH 0618/1120] =?UTF-8?q?Eliminate=20some=20calls=20to=20?= =?UTF-8?q?=E2=80=98tail=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/lib/lists.nix | 4 ++-- pkgs/lib/modules.nix | 4 ++-- pkgs/lib/options.nix | 8 ++++---- pkgs/lib/strings.nix | 6 +++--- pkgs/lib/types.nix | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index dcb89aeec141..f5845c32ee9c 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -169,11 +169,11 @@ rec { # order. The implementation does a quick-sort. sort = strictLess: list: let - # This implementation only have one element lists on the left hand + # This implementation only has one element list on the left hand # side of the concatenation operator. qs = l: concat: if l == [] then concat - else if tail l == [] then l ++ concat + else if length l == 1 then l ++ concat else let part = partition (strictLess (head l)) (tail l); in diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index eb528f141fe2..13be0daa2877 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -2,7 +2,7 @@ let lib = import ./default.nix; in -with { inherit (builtins) head tail; }; +with { inherit (builtins) head; }; with import ./trivial.nix; with import ./lists.nix; with import ./misc.nix; @@ -64,7 +64,7 @@ rec { config = getConfig; } // ( if getImportedSets != [] then - assert tail getImportedSets == []; + assert length getImportedSets == 1; { options = head getImportedSets; } else {} diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index cd60b8f3b88c..05c9c5f9c0f5 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -2,7 +2,7 @@ let lib = import ./default.nix; in -with { inherit (builtins) head tail; }; +with { inherit (builtins) head length; }; with import ./trivial.nix; with import ./lists.nix; with import ./misc.nix; @@ -133,7 +133,7 @@ rec { # separate the merge & apply fields from the interface. mergeOptionDecls = opts: if opts == [] then {} - else if tail opts == [] then + else if length opts == 1 then let opt = head opts; in if opt ? options then opt // { options = toList opt.options; } @@ -189,7 +189,7 @@ rec { ) (attrNames defs)); mergeDefaultOption = list: - if list != [] && tail list == [] then head list + if length list == 1 then head list else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list) else if all isList list then concatLists list else if all isAttrs list then fold lib.mergeAttrs {} list @@ -214,7 +214,7 @@ rec { mergeOneOption = list: if list == [] then abort "This case should never happen." - else if tail list != [] then throw "Multiple definitions. Only one is allowed for this option." + else if length list != 1 then throw "Multiple definitions. Only one is allowed for this option." else head list; diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index 071bb2c995b3..fb2752d97c19 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -2,12 +2,12 @@ let lib = import ./default.nix; -inherit (builtins) add sub lessThan; +inherit (builtins) add sub lessThan length; in rec { - inherit (builtins) stringLength substring head tail lessThan sub; + inherit (builtins) stringLength substring head tail; # Concatenate a list of strings. @@ -22,7 +22,7 @@ rec { # Place an element between each element of a list, e.g., # `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"]. intersperse = separator: list: - if list == [] || tail list == [] + if list == [] || length list == 1 then list else [(head list) separator] ++ (intersperse separator (tail list)); diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix index 956368138aa2..38ae7b43630a 100644 --- a/pkgs/lib/types.nix +++ b/pkgs/lib/types.nix @@ -157,7 +157,7 @@ rec { uniq = elemType: mkOptionType { inherit (elemType) name check iter fold docPath hasOptions; merge = list: - if tail list == [] then + if length list == 1 then head list else throw "Multiple definitions. Only one is allowed for this option."; From c68c95d55a268d06943bb9c6456a3499d1e47124 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 14:19:50 -0400 Subject: [PATCH 0619/1120] Provide O(n) time implementations of fold/foldl/any/all Previous implementations were O(n^2) because tail takes O(n) time. --- pkgs/lib/lists.nix | 56 +++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index f5845c32ee9c..d6ab9cb88a7e 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,7 +1,7 @@ # General list operations. rec { - inherit (builtins) head tail length isList; + inherit (builtins) elemAt head tail length isList add sub lessThan; # Create a list consisting of a single element. `singleton x' is @@ -14,20 +14,46 @@ rec { # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is # Haskell's foldr). - fold = op: nul: list: - if list == [] - then nul - else op (head list) (fold op nul (tail list)); + fold = + if builtins ? elemAt + then op: nul: list: + let + len = length list; + fold' = n: + if n == len + then nul + else op (elemAt list n) (fold' (add n 1)); + in fold' 0 + else op: nul: + let fold' = list: + if list == [] + then nul + else op (head list) (fold' (tail list)); + in fold'; # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul # x_1) x_2) ... x_n)'. - foldl = op: nul: list: - if list == [] - then nul - else foldl op (op nul (head list)) (tail list); + foldl = + if builtins ? elemAt + then op: nul: list: + let + len = length list; + foldl' = n: + if n == minus1 + then nul + else op (foldl' (sub n 1)) (elemAt list n); + in foldl' (sub (length list) 1) + else op: + let foldl' = nul: list: + if list == [] + then nul + else foldl' (op nul (head list)) (tail list); + in foldl'; + + minus1 = sub 0 1; + - # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] == # ["a-1" "b-2"]' imap = f: list: @@ -92,18 +118,12 @@ rec { # Return true iff function `pred' returns true for at least element # of `list'. - any = pred: list: - if list == [] then false - else if pred (head list) then true - else any pred (tail list); + any = pred: fold (x: y: if pred x then true else y) false; # Return true iff function `pred' returns true for all elements of # `list'. - all = pred: list: - if list == [] then true - else if pred (head list) then all pred (tail list) - else false; + all = pred: fold (x: y: if pred x then y else false) true; # Return true if each element of a list is equal, false otherwise. From 0b4fb4e4f6fde92b0432fa4d97becf6215ec7be7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 14:39:45 -0400 Subject: [PATCH 0620/1120] Replace some calls to attrByPath with "or" --- pkgs/lib/modules.nix | 10 +++++----- pkgs/lib/options.nix | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 13be0daa2877..25cb956a0ea4 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -44,9 +44,9 @@ rec { delayedModule = delayProperties m; getImports = if m ? config || m ? options then - attrByPath ["imports"] [] m + m.imports or [] else - toList (rmProperties (attrByPath ["require"] [] delayedModule)); + toList (rmProperties (delayedModule.require or [])); getImportedPaths = filter isPath getImports; getImportedSets = filter (x: !isPath x) getImports; @@ -92,7 +92,7 @@ rec { else newModuleName origin index; }; - getImports = m: attrByPath ["imports"] [] m; + getImports = m: m.imports or []; newModuleName = origin: index: "${origin.key}:"; @@ -110,8 +110,8 @@ rec { selectDeclsAndDefs = modules: lib.concatMap (m: if m ? config || m ? options then - [ (attrByPath ["options"] {} m) ] - ++ [ (attrByPath ["config"] {} m) ] + [ (m.options or {}) ] + ++ [ (m.config or {}) ] else [ m ] ) modules; diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 05c9c5f9c0f5..59bda41a623f 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -152,13 +152,11 @@ rec { opt1 // opt2 // optionalAttrs (opt1 ? options || opt2 ? options) { options = - (toList (attrByPath ["options"] [] opt1)) - ++ (toList (attrByPath ["options"] [] opt2)); + (toList (opt1.options or [])) + ++ (toList (opt2.options or [])); } // optionalAttrs (opt1 ? extraConfigs || opt2 ? extraConfigs) { - extraConfigs = - (attrByPath ["extraConfigs"] [] opt1) - ++ (attrByPath ["extraConfigs"] [] opt2); + extraConfigs = opt1.extraConfigs or [] ++ opt2.extraConfigs or []; } )) {} opts; From 503b4fd5bfd2a516ebd61870d2e09970b56ff41a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 15:56:09 -0400 Subject: [PATCH 0621/1120] busybox: Update to 1.20.2 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ab0873e7ddca..0848cb332534 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -37,11 +37,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.20.1"; + name = "busybox-1.20.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1jb8xh9a0mc73nmnjz7g5k7ym39vrg7grp7zmgmq71gxps55sl9y"; + sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb"; }; configurePhase = '' From 37159c1b9a0ec77306866c539fbcd7b0e230f2d9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 18:08:35 -0400 Subject: [PATCH 0622/1120] Remove obsolete eqStrict function Use the "==" operator instead. --- pkgs/lib/attrsets.nix | 5 ++--- pkgs/lib/debug.nix | 2 +- pkgs/lib/misc.nix | 14 -------------- pkgs/lib/tests.nix | 29 ++++++++--------------------- 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 982f23230c94..de6eccbec1f8 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -6,7 +6,6 @@ with { inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists; - inherit (import ./misc.nix) eqStrict; }; rec { @@ -292,9 +291,9 @@ rec { matchAttrs = pattern: attrs: fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in - if tail values == [] then false + if length values == 1 then false else if isAttrs pat then isAttrs val && matchAttrs head values - else eqStrict pat val + else pat == val ) [pattern attrs])); # override only the attributes that are already present in the old set diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix index e452151add6b..b78f946c5d44 100644 --- a/pkgs/lib/debug.nix +++ b/pkgs/lib/debug.nix @@ -66,7 +66,7 @@ rec { let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) - && (!lib.eqStrict test.expr test.expected) + && (test.expr != test.expected) then [ { inherit name; expected = test.expected; result = test.expr; } ] else [] ) tests)); diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index dbf3381f0f4e..f4a629398b53 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -390,18 +390,4 @@ rec { else if isInt x then "int" else "string"; - # deep, strict equality testing. This should be implemented as primop - eqStrict = a : b : - let eqListStrict = a : b : - if (a == []) != (b == []) then false - else if a == [] then true - else eqStrict (head a) (head b) && eqListStrict (tail a) (tail b); - in - if nixType a != nixType b then false - else if isList a then eqListStrict a b - else if isAttrs a then - (eqListStrict (attrNames a) (attrNames b)) - && (eqListStrict (lib.attrValues a) (lib.attrValues b)) - else a == b; # FIXME ! - } diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 646de7c0e49b..835298ddb9ea 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -50,19 +50,6 @@ runTests { expected = 5050; }; - testEqStrict = { - expr = all id [ - (eqStrict 2 2) - (!eqStrict 3 2) - (eqStrict [2 1] [2 1]) - (!eqStrict [1 3] [1 2]) - (eqStrict {a = 7; b = 20;} {b= 20; a = 7;}) - (eqStrict [{a = 7; b = 20;}] [{b= 20; a = 7;}]) - (eqStrict {a = [7 8]; b = 20;} {b= 20; a = [7 8];}) - ]; - expected = true; - }; - testTake = testAllTrue [ ([] == (take 0 [ 1 2 3 ])) ([1] == (take 1 [ 1 2 3 ])) @@ -99,14 +86,14 @@ runTests { in (y.merge) { b = 10; }; strip = attrs : removeAttrs attrs ["merge" "replace"]; in all id - [ (eqStrict (strip res1) { }) - (eqStrict (strip res2) { a = 7; }) - (eqStrict (strip res3) { a = 7; b = 10; }) - (eqStrict (strip res4) { a = 7; b = 10; }) - (eqStrict (strip res5) { a = 10; }) - (eqStrict (strip res6) { a = 17; }) - (eqStrict (strip resRem7) {}) - (eqStrict (strip resFixed1) { a = 7; b = 10; c =10; name = "name-10"; }) + [ ((strip res1) == { }) + ((strip res2) == { a = 7; }) + ((strip res3) == { a = 7; b = 10; }) + ((strip res4) == { a = 7; b = 10; }) + ((strip res5) == { a = 10; }) + ((strip res6) == { a = 17; }) + ((strip resRem7) == {}) + ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; }) ]; expected = true; }; From 8225460f8222a5dab662f66f26c7dd8f22883ac4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 18:19:06 -0400 Subject: [PATCH 0623/1120] Remove obsolete eqLists function --- pkgs/lib/lists.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index d6ab9cb88a7e..e247a27ba16d 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -126,13 +126,6 @@ rec { all = pred: fold (x: y: if pred x then y else false) true; - # Return true if each element of a list is equal, false otherwise. - eqLists = xs: ys: - if xs == [] && ys == [] then true - else if xs == [] || ys == [] then false - else head xs == head ys && eqLists (tail xs) (tail ys); - - # Return a singleton list or an empty list, depending on a boolean # value. Useful when building lists with optional elements # (e.g. `++ optional (system == "i686-linux") flashplayer'). From 4f7917ac62bb27543053056a6e4a3288ecb1809f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Aug 2012 18:26:19 -0400 Subject: [PATCH 0624/1120] Remove obsolete flattenAttrs function --- pkgs/lib/lists.nix | 2 +- pkgs/lib/misc.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index e247a27ba16d..b50da022283b 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -212,7 +212,7 @@ rec { let loop = l: if tail l == [] then head l else loop (tail l); in loop list; - + # Zip two lists together. zipTwoLists = xs: ys: if xs != [] && ys != [] then diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index f4a629398b53..39a3ad258b04 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -322,10 +322,6 @@ rec { // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; - # returns atribute values as a list - flattenAttrs = set : map ( attr : builtins.getAttr attr set) (attrNames set); - mapIf = cond : f : fold ( x : l : if (cond x) then [(f x)] ++ l else l) []; - # prepareDerivationArgs tries to make writing configurable derivations easier # example: # prepareDerivationArgs { @@ -365,7 +361,7 @@ rec { flagName = name : "${name}Support"; cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) // args2.cfg; - opts = flattenAttrs (mapAttrs (a : v : + opts = attrValues (mapAttrs (a : v : let v2 = if (v ? set || v ? unset) then v else { set = v; }; n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset"; attr = maybeAttr n {} v2; in From a19a68e93bce25a522162c2a70ed2dd3e2617bac Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 14 Aug 2012 14:14:55 +0200 Subject: [PATCH 0625/1120] Use /var/log/sa for statedir of sysstat, in stead of $out/var/lib/sa. This path cannot be overriden at runtime, so choosing a 'sane' default. --- pkgs/os-specific/linux/sysstat/default.nix | 4 +- .../linux/sysstat/no-install-statedir.patch | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/sysstat/no-install-statedir.patch diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 13655b4c91ff..2b4888f89cdf 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH_CP=$(type -tp cp) export PATH_CHKCONFIG=/no-such-program - makeFlagsArray=(SA_DIR=$out/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) + makeFlagsArray=(SA_DIR=/var/log/sa SYSCONFIG_DIR=$out/etc CHOWN=true IGNORE_MAN_GROUP=y) ''; + patches = [ ./no-install-statedir.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/no-install-statedir.patch b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch new file mode 100644 index 000000000000..ef81f97217fa --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/no-install-statedir.patch @@ -0,0 +1,37 @@ +diff -rc sysstat-10.1.1/Makefile.in sysstat-10.1.1-new/Makefile.in +*** sysstat-10.1.1/Makefile.in 2012-01-02 14:36:00.000000000 +0100 +--- sysstat-10.1.1-new/Makefile.in 2012-08-14 14:11:17.676124739 +0200 +*************** +*** 309,315 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +! mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 309,315 ---- + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +! #mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +*************** +*** 344,350 **** + + install_all: install_base cron/crontab sysstat \ + cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly +! $(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) + if [ -d $(DESTDIR)/etc/cron.d ]; then \ + $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ + elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ +--- 344,350 ---- + + install_all: install_base cron/crontab sysstat \ + cron/sysstat.crond cron/sysstat.cron.daily cron/sysstat.cron.hourly +! #$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR) + if [ -d $(DESTDIR)/etc/cron.d ]; then \ + $(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \ + elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \ From 82097115b675ce3a04c292f32b19de364eebf3e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:47 +0200 Subject: [PATCH 0626/1120] haskell-cmdargs: update to version 0.9.7 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 87d09a6d5fce..38b0bf24bcb0 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.6"; - sha256 = "0xmzx7iglygks11qmnwz9jjj0jim2sjq7x3xf39symzs986pswlk"; + version = "0.9.7"; + sha256 = "0w3y94hjq5w1i2vcj45jfdbi1iadib2nsv0pa3w9dmqvn9wxlvz4"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 4efed5529b731abab19a6cb7d9ea31527e0cb13a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:47 +0200 Subject: [PATCH 0627/1120] haskell-hamlet: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/hamlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 98123e6d5510..31d1ad66d2ec 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.0.1"; - sha256 = "14qlpdfnj90ilgcgll96rrpc4cjc218q7p7kc6y391rkf393453p"; + version = "1.1.0.2"; + sha256 = "0knkc43ldz3jhn3pmsysqbzlsp8akh9kiyy2jncra9y0xhminpqy"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; From 0879e2889b3c7a121d9706385314c59cf9536129 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:48 +0200 Subject: [PATCH 0628/1120] haskell-shakespeare-css: update to version 1.0.1.4 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 3c48a51ea9b7..a64e9acc7d79 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.3"; - sha256 = "1jj609fcp14b7nzjzsiiy0apbdmap2wi7vlyzdhadirjskxvsvc1"; + version = "1.0.1.4"; + sha256 = "0avixf7z3hcvgcijgrm7hisr8i8waa8nb435gv8lv5vvz8yq3k0n"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 94f77400c4a620a8dd01f415c6a50d5578add5f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:48 +0200 Subject: [PATCH 0629/1120] haskell-shakespeare-js: update to version 1.0.0.5 --- 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 fee4d9013501..ff2f0c09e0c2 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.0.0.4"; - sha256 = "19v5jas2lcbya1x3mm3fhvhwk643vyy8vpfx0zk3gsw91h34pkyf"; + version = "1.0.0.5"; + sha256 = "1d4na2q1q798ki5f84gpf89ri26qmrxqrwbw7mmlrfwkj1qw69rs"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From f12301c4f97a73001aa583f6048212d694c0a4ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:48 +0200 Subject: [PATCH 0630/1120] haskell-shakespeare-text: update to version 1.0.0.4 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index 9f4548d39bf6..fbc31e3eda1e 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.3"; - sha256 = "0rwdlx7926gjkjymn3h6fdw1ic6s44nn5h8r8791gxknz668ydd7"; + version = "1.0.0.4"; + sha256 = "14kas2m7kbv1f49qpx6z097r707l3gqp9lwvh0q42cc6rlwab5l7"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 28eb30c2119aee05e3212fb8102a730e01762aae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:49 +0200 Subject: [PATCH 0631/1120] haskell-shakespeare: update to version 1.0.1.1 --- pkgs/development/libraries/haskell/shakespeare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 0e569d835fbb..1619cc6760c4 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.1"; - sha256 = "1qs2n16ncrw4c98lqzgxhxa5mi7aiq1q0gwq7m9mr32jv7qzwgcv"; + version = "1.0.1.1"; + sha256 = "0w5dcli9gbmbpfg8rd8bia7wfll4iisi2cbdwdhbnn159mw8s25x"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 8754609371f25cfb6c6a9c8cbbcfb58a7a18dfe0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:49 +0200 Subject: [PATCH 0632/1120] haskell-yesod-auth: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index a540c56e54c7..e1a396287c81 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.0"; - sha256 = "1bvvd1fl2id7zw51g5mrm047zm2jy5hr5l1xxas6zin2dv0ix5p1"; + version = "1.1.0.1"; + sha256 = "1zidw47yvsvbgi70lhbl1lxgqp3zzgbbjnyz3pcvyahy81cny423"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 From fec4c86291244c8042a9da5d2c862ccb3290a00e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:49 +0200 Subject: [PATCH 0633/1120] haskell-yesod-core: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 558c7fe6ea50..85dbca15fdbb 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.0"; - sha256 = "01jxb6skpwckvkgar847limqrcl91l50pr7iza2sfp0a6j5a2hmk"; + version = "1.1.0.1"; + sha256 = "1shjw18bh1kqay3imij41678dk2hpc39a8jdg89mn8mnj7gdzjxw"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From 0d8d30884b028be366e73a32c65ba38a5451b4d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:49 +0200 Subject: [PATCH 0634/1120] haskell-yesod-form: update to version 1.1.0.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 172a83d8a95b..60042697e1d3 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.1.0"; - sha256 = "1xig1va8qya78g6rlymz2w2ncyp8fj76sinyhjpr1ikw8my5hgw0"; + version = "1.1.0.1"; + sha256 = "1fcffvaw1hv5qdgl1h4m93jjv9qwr1b9ggr4zy7ij2cbjynavawq"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From f136179002a9694baa2c6266cb9fd3fb04abaabb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Aug 2012 14:24:50 +0200 Subject: [PATCH 0635/1120] haskell-zlib-bindings: update to version 0.1.1 --- 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 d5557eae3906..3bb9d314957c 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.0.1"; - sha256 = "0r1hjmmxb9kz5fvfrjvzjd0pnhb87vyldqvb73yjq35s16bj4vlc"; + version = "0.1.1"; + sha256 = "0hgqr7sh3pri482191gd9qrz2nbgxw1aqdx1x6lc9s0bbw68isai"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From 9d516f16fc44e45ca48759dd02858dd5caa50918 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 14 Aug 2012 13:42:43 -0400 Subject: [PATCH 0636/1120] Fix evaluation problem http://hydra.nixos.org/build/2940128 --- pkgs/lib/lists.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index b50da022283b..b9eba9ab4785 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,14 +1,14 @@ # General list operations. rec { - inherit (builtins) elemAt head tail length isList add sub lessThan; + inherit (builtins) head tail length isList add sub lessThan; # Create a list consisting of a single element. `singleton x' is # sometimes more convenient with respect to indentation than `[x]' # when x spans multiple lines. singleton = x: [x]; - + # "Fold" a binary function `op' between successive elements of # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 @@ -22,7 +22,7 @@ rec { fold' = n: if n == len then nul - else op (elemAt list n) (fold' (add n 1)); + else op (builtins.elemAt list n) (fold' (add n 1)); in fold' 0 else op: nul: let fold' = list: @@ -42,7 +42,7 @@ rec { foldl' = n: if n == minus1 then nul - else op (foldl' (sub n 1)) (elemAt list n); + else op (foldl' (sub n 1)) (builtins.elemAt list n); in foldl' (sub (length list) 1) else op: let foldl' = nul: list: From c67c397c1135cdfb1c3ba32abaa25017306cbf1c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 14 Aug 2012 13:43:37 -0400 Subject: [PATCH 0637/1120] VirtualBox-GuestAdditions: Add to the channel --- .../virtualbox/guest-additions/default.nix | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ec77ca91910f..5b207e2e799f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -17,16 +17,16 @@ stdenv.mkDerivation { cp -r install/* $out ''; - + buildCommand = '' ${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run - ./VBoxLinuxAdditions.run --noexec --keep + ./VBoxLinuxAdditions.run --noexec --keep '' else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - + # Unpack files cd install ${if stdenv.system == "i686-linux" then '' @@ -38,31 +38,31 @@ stdenv.mkDerivation { else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") } - - # Build kernel modules - cd src + + # Build kernel modules + cd src for i in * do - cd $i - find . -type f | xargs sed 's/depmod -a/true/' -i - make - cd .. + cd $i + find . -type f | xargs sed 's/depmod -a/true/' -i + make + cd .. done cd .. - + # Change the interpreter for various binaries for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} do ${if stdenv.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i - '' - else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i - '' - else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") - } + '' + else if stdenv.system == "x86_64-linux" then '' + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i + '' + else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions") + } done # Change rpath for various binaries and libraries @@ -72,11 +72,11 @@ stdenv.mkDerivation { do patchelf --set-rpath $out/lib $i done - + # Remove references to /usr from various scripts and files sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all - + # Install binaries mkdir -p $out/sbin install -m 755 sbin/VBoxService $out/sbin @@ -94,7 +94,7 @@ stdenv.mkDerivation { cp -v lib/VBoxOGL*.so $out/lib mkdir -p $out/lib/dri ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so - + # Install desktop file mkdir -p $out/share/autostart cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart @@ -103,23 +103,23 @@ stdenv.mkDerivation { mkdir -p $out/lib/xorg/modules/{drivers,input} install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # There doesn't appear to be a vboxmouse driver for Xorg 1.9. Was there ever? -# install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so + #install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so # Install kernel modules cd src - + for i in * do cd $i - kernelVersion=$(cd ${kernel}/lib/modules; ls) - export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - find . -type f | xargs sed -i -e "s|-o root||g" \ - -e "s|-g root||g" - make install - cd .. - done - ''; - + kernelVersion=$(cd ${kernel}/lib/modules; ls) + export MODULE_DIR=$out/lib/modules/$kernelVersion/misc + find . -type f | xargs sed -i -e "s|-o root||g" \ + -e "s|-g root||g" + make install + cd .. + done + ''; # */ + meta = { description = "Guest additions for VirtualBox"; longDescriptions = '' @@ -129,5 +129,6 @@ stdenv.mkDerivation { ''; license = "GPL"; maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; }; } From 36f0a97fc60d84c0cd59532b8687a445b1433ca2 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 6 Aug 2012 01:49:37 +0400 Subject: [PATCH 0638/1120] atool: add archiver helper --- pkgs/tools/archivers/atool/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/archivers/atool/default.nix diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix new file mode 100644 index 000000000000..d376f75a552c --- /dev/null +++ b/pkgs/tools/archivers/atool/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation rec { + name = "atool-0.39"; + src = fetchurl { + url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz; + sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; + }; + + buildInputs = [ perl ]; + + meta = { + homepage = http://www.nongnu.org/atool; + description = "Archive command line helper"; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 743acccefb0b..a5c331aa5a89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -492,6 +492,8 @@ let inherit (haskellPackages) pandoc; }; + atool = callPackage ../tools/archivers/atool { }; + bzip2 = callPackage ../tools/compression/bzip2 { }; cabextract = callPackage ../tools/archivers/cabextract { }; From b229c3e09f7a967f161e15b290cd3874977bb0b8 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 14 Aug 2012 14:50:25 +0400 Subject: [PATCH 0639/1120] gxneur: add frontend for XNEUR keyboard layout switcher --- pkgs/applications/misc/gxneur/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/gxneur/default.nix diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix new file mode 100644 index 000000000000..520b8304f63f --- /dev/null +++ b/pkgs/applications/misc/gxneur/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: + +stdenv.mkDerivation { + name = "gxneur-0.13.0"; + + src = fetchurl { + url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; + sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; + }; + + buildInputs = [ + xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 + libglade GConf pcre + ]; + + preConfigure = '' + sed -e 's@-Werror@@' -i configure + sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c + ''; + + meta = { + description = "GUI for XNEUR keyboard layout switcher"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5c331aa5a89..50be081452bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7819,10 +7819,16 @@ let xineUI = callPackage ../applications/video/xine-ui { }; - xneur = callPackage ../applications/misc/xneur { }; + xneur_0_13 = callPackage ../applications/misc/xneur { }; xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; + xneur = xneur_0_13; + + gxneur = callPackage ../applications/misc/gxneur { + inherit (gnome) libglade GConf; + }; + xournal = callPackage ../applications/graphics/xournal { inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; }; From 7ef3f9dd2a757e29f9a11ec95d9a5a4a196c5b08 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sun, 12 Feb 2012 15:06:32 +0400 Subject: [PATCH 0640/1120] xfce-gvfs: add fuse to buildInputs Passing fuse to gvfs results in building gvfs-fuse-daemon, which makes it possible to access gvfs mounts via ~/.gvfs folder. --- pkgs/desktops/xfce-4.8/support/gvfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index 6e50e6825dd6..33f7315a9d9b 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }: stdenv.mkDerivation rec { name = "gvfs-1.8.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; }; - buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu ]; + buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ]; meta = { description = "Virtual Filesystem support library (for Xfce)"; From eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 15 Aug 2012 09:56:13 +0200 Subject: [PATCH 0641/1120] automake: Disabling tests on mips. There is a test that fails on mips, and that breaks the nix build. The text does not exist anymore in automake upstream git, so the next version may not need this mips-specific disabling. --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 ++- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 7c9d06baa543..1e93593d7943 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; - inherit doCheck; + # Bug in a test in automake. Upstream git already fixed it removing the test. + doCheck = if stdenv.isMips then false else doCheck; # Disable indented log output from Make, otherwise "make.test" will # fail. diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index e2db84d2fc34..66d43974f6e4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { sed -i -e 's|t/aclocal7.sh||' Makefile.in ''; - inherit doCheck; + # Bug in a test in automake. Upstream git already fixed it removing the test. + doCheck = if stdenv.isMips then false else doCheck; # The test suite can run in parallel. enableParallelBuilding = true; From 61817876fc703e1e4ffad74fb3a8c755ef3c3c8f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 15 Aug 2012 10:13:02 +0200 Subject: [PATCH 0642/1120] Revert "automake: Disabling tests on mips." Causes infinite recursion on all other platforms. This reverts commit eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168. --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 +-- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 1e93593d7943..7c9d06baa543 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; - # Bug in a test in automake. Upstream git already fixed it removing the test. - doCheck = if stdenv.isMips then false else doCheck; + inherit doCheck; # Disable indented log output from Make, otherwise "make.test" will # fail. diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 66d43974f6e4..e2db84d2fc34 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's|t/aclocal7.sh||' Makefile.in ''; - # Bug in a test in automake. Upstream git already fixed it removing the test. - doCheck = if stdenv.isMips then false else doCheck; + inherit doCheck; # The test suite can run in parallel. enableParallelBuilding = true; From 443d65df3462abb57e9f87766c5c3fb895a7f0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 15 Aug 2012 10:28:31 +0200 Subject: [PATCH 0643/1120] automake: disabling automake tests in mips (2nd attempt) As explained in my previous attempt: There is a test that fails on mips, and that breaks the nix build. The text does not exist anymore in automake upstream git, so the next version may not need this mips-specific disabling. --- 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 50be081452bb..8c38e72a7db2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2890,7 +2890,7 @@ let automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { - doCheck = !stdenv.isArm && !stdenv.isCygwin + doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. && stdenv.system != "i686-solaris" @@ -2899,7 +2899,7 @@ let }; automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { - doCheck = !stdenv.isArm && !stdenv.isCygwin + doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. && stdenv.system != "i686-solaris"; }; From 10aa2bd5c389638937587393d8f5f400cb2b0066 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 15 Aug 2012 05:58:25 -0400 Subject: [PATCH 0644/1120] Update autobuild URL Only tested building autobuild.src, succeeds now, failed before. Fixes #99. --- pkgs/development/tools/misc/autobuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 872dcb6c84cd..f8497b5deced 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "autobuild-3.5"; src = fetchurl { - url = "http://josefsson.org/autobuild/releases/${name}.tar.gz"; + url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz"; sha256 = "0ik13913x1yj8lsaf65chpiw13brl3q6kx7s1fa41a7s2krl1xvi"; }; From 05ed13dc49642b26585d3035bac2e576b95dfeda Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 16 Aug 2012 12:00:04 +0200 Subject: [PATCH 0645/1120] linux-3.5: upgrade to 3.5.2 --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index a34badc8a041..8e347595f220 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.5.1"; + version = "3.5.2"; testing = false; preConfigure = '' @@ -249,7 +249,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "08rmhcgcxhwxv3cnnbhc86mvjmxkdk3aay4db6jbn90jlzf7kclz"; + sha256 = "13dzx7gqm0n7s73bq87ibhmydrfsngyps9sczkcy1sh56rrkv0x6"; }; config = configWithPlatform stdenv.platform; From 03228d60fe25ad7110b55eb2ab01231d57d06631 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 16 Aug 2012 12:00:25 +0200 Subject: [PATCH 0646/1120] linux-3.5: upgrade aufs3 patch to latest stable --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e9cd15bb31ce..12f9569ce10d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -177,13 +177,13 @@ rec { aufs3_5 = rec { name = "aufs3.5"; - version = "3.5"; + version = "3.5.20120813"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "4a5e660ed7f5c1d0467c81c535d0fedcfe62d15f"; - sha256 = "c474573fc03725053e68db481478be74de98abe2c23be60fe08e2f5f2ab3b188"; + rev = "85b5f7059bc8a1759989408a13fc56f92e0d6d31"; + sha256 = "2be13407a2291c7e69658f10a6fb7672751c906a27ac700a2e5e05dbada97cc5"; }; features.aufsBase = true; features.aufs3 = true; From a72e2a076dee2d7fecc2501087693cabf8bdc920 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:35:34 +0200 Subject: [PATCH 0647/1120] haskell-text: update to version 0.11.2.3 --- .../libraries/haskell/text/{0.11.2.2.nix => 0.11.2.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/text/{0.11.2.2.nix => 0.11.2.3.nix} (80%) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.2.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix similarity index 80% rename from pkgs/development/libraries/haskell/text/0.11.2.2.nix rename to pkgs/development/libraries/haskell/text/0.11.2.3.nix index a4dc9f882773..e1f0c6ea72d3 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.2.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "text"; - version = "0.11.2.2"; - sha256 = "0ch0fiwjwkpiwamfxxbcka2gp6lbwpqcv7pmik6qm850163f4i33"; + version = "0.11.2.3"; + sha256 = "0jrl3qbi91gkcnws9crsa59jsmmbjy91fwvl07qka9m48nq3f9rm"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/bos/text"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a40423c9986..3e04f18c3ae2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix = self.regexPosix_0_95_1; # 7.5 fail stm = self.stm_2_4; # 7.5 ok syb = self.syb_0_3_7; # 7.5 ok - text = self.text_0_11_2_2; # 7.5 ok + text = self.text_0_11_2_3; # 7.5 ok transformers = self.transformers_0_3_0_0; # 7.5 ok xhtml = self.xhtml_3000_2_1; # 7.5 ok zlib = self.zlib_0_5_3_3; # 7.5 fail @@ -1478,8 +1478,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {}; text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; - text_0_11_2_2 = callPackage ../development/libraries/haskell/text/0.11.2.2.nix {}; - text = self.text_0_11_2_2; + text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; + text = self.text_0_11_2_3; thespian = callPackage ../development/libraries/haskell/thespian {}; From cf7be765260467fe1a3e597ad87c86766604639a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0648/1120] haskell-ListLike: update to version 3.1.6 --- pkgs/development/libraries/haskell/ListLike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index f0b1ccd8bc04..58595edf744a 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "3.1.5"; - sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs"; + version = "3.1.6"; + sha256 = "0ij6yb80dv841zn23lp6251avzmljzmy4j25r7w6h55y32y7gq46"; isLibrary = true; isExecutable = true; meta = { From 5bbf9d5b2540b9d910f2185b18877be077bb0efe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0649/1120] haskell-attoparsec-enumerator: update to version 0.3.1 --- pkgs/development/libraries/haskell/attoparsec/enumerator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix index ee4b42a49bd1..d52687d80801 100644 --- a/pkgs/development/libraries/haskell/attoparsec/enumerator.nix +++ b/pkgs/development/libraries/haskell/attoparsec/enumerator.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-enumerator"; - version = "0.3"; - sha256 = "1sfqcr1mvny9gf0zzggwvs2b20knxrbb208rzaa86ay0b5b5jw5v"; + version = "0.3.1"; + sha256 = "10h6i23vhcishp599s4lbp0c46wcba99w6iv4ickdr1avrm9z2m7"; buildDepends = [ attoparsec enumerator text ]; meta = { homepage = "https://john-millikin.com/software/attoparsec-enumerator/"; From 3f857bd69ced2dd91fafae6c6df5fc45bef4f513 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0650/1120] haskell-authenticate: update to version 1.3.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 9620fb9ecc59..dc0ce313eff0 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.0.1"; - sha256 = "12s1ri2k0hmaws1rnr4s8ck1wa14lhcih0pzi89hjh7jh8si3dl3"; + version = "1.3.1"; + sha256 = "1ad3vzfa7nvp8h8wk5370d2qyri0nywq1wjdvqas2mg4iv7v7271"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From d2347755e0df89fb9b66a91fcd3a4f735178e65e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0651/1120] haskell-certificate: update to version 1.2.5 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 1f2cdd40238f..6581ddf0e1ab 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.4"; - sha256 = "079364567cshfj2bc0lbj933jcgdqisvv8m0czlyscb4hd10vfg7"; + version = "1.2.5"; + sha256 = "1zxi1hflq973m7a1c9wvxdx8aqapx1kqy8j7nn7k67l9gpjb1jbc"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; From dc745663eb8e2690f0347750a13756d865306617 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0652/1120] haskell-criterion: update to version 0.6.1.1 --- pkgs/development/libraries/haskell/criterion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index a687a592baa6..54b6b20dc836 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "criterion"; - version = "0.6.0.1"; - sha256 = "0k6ip41w5h1z8gl67a8vsb6c3md5nc4yh1vd6dysp9fqgn0vky0a"; + version = "0.6.1.1"; + sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms From f6b2363b729fe705d7c5db831c8b5dbb5ca34d6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:21 +0200 Subject: [PATCH 0653/1120] haskell-fast-logger: update to version 0.2.2 --- pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 6491515624a0..74f78e72af24 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.2.1"; - sha256 = "12avan85dkwipp8hqsya8yslirykz2yvqmns3wjhwl9j30idj7r3"; + version = "0.2.2"; + sha256 = "1r1fk0lqmh49v24wnx236x9cz122c8806y9mrxnaihxggw4anj0x"; buildDepends = [ blazeBuilder filepath text unixTime ]; meta = { description = "A fast logging system"; From e9ac89975a95d801c025a77fef8043e98372fe4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0654/1120] haskell-hashable: update to version 1.1.2.5 --- pkgs/development/libraries/haskell/hashable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index c706b020fef6..96fe7ae0eb13 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.1.2.3"; - sha256 = "19v94b34c2j6f9d9xii2hg0mjxdkq51aifkcqw6hbicn97kfcxls"; + version = "1.1.2.5"; + sha256 = "0gbiaj5ck2bvvinndp2pg7qsm2h2izbnz9wi97dbm7i8r4qd9d9z"; buildDepends = [ text ]; meta = { homepage = "http://github.com/tibbe/hashable"; From 75506e4005bc5abd4f57ba64b2b7cb8736f3bc0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0655/1120] haskell-http-conduit: update to version 1.6.0 --- 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 6d1c7a28a222..9c0efe3f05c3 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.5.0.3"; - sha256 = "1l00wyisb5jkq1c2ikzq0iwhjx6s66bz5s8gricfbrr15bdx1iay"; + version = "1.6.0"; + sha256 = "1vr4kglmlqn6s31ks231qx4b8034p6yi0501h3zswpqyf5cimhl7"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From 3999d82a405e2c3d2229aa8416fb2c1f02ede202 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0656/1120] haskell-http-types: update to version 0.7.2 --- 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 2dcd97e0aef0..27216b3e970c 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.1"; - sha256 = "1vfaffraiqdsjbw4b0xwk8h8d4pl94mbxlwyqk8ry786v9aafyqx"; + version = "0.7.2"; + sha256 = "06yvjq4246sp6gfillwbk6xz1d9l0zq06qy70a5zdyaw6viz2h76"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From f1a5724ae86c45f9d2ca8ba30c2c0acd917e833a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0657/1120] haskell-mwc-random: update to version 0.12.0.1 --- pkgs/development/libraries/haskell/mwc-random/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 27dabe57f322..1e2d56147c33 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.12.0.0"; - sha256 = "0c1gzf5nkcbfi2zlhh7ly8b4g2gcr0c1b76awk38g9as9qibgivr"; + version = "0.12.0.1"; + sha256 = "1sq4yxi231ka8rzwsihqziibs7amvl27ycr018wymm3yz36vsy7c"; buildDepends = [ primitive time vector ]; meta = { homepage = "https://github.com/bos/mwc-random"; From 55c100564d00c25b62106072425e6c5278efcf12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0658/1120] haskell-simple-sendfile: update to version 0.2.6 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 766e1ef96171..20bdca91bb3a 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.5"; - sha256 = "1g9plryh86lc03rf1s8m36wyc2yqp4y6f02viq9c4g1k85rkbs53"; + version = "0.2.6"; + sha256 = "1bv8lmpp1h89kx614ijyi5kyqsf4nj75zdarjwxm7is6ixp3rnha"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; From ad78f754347dec3d69587134c9b67650d4b9195e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:22 +0200 Subject: [PATCH 0659/1120] haskell-tls: update to version 0.9.9 --- 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 3a225361fb32..d440d9422773 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 = "0.9.8"; - sha256 = "022hak5wy47j4zpf2f89zvz4j2586s3d0a5jkxvz54dkqimy63r6"; + version = "0.9.9"; + sha256 = "0l29ja7mcyykj4dh7awjbrb9aswgarxls71vk68pdfaz047jsvx6"; isLibrary = true; isExecutable = true; buildDepends = [ From bc9d3787e24a97fae3eb76727d1b33bb71199aa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:23 +0200 Subject: [PATCH 0660/1120] haskell-unordered-containers: update to version 0.2.2.0 --- .../libraries/haskell/unordered-containers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 21ec0c92b06f..e6ff0dd64b90 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.1.0"; - sha256 = "0zk2ip32h6faqa1pfmiw242fdarr63lds4j828ix7qhrjifwiw4p"; + version = "0.2.2.0"; + sha256 = "1418vr7swk2p1xjxyj86arln6niwgpfjfqdknnkh31m4h83f0q5r"; buildDepends = [ deepseq hashable ]; meta = { description = "Efficient hashing-based container types"; From 100e13fca71047f595ff144fb519ef70aaa0ffb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:23 +0200 Subject: [PATCH 0661/1120] haskell-vector-algorithms: update to version 0.5.4.1 --- .../libraries/haskell/vector-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index f98cc09918a5..2704942b3609 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.5.4"; - sha256 = "0j16jmnmgksbzsq2vvxjmciywi91clak77i6zjjghvn9dpmnsmv2"; + version = "0.5.4.1"; + sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng"; buildDepends = [ primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; From f8914fa177aeba3c7c1711aaa451aec9ed40afb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:23 +0200 Subject: [PATCH 0662/1120] haskell-yesod-auth: update to version 1.1.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index e1a396287c81..fdb6b0e3f605 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.0.1"; - sha256 = "1zidw47yvsvbgi70lhbl1lxgqp3zzgbbjnyz3pcvyahy81cny423"; + version = "1.1.1"; + sha256 = "03zywcdv8kb0h8hpdg1zb3c10s6y6j3gg64n8w970f0izi93haxv"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 From cf2071e9c018daa083858c67ca7b5b62402d58cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:41:23 +0200 Subject: [PATCH 0663/1120] haskell-yesod: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 9a9e9d9c9e88..2e0a16fb3b28 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.0"; - sha256 = "01jwp9i77rmk4iwjqri9jafm809nzlb5bvgyz5my8dnpcfvnf2sz"; + version = "1.1.0.1"; + sha256 = "03r4w2pax8ikdk3ah744pninpk82cylkccg69dl2xr2546m2alh2"; isLibrary = true; isExecutable = true; buildDepends = [ From 7ab915da5258bde53b4eff567f7506ca628143eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:48:18 +0200 Subject: [PATCH 0664/1120] scala: enable 'fixupPhase' (among other things) which corrects the shebang paths of the installed scripts --- pkgs/development/compilers/scala/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 340076cc1378..884efb2e015a 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { mv * $out ''; - phases = "unpackPhase installPhase"; - meta = { description = "Scala is a general purpose programming language"; longDescription = '' From 2253afb4f1ba8fdae9c88e5a32e06f2db5de6740 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Aug 2012 15:49:00 +0200 Subject: [PATCH 0665/1120] scala: cosmetic --- pkgs/development/compilers/scala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 884efb2e015a..a78ee06f652d 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - rm bin/*.bat + rm "bin/"*.bat mv * $out ''; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { common programming patterns in a concise, elegant, and type-safe way. It smoothly integrates features of object-oriented and functional languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when + Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; From d339184bbf05fe6ee93369625dd2c9e5e69005e5 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 15 May 2012 01:43:46 +0400 Subject: [PATCH 0666/1120] zathura: version 0.1.2 with plugins Expression handles new modular structure of zathura and adds support for djvu, pdf and ps plugins. --- pkgs/applications/misc/girara/default.nix | 26 ++++++++ pkgs/applications/misc/zathura/builder.sh | 11 ++++ .../misc/zathura/core/default.nix | 29 +++++++++ pkgs/applications/misc/zathura/default.nix | 60 ++++++++++++------- .../misc/zathura/djvu/default.nix | 28 +++++++++ .../misc/zathura/djvu/gtkflags.patch | 23 +++++++ .../misc/zathura/pdf-poppler/default.nix | 25 ++++++++ pkgs/applications/misc/zathura/ps/default.nix | 28 +++++++++ .../misc/zathura/ps/gtkflags.patch | 25 ++++++++ pkgs/top-level/all-packages.nix | 8 ++- 10 files changed, 239 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/misc/girara/default.nix create mode 100644 pkgs/applications/misc/zathura/builder.sh create mode 100644 pkgs/applications/misc/zathura/core/default.nix create mode 100644 pkgs/applications/misc/zathura/djvu/default.nix create mode 100644 pkgs/applications/misc/zathura/djvu/gtkflags.patch create mode 100644 pkgs/applications/misc/zathura/pdf-poppler/default.nix create mode 100644 pkgs/applications/misc/zathura/ps/default.nix create mode 100644 pkgs/applications/misc/zathura/ps/gtkflags.patch diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix new file mode 100644 index 000000000000..074f70448cd2 --- /dev/null +++ b/pkgs/applications/misc/girara/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk, gettext }: + +stdenv.mkDerivation rec { + name = "girara-0.1.2"; + + src = fetchurl { + url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; + sha256 = "89231d0da3c790e0765ad85d74f64cf50051b8bafe6065882e34e378ab14ec99"; + }; + + buildInputs = [ pkgconfig gtk gettext ]; + + makeFlags = "PREFIX=$(out)"; + + meta = { + homepage = https://pwmt.org/girara/; + description = "User interface library"; + longDescription = '' + girara is a library that implements a GTK+ based VIM-like user interface + that focuses on simplicity and minimalism. + ''; + license = "free"; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/zathura/builder.sh b/pkgs/applications/misc/zathura/builder.sh new file mode 100644 index 000000000000..9ca45b2cc992 --- /dev/null +++ b/pkgs/applications/misc/zathura/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +mkdir -pv $out/bin/ + +cat > $out/bin/zathura < Date: Thu, 16 Aug 2012 18:33:25 +0400 Subject: [PATCH 0667/1120] zathura: fix broken links in meta information --- pkgs/applications/misc/girara/default.nix | 2 +- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- pkgs/applications/misc/zathura/default.nix | 2 +- pkgs/applications/misc/zathura/djvu/default.nix | 2 +- pkgs/applications/misc/zathura/pdf-poppler/default.nix | 2 +- pkgs/applications/misc/zathura/ps/default.nix | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 074f70448cd2..2fa36b33eb06 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = https://pwmt.org/girara/; + homepage = http://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' girara is a library that implements a GTK+ based VIM-like user interface diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8b23fba5e270..0c58965fc19f 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = https://pwmt.org/zathura/; - description = "A core component for zathura PDF viewer"; + homepage = http://pwmt.org/projects/zathura/; + description = "A core component for zathura PDF viewer"; license = "free"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 17ce88a82031..b5ba4f9ada75 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -26,7 +26,7 @@ rec { builder = ./builder.sh; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 9d3ff5da4822..c4656e732364 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 0d7b4cc830f8..17e00b4e6220 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura PDF plugin"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 7c733e5380d4..ae9aeee7715e 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib"; meta = { - homepage = https://pwmt.org/zathura/; + homepage = http://pwmt.org/projects/zathura/; description = "A zathura PS plugin"; longDescription = '' - The zathura-ps plugin adds PS support to zathura by using the - libspectre library. - ''; + The zathura-ps plugin adds PS support to zathura by using the + libspectre library. + ''; license = "free"; platforms = stdenv.lib.platforms.linux; }; From a54734e0876bde6372d60ada96c046ba85864546 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2012 10:40:12 -0400 Subject: [PATCH 0668/1120] vmTools: Provide hook to add more Samba shares --- pkgs/build-support/vm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 6af4a5c05748..777cc72aa0b2 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -250,6 +250,7 @@ rec { path = $TMPDIR/xchg read only = no guest ok = yes + $EXTRA_SAMBA_CONF SMB rm -f ./samba From ca84b7ff22a68090156564f992bd572f0335965a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 16 Aug 2012 19:39:57 +0400 Subject: [PATCH 0669/1120] uclibcCross: convert to using callPackage It doesn't add any unwanted defaults, and it makes cross-building experiments (and cross-building for a new device is always experimental..) way easier. --- 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 694937855151..d47fe294e229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6113,7 +6113,7 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; - uclibcCross = import ../os-specific/linux/uclibc { + uclibcCross = callPackage ../os-specific/linux/uclibc { inherit fetchurl stdenv libiconv; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; From 548365b95c310fff8c7d3cfa57860db7f853e3c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2012 15:36:25 -0400 Subject: [PATCH 0670/1120] lvm2: Update to 2.02.97 --- pkgs/os-specific/linux/lvm2/default.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 3411bc83d8a0..1ebebfd634b7 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.95"; + v = "2.02.97"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; - sha256 = "09cixpdrbzjybf8k8f0rsgkriyvbaj2acmfsg1bzxnjil4vayd83"; + sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd"; }; configureFlags = @@ -17,11 +17,28 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig udev ]; - patches = [ ./purity.patch ]; + preConfigure = + '' + substituteInPlace scripts/lvmdump.sh \ + --replace /usr/bin/tr ${coreutils}/bin/tr + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/sbin/lvm $out/sbin/lvm + ''; + + #patches = [ ./purity.patch ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + # Install systemd stuff. + #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; + + postInstall = + '' + substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ + --replace $out/sbin/blkid ${utillinux}/sbin/blkid + ''; + meta = { homepage = http://sourceware.org/lvm2/; descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; From b06cb3578d4ec2b76dcf2ad04486f3a1420c6c72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2012 15:46:20 -0400 Subject: [PATCH 0671/1120] systemd: Drop dependency on cryptsetup for now This is necessary to prevent a cyclic dependency. --- pkgs/os-specific/linux/systemd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b6497e0b0b3e..4cda7191e4a2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl - cryptsetup libuuid m4 usbutils pciutils glib + /* cryptsetup */ libuuid m4 usbutils pciutils glib ]; configureFlags = @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { done ''; - # ‘-fstack-protector’ is necessary to build the PAM module correctly. - NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fstack-protector"; + NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fno-stack-protector"; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; From f27f8a11776840fe32c1042cbe27ee3c21dced12 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 16 Aug 2012 16:31:44 -0400 Subject: [PATCH 0672/1120] xpdf: Don't use t1lib t1lib has multiple unpatched vulnerabilities (see e.g. http://rhn.redhat.com/errata/RHSA-2012-0062.html). --- pkgs/applications/misc/xpdf/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index d653c9728504..5218df775955 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,4 +1,4 @@ -{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true +{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: @@ -7,6 +7,8 @@ assert enableGUI -> x11 != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; +assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities + stdenv.mkDerivation { name = "xpdf-3.03"; From 5a146e9cff0b7bf9a42392f386474cd0d7f8d4cd Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 17 Aug 2012 08:55:47 +0200 Subject: [PATCH 0673/1120] emacs: add "color-theme" --- .../emacs-modes/color-theme/default.nix | 26 +++++++++++++++++ .../emacs-modes/color-theme/fix-build.patch | 19 +++++++++++++ .../emacs-modes/color-theme/gnus-bug.diff | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 75 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/color-theme/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch create mode 100644 pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix new file mode 100644 index 000000000000..9cc0e7fd42b2 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "color-theme-6.6.0"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz"; + sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn"; + }; + + # patches from http://aur.archlinux.org/packages.php?ID=54883 + patches = [ ./fix-build.patch ./gnus-bug.diff ]; + + buildInputs = [ emacs ]; + + installFlags = [ "ELISPDIR=$(out)/share/emacs/site-lisp" ]; + installTargets = "install-bin"; + + meta = { + description = "An emacs-lisp mode for skinning your emacs."; + homepage = http://www.nongnu.org/color-theme; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch new file mode 100644 index 000000000000..cfc237c8cdc1 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/fix-build.patch @@ -0,0 +1,19 @@ +--- a/Makefile 2009-05-15 18:22:49.000000000 +0200 ++++ b/Makefile 2009-05-16 08:59:36.000000000 +0200 +@@ -15,6 +15,7 @@ + TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE)) + MANUAL = color-theme + MISC = AUTHORS COPYING ChangeLog Makefile.defs Makefile $(AUTOLOADFILE).in ++LOADPATH = "$(shell pwd)" "$(shell pwd)/themes" + #AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \ + #ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \ + #ChangeLog.2001 servers.pl color-theme-auto.in color-theme.texi +@@ -47,7 +48,7 @@ + + %.elc: %.el + @$(EMACS) $(OPTIONCOMPILE) \ +- --eval '(setq load-path (cons "." load-path))' \ ++ --eval '(setq load-path (append load-path (list $(LOADPATH))))' \ + -f batch-byte-compile $< + + %.info: %.texi diff --git a/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff new file mode 100644 index 000000000000..9d227df562e1 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme/gnus-bug.diff @@ -0,0 +1,28 @@ +diff -Naur color-theme-6.6.0.orig/color-theme.el color-theme-6.6.0.new/color-theme.el +--- color-theme-6.6.0.orig/color-theme.el 2011-11-18 01:17:29.000000000 +0100 ++++ color-theme-6.6.0.new/color-theme.el 2011-11-18 01:24:07.000000000 +0100 +@@ -73,9 +73,10 @@ + "Non-nil if running XEmacs.") + + ;; Add this since it appears to miss in emacs-2x +-(or (fboundp 'replace-in-string) +- (defun replace-in-string (target old new) +- (replace-regexp-in-string old new target))) ++(if (fboundp 'replace-in-string) ++ (defalias 'color-theme-replace-in-string 'replace-in-string) ++ (defsubst color-theme-replace-in-string (target old new &optional literal) ++ (replace-regexp-in-string old new target nil literal))) + + ;; face-attr-construct has a problem in Emacs 20.7 and older when + ;; dealing with inverse-video faces. Here is a short test to check +@@ -1626,8 +1627,8 @@ + (add-to-list 'color-themes + (list ',n + (upcase-initials +- (replace-in-string +- (replace-in-string ++ (color-theme-replace-in-string ++ (color-theme-replace-in-string + (symbol-name ',n) "^color-theme-" "") "-" " ")) + ,author)) + (defun ,n () diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d47fe294e229..d703732f9678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6674,6 +6674,8 @@ let coffee = callPackage ../applications/editors/emacs-modes/coffee { }; + colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; + cua = callPackage ../applications/editors/emacs-modes/cua { }; ecb = callPackage ../applications/editors/emacs-modes/ecb { }; From 019fc2d03d36c4190a25fa259b03736ec344b4f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Aug 2012 11:07:14 +0200 Subject: [PATCH 0674/1120] haskell-happstack-hamlet: fix build in presence for recent versions of hamlet --- .../libraries/haskell/happstack/happstack-hamlet.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 6c105b1e4763..7b2c937bd069 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "7.0.1"; sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n"; buildDepends = [ hamlet happstackServer text ]; + patchPhase = '' + sed -i -e 's|hamlet .*,|hamlet,|' happstack-hamlet.cabal + ''; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; From 483fcf47a5ef4b238c58851bff79ed11bbe87f09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Aug 2012 12:52:37 +0200 Subject: [PATCH 0675/1120] haskell-case-insensitive: update to version 0.4.0.2 --- .../libraries/haskell/case-insensitive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 4187716f0267..4b2305f31ac2 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.1"; - sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7"; + version = "0.4.0.2"; + sha256 = "1awr74lxmcpjkz099mcfk3372q4l7apar0pjxr4d2rgsvi5yx8jd"; buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; From 79883d78c8777d5729b0ba9373fc0f46b134f2de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Aug 2012 12:52:37 +0200 Subject: [PATCH 0676/1120] haskell-lifted-base: update to version 0.1.2 --- pkgs/development/libraries/haskell/lifted-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index ba5e580ada06..09264ab57f44 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.1.1.1"; - sha256 = "1cfk3n12qhyrrfvw410gfydbgmb7r9y65fsjp2r3c4ilcyd5li70"; + version = "0.1.2"; + sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; From 6d6189082b67365d5d03a62a77b4374f2d033fcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Aug 2012 12:52:37 +0200 Subject: [PATCH 0677/1120] haskell-skein: update to version 0.1.0.8 --- 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 143bf530d097..5a4afd9309bc 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.7"; - sha256 = "13yhbp17iq30cjh9fid3l0wkyvpj0f1b1bak9s7gfj96basg9ig2"; + version = "0.1.0.8"; + sha256 = "0d0xrrcagf663rn37gpr13jyvfm7rnil18mz4miavb4hwzni46rm"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; From dad33bbfe5201261039743507e2e38401dc1c450 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Aug 2012 12:52:38 +0200 Subject: [PATCH 0678/1120] haskell-uu-parsinglib: update to version 2.7.3.4 --- pkgs/development/libraries/haskell/uu-parsinglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 8e2ad732aa27..1bb3cb76dac9 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uu-parsinglib"; - version = "2.7.3.2"; - sha256 = "0z53s9wvk57g3d9x3iswjydwm7nw5vfrj7k08v75fw6rwldkal60"; + version = "2.7.3.4"; + sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; From 6968400a3431626ca06a81fb01635584986085a4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Aug 2012 12:42:51 +0200 Subject: [PATCH 0679/1120] chromium: Check sha256 per channel in update.sh. Until this commit we had a single hash of the whole version response from omahaproxy. This worked well for not updating unnecessarily but only until one single channel has a new version available. Unfortunately the dev version is released quite frequently, so the hash is of no use at all (we could rather directly fetch everything everytime we execute the script). This led to this commit, which adds two methods of caching: First of all, if a perticular version/channel is already in the previous version of the sources.nix file, don't download it again. And the second method is to check if the current sha256 is already downloaded and reads the corresponding sha256 from the lookup table. So, this should really help to avoid flooding the download servers and to not stress impatient users too much. --- .../networking/browsers/chromium/update.sh | 103 ++++++++++++++---- 1 file changed, 83 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index c9dd69df9a20..4721ded385ae 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -4,16 +4,92 @@ channels_url="http://omahaproxy.appspot.com/"; bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/"; output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix"; -get_channels() +nix_getattr() +{ + input_file="$1"; + attr="$2"; + + var="$(nix-instantiate --eval-only -A "$attr" "$output_file")"; + echo "$var" | tr -d '\\"'; +} + +### poor mans key/value-store :-) ### + +ver_sha_table=""; # list of version:sha256 + +sha_lookup() +{ + version="$1"; + + for ver_sha in $ver_sha_table; + do + if [ "x${ver_sha%:*}" = "x$version" ]; + then + echo "${ver_sha##*:}"; + return 0; + fi; + done; + + return 1; +} + +sha_insert() +{ + version="$1"; + sha256="$2"; + + ver_sha_table="$ver_sha_table $version:$sha256"; +} + +if [ -e "$output_file" ]; +then + get_sha256() + { + channel="$1"; + version="$2"; + url="$3"; + + oldver="$(nix_getattr "$output_file" "$channel.version")"; + + echo -n "Checking if $oldver ($channel) is up to date..." >&2; + + if [ "x$version" != "x$oldver" ]; + then + echo " no, getting sha256 for new version $version:" >&2; + sha256="$(nix-prefetch-url "$url")"; + else + echo " yes, keeping old sha256." >&2; + sha256="$(nix_getattr "$output_file" "$channel.sha256")"; + fi; + + sha_insert "$version" "$sha256" + echo "$sha256"; + } +else + get_sha256() + { + nix-prefetch-url "$url"; + } +fi; + +get_channel_exprs() { for chline in $(echo "$1" | cut -d, -f-2); do channel="${chline%%,*}"; version="${chline##*,}"; - url="${bucket_url%/}/chromium-$version.tar.bz2"; - sha256="$(nix-prefetch-url "$url")"; + echo -n "Checking if sha256 of version $version is cached..." >&2; + if sha256="$(sha_lookup "$version")"; + then + echo "yes: $sha256" >&2; + else + echo "no." >&2; + sha256="$(get_sha256 "$channel" "$version" "$url")"; + fi; + + sha_insert "$version" "$sha256"; echo " $channel = {"; echo " version = \"$version\";"; @@ -25,26 +101,13 @@ get_channels() cd "$(dirname "$0")"; -versions="$(curl -s "$channels_url" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; - -if [ -e "$output_file" ]; -then - vhash="$(echo "$versions" | sha256sum | cut -d' ' -f1)"; - old_vhash="$(sed -n 's/# *VHASH: *//p' "$output_file")"; - - if [ "x$vhash" = "x$old_vhash" ]; - then - echo "$output_file is already up to date, bailing out." >&2; - exit 1; - fi; -fi; - -channels="$(get_channels "$versions")"; +omaha="$(curl -s "$channels_url")"; +versions="$(echo "$omaha" | sed -n -e 's/^linux,\(\([^,]\+,\)\{2\}\).*$/\1/p')"; +channel_exprs="$(get_channel_exprs "$versions")"; cat > "$output_file" <<-EOF # This file is autogenerated from update.sh in the same directory. -# VHASH: $vhash { -$channels +$channel_exprs } EOF From 4393fffcceda9e97f200770c7b32fd62036d3d13 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Aug 2012 12:54:04 +0200 Subject: [PATCH 0680/1120] chromium: Update channels to latest versions. This removes the now obsolete VHASH line in sources.nix aswell. --- .../networking/browsers/chromium/sources.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 740f0c609807..a250cda76102 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,19 +1,18 @@ # This file is autogenerated from update.sh in the same directory. -# VHASH: c9500486764a2433d0f059134a981eb9adccd3546a6f779bc0e05cdcb26d2ae6 { dev = { - version = "22.0.1221.1"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1221.1.tar.bz2"; - sha256 = "08cx2im0ng1dg83mk8jlx4in7v8f5vsf9y2ild0i22jb20c7h31s"; + version = "22.0.1229.8"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.8.tar.bz2"; + sha256 = "0gaa4mqvd0v4y587y6mri2f3b0rc8npmcbs9bfs4wwb8n1cp8kw0"; }; beta = { - version = "21.0.1180.57"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; - sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; + version = "21.0.1180.79"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2"; + sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8"; }; stable = { - version = "21.0.1180.57"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.57.tar.bz2"; - sha256 = "0idimvkrhs09x93hl8p7rddyb0ymk9f8i5jm6m3lg6ga959aj6ri"; + version = "21.0.1180.79"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2"; + sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8"; }; } From acdd81fb9c586a110b0986fd3fd4816357102a36 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Aug 2012 09:46:20 -0400 Subject: [PATCH 0681/1120] Add some packages to the channel --- pkgs/data/misc/hicolor-icon-theme/default.nix | 1 + pkgs/tools/misc/desktop-file-utils/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/data/misc/hicolor-icon-theme/default.nix b/pkgs/data/misc/hicolor-icon-theme/default.nix index e249dac1dc9c..553665396ec1 100644 --- a/pkgs/data/misc/hicolor-icon-theme/default.nix +++ b/pkgs/data/misc/hicolor-icon-theme/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = http://icon-theme.freedesktop.org/releases/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 4266f4ab768d..285160e50d61 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; description = "Command line utilities for working with .desktop files"; + platforms = stdenv.lib.platforms.linux; }; } From bc3865e41423343e45e14bfa0defbb1fe95d742b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Aug 2012 10:51:44 -0400 Subject: [PATCH 0682/1120] slim: Update to 1.3.4 --- .../display-managers/slim/pam.patch | 89 ------------------- .../display-managers/slim/pam2.patch | 20 ----- 2 files changed, 109 deletions(-) delete mode 100644 pkgs/applications/display-managers/slim/pam.patch delete mode 100644 pkgs/applications/display-managers/slim/pam2.patch diff --git a/pkgs/applications/display-managers/slim/pam.patch b/pkgs/applications/display-managers/slim/pam.patch deleted file mode 100644 index 2163d20a5e32..000000000000 --- a/pkgs/applications/display-managers/slim/pam.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -rc slim-1.3.1-orig/app.cpp slim-1.3.1/app.cpp -*** slim-1.3.1-orig/app.cpp 2008-09-26 02:54:15.000000000 +0200 ---- slim-1.3.1/app.cpp 2009-02-17 19:50:06.000000000 +0100 -*************** -*** 41,48 **** - Panel* panel = *static_cast(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; iresp=0; -! resp[i]->resp_retcode=0; - switch(msg[i]->msg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username ---- 41,48 ---- - Panel* panel = *static_cast(appdata_ptr); - int result = PAM_SUCCESS; - for (int i=0; imsg_style){ - case PAM_PROMPT_ECHO_ON: - // We assume PAM is asking for the username -*************** -*** 51,63 **** - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! resp[i]->resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! resp[i]->resp=strdup(panel->GetName().c_str()); - break; - } - break; ---- 51,63 ---- - case Panel::Suspend: - case Panel::Halt: - case Panel::Reboot: -! (*resp)[i].resp=strdup("root"); - break; - - case Panel::Console: - case Panel::Exit: - case Panel::Login: -! (*resp)[i].resp=strdup(panel->GetName().c_str()); - break; - } - break; -*************** -*** 73,79 **** - - default: - panel->EventHandler(Panel::Get_Passwd); -! resp[i]->resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; ---- 73,79 ---- - - default: - panel->EventHandler(Panel::Get_Passwd); -! (*resp)[i].resp=strdup(panel->GetPasswd().c_str()); - break; - } - break; -*************** -*** 89,97 **** - } - if (result!=PAM_SUCCESS){ - for (int i=0; iresp==0) continue; -! free(resp[i]->resp); -! resp[i]->resp=0; - }; - free(*resp); - *resp=0; ---- 89,97 ---- - } - if (result!=PAM_SUCCESS){ - for (int i=0; i Date: Fri, 17 Aug 2012 19:20:59 +0200 Subject: [PATCH 0683/1120] provides a better download url for the intel-microcode2ucode sources. --- pkgs/os-specific/linux/microcode/converter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix index ea00c7a6ae42..7b1ff08be0c3 100644 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ b/pkgs/os-specific/linux/microcode/converter.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "microcode2ucode-20120205"; src = fetchurl { - url = "http://gentoo-overlays.zugaina.org/gentoo/portage/sys-apps/microcode-data/files/intel-microcode2ucode.c"; + url = "sources.gentoo.org/sys-apps/microcode-data/files/intel-microcode2ucode.c"; sha256 = "c51b1b1d8b4b28e7d5d007917c1e444af1a2ff04a9408aa9067c0e57d70164de"; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation { homepage = http://www.intel.com; description = "Microcode converter for Intel .dat files"; }; -} \ No newline at end of file +} From 1e4c4b70b1e480673c188cc5c413206a216d4ac9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Aug 2012 11:33:37 -0400 Subject: [PATCH 0684/1120] slim: Really update to 1.3.4 --- .../display-managers/slim/default.nix | 32 ++++++++----------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index be546d76836b..0675b02a314e 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,39 +1,33 @@ -{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}: +{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu +, fontconfig, freetype, pam, consolekit, dbus_libs }: stdenv.mkDerivation rec { - name = "slim-1.3.2"; + name = "slim-1.3.4"; src = fetchurl { url = "http://download.berlios.de/slim/${name}.tar.gz"; - sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi"; + sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m"; }; patches = [ # Allow the paths of the configuration file and theme directory to # be set at runtime. ./runtime-paths.patch - - # Fix a bug in slim's PAM support: the "resp" argument to the - # conversation function is a pointer to a pointer to an array of - # pam_response structures, not a pointer to an array of pointers to - # pam_response structures. Of course C can't tell the difference... - ./pam.patch - - # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit - # (which assumes that a non-empty string means a remote session). - ./pam2.patch ]; - buildInputs = [x11 libjpeg libpng12 libXmu freetype pam]; + buildInputs = + [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype + pam dbus_libs + ] ++ stdenv.lib.optional (consolekit != null) consolekit; - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc"; - preBuild = '' - substituteInPlace Makefile --replace /usr /no-such-path - makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1) - ''; + cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1"; + + NIX_CFLAGS_LINK = "-lXmu"; meta = { homepage = http://slim.berlios.de; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d703732f9678..55e16d3d8798 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7520,7 +7520,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 1e1634604cd05ca46a1e54ffbb34402ab99ca122 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 17 Aug 2012 13:14:10 -0400 Subject: [PATCH 0685/1120] Compress-Raw-Zlib: Don't check on Darwin. Fixes #102 --- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 +++- pkgs/top-level/perl-packages.nix | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 4aa8b4ad8123..c2c7b5f83631 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPerlPackage, zlib }: +{ fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { name = "Compress-Raw-Zlib-2.051"; @@ -17,4 +17,6 @@ buildPerlPackage rec { GZIP_OS_CODE = AUTO_DETECT EOF ''; + + doCheck = !stdenv.isDarwin; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d33f5a78b8fc..8ef55d3ff4cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -827,7 +827,7 @@ rec { }; CompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib { - inherit fetchurl buildPerlPackage; + inherit fetchurl buildPerlPackage stdenv; inherit (pkgs) zlib; }; From b8be9b54f31e8b932dce73b275456311303a096b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Aug 2012 16:09:13 -0400 Subject: [PATCH 0686/1120] samba: Update to 3.6.7 --- pkgs/servers/samba/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 3a3051e29bff..7a73a0417982 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,16 +18,15 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.5"; + name = "samba-3.6.7"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "1i40mf5rvz055zp7fy5rqp1lwlsm65g8k6n8jxw5w5f1p3rmzxla"; + sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q"; }; patches = - [ - # Allow cross-builds for GNU/Hurd. + [ # Allow cross-builds for GNU/Hurd. ./libnss-wins-pthread.patch ]; From 911e9f3f43231ea8c76afb9afeb700739d633daa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Aug 2012 18:11:53 -0400 Subject: [PATCH 0687/1120] DBD::SQLite: Don't install a copy of the SQLite sources This saves almost 5 MB. --- pkgs/development/perl-modules/DBD-SQLite/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 4cc2eb6a01ce..bbe50182b903 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -17,8 +17,14 @@ buildPerlPackage rec { ./external-sqlite.patch ]; - # Prevent warnings from `strip'. - postInstall = "chmod -R u+w $out"; + postInstall = + '' + # Prevent warnings from `strip'. + chmod -R u+w $out + + # Get rid of a pointless copy of the SQLite sources. + rm -rf $out/lib/perl5/site_perl/*/*/auto/share + ''; # Disabled because the tests can randomly fail due to timeouts # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). From b32844654b6dafc5d9115ec6261b17eb2df43649 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 18 Aug 2012 20:52:52 +0400 Subject: [PATCH 0688/1120] Julia: update source revision --- pkgs/development/compilers/julia/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index d0231adb73d1..2484be9ae1f7 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,14 +7,14 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120801"; + date = "20120818"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; dsfmt_ver = "2.1"; openblas_ver = "v0.2.2"; lapack_ver = "3.4.1"; - arpack_ver = "3.1.1"; + arpack_ver = "3.1.2"; clp_ver = "1.14.5"; lighttpd_ver = "1.4.29"; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; }; arpack_src = fetchurl { - url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/417/get/"; + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/497/get/"; name = "arpack-ng_${arpack_ver}.tar.gz"; - sha256 = "be250947a7d6eac7dff8c058102fce9922c524aa06be2a090b6e0bb2d1e228cd"; + sha256 = "1wk06bdjgap4hshx0lswzi7vxy2lrdx353y1k7yvm97mpsjvsf4k"; }; lapack_src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "3b413ec24957e400c984002f7cdf6232f5391a7e"; - sha256 = "c019b724df9203899a1da5815f85d79291778191bbffc1361d2213ff7d2bbc1d"; + rev = "4f692899688f500c77d768f67748f4b7335c90eb"; + sha256 = "a60e684a5283e80619f28ec8ff16fdc76c549e8463059507b0819db09dae6688"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline From 006e3fbf46537fa8e14d33a33ceeb66c2a4cd354 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 18 Aug 2012 17:54:22 -0400 Subject: [PATCH 0689/1120] nix: Update to latest unstable version --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1ed19bb9b259..c3743c7583d5 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.1pre2749_ccc52ad"; + name = "nix-1.1pre2789_7671018"; src = fetchurl { - url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2"; - sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc"; + url = "http://hydra.nixos.org/build/2949617/download/4/${name}.tar.bz2"; + sha256 = "64ae790a7326893dc92f77c297862c4a74b1381c17b5fc559428fb7988421109"; }; buildNativeInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55e16d3d8798..1e4219e1db9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8642,14 +8642,10 @@ let stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; - nixUnstable = nix; - - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; - */ nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { From 706cbc9318ef56d76a48883d9a0b6539e30985c7 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 19 Aug 2012 01:01:30 -0400 Subject: [PATCH 0690/1120] Update coq to 8.4 --- .../science/logic/coq/configure.8.3.patch | 1112 +++++++++++++++++ .../science/logic/coq/configure.patch | 1101 ---------------- .../science/logic/coq/default.8.3.nix | 69 + .../science/logic/coq/default.nix | 50 +- pkgs/top-level/all-packages.nix | 6 + 5 files changed, 1207 insertions(+), 1131 deletions(-) create mode 100644 pkgs/applications/science/logic/coq/configure.8.3.patch create mode 100644 pkgs/applications/science/logic/coq/default.8.3.nix diff --git a/pkgs/applications/science/logic/coq/configure.8.3.patch b/pkgs/applications/science/logic/coq/configure.8.3.patch new file mode 100644 index 000000000000..431cccac4b0b --- /dev/null +++ b/pkgs/applications/science/logic/coq/configure.8.3.patch @@ -0,0 +1,1112 @@ +diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure +--- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100 ++++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100 +@@ -395,7 +395,6 @@ + ocamlyaccexec=$CAMLBIN/ocamlyacc + ocamlmktopexec=$CAMLBIN/ocamlmktop + ocamlmklibexec=$CAMLBIN/ocamlmklib +- camlp4oexec=$CAMLBIN/camlp4o + esac + + if test ! -f "$CAMLC" ; then +@@ -628,7 +627,7 @@ + no) LABLGTKLIB=+lablgtk2 # Pour le message + LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + yes) LABLGTKLIB="$lablgtkdir" # Pour le message +- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile ++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + esac;; + no) LABLGTKINCLUDES="";; + esac +diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ +--- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 ++++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 +@@ -0,0 +1,1088 @@ ++#!/bin/sh ++ ++################################## ++# ++# Configuration script for Coq ++# ++################################## ++ ++VERSION=8.3pl3 ++VOMAGIC=08300 ++STATEMAGIC=58300 ++DATE=`LANG=C date +"%B %Y"` ++ ++# Create the bin/ directory if non-existent ++test -d bin || mkdir bin ++ ++# a local which command for sh ++which () { ++IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) ++for i in $PATH; do ++ if test -z "$i"; then i=.; fi ++ if [ -f "$i/$1" ] ; then ++ IFS=" " ++ echo "$i/$1" ++ break ++ fi ++done ++} ++ ++usage () { ++ printf "Available options for configure are:\n" ++ echo "-help" ++ printf "\tDisplays this help page\n" ++ echo "-prefix " ++ printf "\tSet installation directory to \n" ++ echo "-local" ++ printf "\tSet installation directory to the current source tree\n" ++ echo "-coqrunbyteflags" ++ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" ++ echo "-coqtoolsbyteflags" ++ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" ++ echo "-custom" ++ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" ++ echo "-src" ++ printf "\tSpecifies the source directory\n" ++ echo "-bindir" ++ echo "-libdir" ++ echo "-mandir" ++ echo "-docdir" ++ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" ++ echo "-emacslib" ++ echo "-emacs" ++ printf "\tSpecifies where emacs files are to be installed\n" ++ echo "-coqdocdir" ++ printf "\tSpecifies where Coqdoc style files are to be installed\n" ++ echo "-camldir" ++ printf "\tSpecifies the path to the OCaml library\n" ++ echo "-lablgtkdir" ++ printf "\tSpecifies the path to the Lablgtk library\n" ++ echo "-camlp5dir" ++ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" ++ echo "-arch" ++ printf "\tSpecifies the architecture\n" ++ echo "-opt" ++ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" ++ echo "-natdynlink (yes|no)" ++ printf "\tSpecifies whether or not to use dynamic loading of native code\n" ++ echo "-coqide (opt|byte|no)" ++ printf "\tSpecifies whether or not to compile Coqide\n" ++ echo "-browser " ++ printf "\tUse to open URL %%s\n" ++ echo "-with-doc (yes|no)" ++ printf "\tSpecifies whether or not to compile the documentation\n" ++ echo "-with-geoproof (yes|no)" ++ printf "\tSpecifies whether or not to use Geoproof binding\n" ++ echo "-with-cc " ++ echo "-with-ar " ++ echo "-with-ranlib " ++ printf "\tTells configure where to find gcc/ar/ranlib executables\n" ++ echo "-byte-only" ++ printf "\tCompiles only bytecode version of Coq\n" ++ echo "-debug" ++ printf "\tAdd debugging information in the Coq executables\n" ++ echo "-profile" ++ printf "\tAdd profiling information in the Coq executables\n" ++ echo "-annotate" ++ printf "\tCompiles Coq with -dtypes option\n" ++} ++ ++ ++# Default OCaml binaries ++bytecamlc=ocamlc ++nativecamlc=ocamlopt ++ocamlmklibexec=ocamlmklib ++ocamlexec=ocaml ++ocamldepexec=ocamldep ++ocamldocexec=ocamldoc ++ocamllexexec=ocamllex ++ocamlyaccexec=ocamlyacc ++ocamlmktopexec=ocamlmktop ++camlp4oexec=camlp4o ++ ++ ++coq_debug_flag= ++coq_debug_flag_opt= ++coq_profile_flag= ++coq_annotate_flag= ++best_compiler=opt ++cflags="-fno-defer-pop -Wall -Wno-unused" ++natdynlink=yes ++ ++gcc_exec=gcc ++ar_exec=ar ++ranlib_exec=ranlib ++ ++local=false ++coqrunbyteflags_spec=no ++coqtoolsbyteflags_spec=no ++custom_spec=no ++src_spec=no ++prefix_spec=no ++bindir_spec=no ++libdir_spec=no ++mandir_spec=no ++docdir_spec=no ++emacslib_spec=no ++emacs_spec=no ++camldir_spec=no ++lablgtkdir_spec=no ++coqdocdir_spec=no ++arch_spec=no ++coqide_spec=no ++browser_spec=no ++wwwcoq_spec=no ++with_geoproof=false ++with_doc=all ++with_doc_spec=no ++force_caml_version=no ++force_caml_version_spec=no ++ ++COQSRC=`pwd` ++ ++# Parse command-line arguments ++ ++while : ; do ++ case "$1" in ++ "") break;; ++ -help|--help) usage ++ exit;; ++ -prefix|--prefix) prefix_spec=yes ++ prefix="$2" ++ shift;; ++ -local|--local) local=true;; ++ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes ++ coqrunbyteflags="$2" ++ shift;; ++ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes ++ coqtoolsbyteflags="$2" ++ shift;; ++ -custom|--custom) custom_spec=yes ++ shift;; ++ -src|--src) src_spec=yes ++ COQSRC="$2" ++ shift;; ++ -bindir|--bindir) bindir_spec=yes ++ bindir="$2" ++ shift;; ++ -libdir|--libdir) libdir_spec=yes ++ libdir="$2" ++ shift;; ++ -mandir|--mandir) mandir_spec=yes ++ mandir="$2" ++ shift;; ++ -docdir|--docdir) docdir_spec=yes ++ docdir="$2" ++ shift;; ++ -emacslib|--emacslib) emacslib_spec=yes ++ emacslib="$2" ++ shift;; ++ -emacs |--emacs) emacs_spec=yes ++ emacs="$2" ++ shift;; ++ -coqdocdir|--coqdocdir) coqdocdir_spec=yes ++ coqdocdir="$2" ++ shift;; ++ -camldir|--camldir) camldir_spec=yes ++ camldir="$2" ++ shift;; ++ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes ++ lablgtkdir="$2" ++ shift;; ++ -camlp5dir|--camlp5dir) ++ camlp5dir="$2" ++ shift;; ++ -arch|--arch) arch_spec=yes ++ arch=$2 ++ shift;; ++ -opt|--opt) bytecamlc=ocamlc.opt ++ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required ++ nativecamlc=ocamlopt.opt;; ++ -natdynlink|--natdynlink) case "$2" in ++ yes) natdynlink=yes;; ++ *) natdynlink=no ++ esac ++ shift;; ++ -coqide|--coqide) coqide_spec=yes ++ case "$2" in ++ byte|opt) COQIDE=$2;; ++ *) COQIDE=no ++ esac ++ shift;; ++ -browser|--browser) browser_spec=yes ++ BROWSER=$2 ++ shift;; ++ -coqwebsite|--coqwebsite) wwwcoq_spec=yes ++ WWWCOQ=$2 ++ shift;; ++ -with-doc|--with-doc) with_doc_spec=yes ++ case "$2" in ++ yes|all) with_doc=all;; ++ *) with_doc=no ++ esac ++ shift;; ++ -with-geoproof|--with-geoproof) ++ case "$2" in ++ yes) with_geoproof=true;; ++ no) with_geoproof=false;; ++ esac ++ shift;; ++ -with-cc|-with-gcc|--with-cc|--with-gcc) ++ gcc_spec=yes ++ gcc_exec=$2 ++ shift;; ++ -with-ar|--with-ar) ++ ar_spec=yes ++ ar_exec=$2 ++ shift;; ++ -with-ranlib|--with-ranlib) ++ ranlib_spec=yes ++ ranlib_exec=$2 ++ shift;; ++ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; ++ -debug|--debug) coq_debug_flag=-g;; ++ -profile|--profile) coq_profile_flag=-p;; ++ -annotate|--annotate) coq_annotate_flag=-dtypes;; ++ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) ++ force_caml_version_spec=yes ++ force_caml_version=yes;; ++ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; ++ esac ++ shift ++done ++ ++if [ $prefix_spec = yes -a $local = true ] ; then ++ echo "Options -prefix and -local are incompatible." ++ echo "Configure script failed!" ++ exit 1 ++fi ++ ++# compile date ++DATEPGM=`which date` ++case $DATEPGM in ++ "") echo "I can't find the program \"date\" in your path." ++ echo "Please give me the current date" ++ read COMPILEDATE;; ++ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; ++esac ++ ++# Architecture ++ ++case $arch_spec in ++ no) ++ # First we test if we are running a Cygwin system ++ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then ++ ARCH="win32" ++ else ++ # If not, we determine the architecture ++ if test -x /bin/arch ; then ++ ARCH=`/bin/arch` ++ elif test -x /usr/bin/arch ; then ++ ARCH=`/usr/bin/arch` ++ elif test -x /usr/ucb/arch ; then ++ ARCH=`/usr/ucb/arch` ++ elif test -x /bin/uname ; then ++ ARCH=`/bin/uname -s` ++ elif test -x /usr/bin/uname ; then ++ ARCH=`/usr/bin/uname -s` ++ else ++ echo "I can not automatically find the name of your architecture." ++ printf "%s"\ ++ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " ++ read ARCH ++ fi ++ fi;; ++ yes) ARCH=$arch ++esac ++ ++# executable extension ++ ++case $ARCH in ++ win32) ++ EXE=".exe" ++ DLLEXT=".dll";; ++ *) EXE="" ++ DLLEXT=".so" ++esac ++ ++# Is the source tree checked out from a recognised ++# version control system ? ++if test -e .svn/entries ; then ++ checkedout=svn ++elif [ -d '{arch}' ]; then ++ checkedout=gnuarch ++elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then ++ checkedout=git ++else ++ checkedout=0 ++fi ++ ++# make command ++ ++MAKE=`which make` ++if [ "$MAKE" != "" ]; then ++ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` ++ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` ++ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` ++ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then ++ echo "You have GNU Make $MAKEVERSION. Good!" ++ else ++ OK="no" ++ if [ -x ./make ]; then ++ MAKEVERSION=`./make -v | head -1` ++ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi ++ fi ++ if [ $OK = "no" ]; then ++ echo "GNU Make >= 3.81 is needed." ++ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" ++ echo "then locally installed on a Unix-style system by issuing:" ++ echo " tar xzvf make-3.81.tar.gz" ++ echo " cd make-3.81" ++ echo " ./configure" ++ echo " make" ++ echo " mv make .." ++ echo " cd .." ++ echo "Restart then the configure script and later use ./make instead of make." ++ exit 1 ++ else ++ echo "You have locally installed GNU Make 3.81. Good!" ++ fi ++ fi ++else ++ echo "Cannot find GNU Make >= 3.81." ++fi ++ ++# Browser command ++ ++if [ "$browser_spec" = "no" ]; then ++ case $ARCH in ++ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; ++ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; ++ esac ++fi ++ ++if [ "$wwwcoq_spec" = "no" ]; then ++ WWWCOQ="http://coq.inria.fr/" ++fi ++ ++######################################### ++# Objective Caml programs ++ ++case $camldir_spec in ++ no) CAMLC=`which $bytecamlc` ++ case "$CAMLC" in ++ "") echo "$bytecamlc is not present in your path!" ++ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " ++ read CAMLC ++ ++ case "$CAMLC" in ++ "") CAMLC=/usr/local/bin/$bytecamlc;; ++ */ocamlc|*/ocamlc.opt) true;; ++ */) CAMLC="${CAMLC}"$bytecamlc;; ++ *) CAMLC="${CAMLC}"/$bytecamlc;; ++ esac ++ esac ++ CAMLBIN=`dirname "$CAMLC"`;; ++ yes) CAMLC=$camldir/$bytecamlc ++ ++ CAMLBIN=`dirname "$CAMLC"` ++ bytecamlc="$CAMLC" ++ nativecamlc=$CAMLBIN/$nativecamlc ++ ocamlexec=$CAMLBIN/ocaml ++ ocamldepexec=$CAMLBIN/ocamldep ++ ocamldocexec=$CAMLBIN/ocamldoc ++ ocamllexexec=$CAMLBIN/ocamllex ++ ocamlyaccexec=$CAMLBIN/ocamlyacc ++ ocamlmktopexec=$CAMLBIN/ocamlmktop ++ ocamlmklibexec=$CAMLBIN/ocamlmklib ++ camlp4oexec=$CAMLBIN/camlp4o ++esac ++ ++if test ! -f "$CAMLC" ; then ++ echo "I can not find the executable '$CAMLC'. Have you installed it?" ++ echo "Configuration script failed!" ++ exit 1 ++fi ++ ++# Under Windows, OCaml only understands Windows filenames (C:\...) ++case $ARCH in ++ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; ++esac ++ ++CAMLVERSION=`"$bytecamlc" -version` ++ ++case $CAMLVERSION in ++ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) ++ echo "Your version of Objective-Caml is $CAMLVERSION." ++ if [ "$force_caml_version" = "yes" ]; then ++ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." ++ else ++ echo " You need Objective-Caml 3.10.2 or later." ++ echo " Configuration script failed!" ++ exit 1 ++ fi;; ++ ?*) ++ CAMLP4COMPAT="-loc loc" ++ echo "You have Objective-Caml $CAMLVERSION. Good!";; ++ *) ++ echo "I found the Objective-Caml compiler but cannot find its version number!" ++ echo "Is it installed properly?" ++ echo "Configuration script failed!" ++ exit 1;; ++esac ++ ++CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` ++ ++# For coqmktop & bytecode compiler ++ ++case $ARCH in ++ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB ++ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; ++ *) ++ CAMLLIB=`"$CAMLC" -where` ++esac ++ ++if [ "$coq_debug_flag" = "-g" ]; then ++ case $CAMLTAG in ++ OCAML31*) ++ # Compilation debug flag ++ coq_debug_flag_opt="-g" ++ ;; ++ esac ++fi ++ ++# Native dynlink ++if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then ++ HASNATDYNLINK=true ++else ++ HASNATDYNLINK=false ++fi ++ ++case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in ++ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy ++ NATDYNLINKFLAG=os5fixme;; ++ #Possibly a problem on 10.6.0/10.6.1/10.6.2 ++ #May just be a 32 vs 64 problem for all 10.6.* ++ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 ++ NATDYNLINKFLAG=os5fixme;; ++ true,Darwin,10.*,3.11.*) ++ if [ `getconf LONG_BIT` = "32" ]; then ++ # Still a problem for x86_32 ++ NATDYNLINKFLAG=os5fixme ++ else ++ # Not a problem for x86_64 ++ NATDYNLINKFLAG=$HASNATDYNLINK ++ fi;; ++ *) ++ NATDYNLINKFLAG=$HASNATDYNLINK;; ++esac ++ ++# Camlp4 / Camlp5 configuration ++ ++if [ "$camlp5dir" != "" ]; then ++ CAMLP4=camlp5 ++ CAMLP4LIB=$camlp5dir ++ if [ ! -f $camlp5dir/camlp5.cma ]; then ++ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." ++ echo "Configuration script failed!" ++ exit 1 ++ fi ++ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` ++else ++ case $CAMLTAG in ++ OCAML31*) ++ if [ -x "${CAMLLIB}/camlp5" ]; then ++ CAMLP4LIB=+camlp5 ++ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then ++ CAMLP4LIB=+site-lib/camlp5 ++ else ++ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." ++ echo "Configuration script failed!" ++ exit 1 ++ fi ++ CAMLP4=camlp5 ++ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` ++ ;; ++ *) ++ CAMLP4=camlp4 ++ CAMLP4LIB=+camlp4 ++ ;; ++ esac ++fi ++ ++if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then ++ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" ++ echo "(depending also on your ocaml version)." ++ echo "Configuration script failed!" ++ exit 1 ++fi ++ ++ ++case $CAMLP4LIB in ++ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; ++ *) FULLCAMLP4LIB=$CAMLP4LIB;; ++esac ++ ++# Assume that camlp(4|5) binaries are at the same place as ocaml ones ++# (this should become configurable some day) ++CAMLP4BIN=${CAMLBIN} ++ ++# do we have a native compiler: test of ocamlopt and its version ++ ++if [ "$best_compiler" = "opt" ] ; then ++ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then ++ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` ++ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then ++ case $CAMLOPTVERSION in ++ 3.09.3|3.1?*) ;; ++ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," ++ best_compiler=byte ++ echo "only the bytecode version of Coq will be available." ++ esac ++ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then ++ best_compiler=byte ++ echo "Cannot find native-code $CAMLP4," ++ echo "only the bytecode version of Coq will be available." ++ else ++ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then ++ echo "Native and bytecode compilers do not have the same version!" ++ fi ++ echo "You have native-code compilation. Good!" ++ fi ++ else ++ best_compiler=byte ++ echo "You have only bytecode compilation." ++ fi ++fi ++ ++# OS dependent libraries ++ ++case $ARCH in ++ sun4*) OS=`uname -r` ++ case $OS in ++ 5*) OS="Sun Solaris $OS" ++ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; ++ *) OS="Sun OS $OS" ++ OSDEPLIBS="-cclib -lunix" ++ esac;; ++ alpha) OSDEPLIBS="-cclib -lunix";; ++ win32) OS="Win32" ++ OSDEPLIBS="-cclib -lunix" ++ cflags="-mno-cygwin $cflags";; ++ *) OSDEPLIBS="-cclib -lunix" ++esac ++ ++# lablgtk2 and CoqIDE ++ ++# -byte-only should imply -coqide byte, unless the user decides otherwise ++ ++if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then ++ coqide_spec=yes ++ COQIDE=byte ++fi ++ ++# Which coqide is asked ? which one is possible ? ++ ++if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then ++ echo "CoqIde disabled as requested." ++else ++ case $lablgtkdir_spec in ++ no) ++ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then ++ lablgtkdir=${CAMLLIB}/lablgtk2 ++ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then ++ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 ++ fi;; ++ yes) ++ if [ ! -f "$lablgtkdir/glib.mli" ]; then ++ echo "Incorrect LablGtk2 library (glib.mli not found)." ++ echo "Configuration script failed!" ++ exit 1 ++ fi;; ++ esac ++ if [ "$lablgtkdir" = "" ]; then ++ echo "LablGtk2 not found: CoqIde will not be available." ++ COQIDE=no ++ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then ++ echo "LablGtk2 found but too old: CoqIde will not be available." ++ COQIDE=no; ++ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then ++ echo "LablGtk2 found, bytecode CoqIde will be used as requested." ++ COQIDE=byte ++ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then ++ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." ++ COQIDE=byte ++ else ++ echo "LablGtk2 found, native threads: native CoqIde will be available." ++ COQIDE=opt ++ fi ++fi ++ ++case $COQIDE in ++ byte|opt) ++ case $lablgtkdir_spec in ++ no) LABLGTKLIB=+lablgtk2 # Pour le message ++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile ++ yes) LABLGTKLIB="$lablgtkdir" # Pour le message ++ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile ++ esac;; ++ no) LABLGTKINCLUDES="";; ++esac ++ ++# strip command ++ ++case $ARCH in ++ win32) ++ # true -> strip : it exists under cygwin ! ++ STRIPCOMMAND="strip";; ++ *) ++ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || ++ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] ++ then ++ STRIPCOMMAND="true" ++ else ++ STRIPCOMMAND="strip" ++ fi ++esac ++ ++# mktexlsr ++#MKTEXLSR=`which mktexlsr` ++#case $MKTEXLSR in ++# "") MKTEXLSR=true;; ++#esac ++ ++# " ++### Test if documentation can be compiled (latex, hevea) ++ ++if test "$with_doc" = "all" ++then ++ for cmd in "latex" "hevea" ; do ++ if test ! -x "`which $cmd`" ++ then ++ echo "$cmd was not found; documentation will not be available" ++ with_doc=no ++ break ++ fi ++ done ++fi ++ ++########################################### ++# bindir, libdir, mandir, docdir, etc. ++ ++case $src_spec in ++ no) COQTOP=${COQSRC} ++esac ++ ++# OCaml only understand Windows filenames (C:\...) ++case $ARCH in ++ win32) COQTOP=`cygpath -m ${COQTOP}` ++esac ++ ++case $ARCH in ++ win32) ++ bindir_def='C:\coq\bin' ++ libdir_def='C:\coq\lib' ++ mandir_def='C:\coq\man' ++ docdir_def='C:\coq\doc' ++ emacslib_def='C:\coq\emacs' ++ coqdocdir_def='C:\coq\latex';; ++ *) ++ bindir_def=/usr/local/bin ++ libdir_def=/usr/local/lib/coq ++ mandir_def=/usr/local/man ++ docdir_def=/usr/local/share/doc/coq ++ emacslib_def=/usr/local/share/emacs/site-lisp ++ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; ++esac ++ ++emacs_def=emacs ++ ++case $bindir_spec/$prefix_spec/$local in ++ yes/*/*) BINDIR=$bindir ;; ++ */yes/*) BINDIR=$prefix/bin ;; ++ */*/true) BINDIR=$COQTOP/bin ;; ++ *) printf "Where should I install the Coq binaries [$bindir_def]? " ++ read BINDIR ++ case $BINDIR in ++ "") BINDIR=$bindir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $libdir_spec/$prefix_spec/$local in ++ yes/*/*) LIBDIR=$libdir;; ++ */yes/*) ++ case $ARCH in ++ win32) LIBDIR=$prefix ;; ++ *) LIBDIR=$prefix/lib/coq ;; ++ esac ;; ++ */*/true) LIBDIR=$COQTOP ;; ++ *) printf "Where should I install the Coq library [$libdir_def]? " ++ read LIBDIR ++ case $LIBDIR in ++ "") LIBDIR=$libdir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $mandir_spec/$prefix_spec/$local in ++ yes/*/*) MANDIR=$mandir;; ++ */yes/*) MANDIR=$prefix/man ;; ++ */*/true) MANDIR=$COQTOP/man ;; ++ *) printf "Where should I install the Coq man pages [$mandir_def]? " ++ read MANDIR ++ case $MANDIR in ++ "") MANDIR=$mandir_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $docdir_spec/$prefix_spec/$local in ++ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; ++ *) printf "Where should I install the Coq documentation [$docdir_def]? " ++ read DOCDIR ++ case $DOCDIR in ++ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; ++ *) true;; ++ esac;; ++esac ++ ++case $emacslib_spec/$prefix_spec/$local in ++ yes/*/*) EMACSLIB=$emacslib;; ++ */yes/*) ++ case $ARCH in ++ win32) EMACSLIB=$prefix/emacs ;; ++ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; ++ esac ;; ++ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; ++ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " ++ read EMACSLIB ++ case $EMACSLIB in ++ "") EMACSLIB=$emacslib_def;; ++ *) true;; ++ esac;; ++esac ++ ++case $coqdocdir_spec/$prefix_spec/$local in ++ yes/*/*) COQDOCDIR=$coqdocdir;; ++ */yes/*) ++ case $ARCH in ++ win32) COQDOCDIR=$prefix/latex ;; ++ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; ++ esac ;; ++ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; ++ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " ++ read COQDOCDIR ++ case $COQDOCDIR in ++ "") COQDOCDIR=$coqdocdir_def;; ++ *) true;; ++ esac;; ++esac ++ ++# Determine if we enable -custom by default (Windows and MacOS) ++CUSTOM_OS=no ++if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then ++ CUSTOM_OS=yes ++fi ++ ++BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" ++case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in ++ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; ++ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; ++ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; ++ *) ++ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" ++ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; ++esac ++case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in ++ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; ++ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; ++ *) COQTOOLSBYTEFLAGS="";; ++esac ++ ++# case $emacs_spec in ++# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " ++# read EMACS ++ ++# case $EMACS in ++# "") EMACS=$emacs_def;; ++# *) true;; ++# esac;; ++# yes) EMACS=$emacs;; ++# esac ++ ++ ++ ++########################################### ++# Summary of the configuration ++ ++echo "" ++echo " Coq top directory : $COQTOP" ++echo " Architecture : $ARCH" ++if test ! -z "$OS" ; then ++ echo " Operating system : $OS" ++fi ++echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" ++echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" ++echo " OS dependent libraries : $OSDEPLIBS" ++echo " Objective-Caml/Camlp4 version : $CAMLVERSION" ++echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" ++echo " Objective-Caml library in : $CAMLLIB" ++echo " Camlp4 library in : $CAMLP4LIB" ++if test "$best_compiler" = opt ; then ++echo " Native dynamic link support : $HASNATDYNLINK" ++fi ++if test "$COQIDE" != "no"; then ++echo " Lablgtk2 library in : $LABLGTKLIB" ++fi ++if test "$with_doc" = "all"; then ++echo " Documentation : All" ++else ++echo " Documentation : None" ++fi ++echo " CoqIde : $COQIDE" ++echo " Web browser : $BROWSER" ++echo " Coq web site : $WWWCOQ" ++echo "" ++ ++echo " Paths for true installation:" ++echo " binaries will be copied in $BINDIR" ++echo " library will be copied in $LIBDIR" ++echo " man pages will be copied in $MANDIR" ++echo " documentation will be copied in $DOCDIR" ++echo " emacs mode will be copied in $EMACSLIB" ++echo "" ++ ++################################################## ++# Building the $COQTOP/dev/ocamldebug-coq file ++################################################## ++ ++OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq ++ ++if test "$coq_debug_flag" = "-g" ; then ++ rm -f $OCAMLDEBUGCOQ ++ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ ++ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ ++ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ ++ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ ++ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ ++ chmod a-w,a+x $OCAMLDEBUGCOQ ++fi ++ ++#################################################### ++# Fixing lablgtk types (before/after 2.6.0) ++#################################################### ++ ++if [ ! "$COQIDE" = "no" ]; then ++ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then ++ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then ++ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli ++ else ++ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli ++ fi ++ else ++ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli ++ fi ++fi ++ ++############################################## ++# Creation of configuration files ++############################################## ++ ++mlconfig_file="$COQSRC/config/coq_config.ml" ++config_file="$COQSRC/config/Makefile" ++config_template="$COQSRC/config/Makefile.template" ++ ++ ++### Warning !! ++### After this line, be careful when using variables, ++### since some of them (e.g. $COQSRC) will be escaped ++ ++ ++# An escaped version of a variable ++escape_var () { ++"$ocamlexec" 2>&1 1>/dev/null < $mlconfig_file ++(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) ++ ++let local = $local ++let coqrunbyteflags = "$COQRUNBYTEFLAGS" ++let coqlib = "$LIBDIR" ++let coqsrc = "$COQSRC" ++let ocaml = "$ocamlexec" ++let ocamlc = "$bytecamlc" ++let ocamlopt = "$nativecamlc" ++let ocamlmklib = "$ocamlmklibexec" ++let ocamldep = "$ocamldepexec" ++let ocamldoc = "$ocamldocexec" ++let ocamlyacc = "$ocamlyaccexec" ++let ocamllex = "$ocamllexexec" ++let camlbin = "$CAMLBIN" ++let camllib = "$CAMLLIB" ++let camlp4 = "$CAMLP4" ++let camlp4o = "$camlp4oexec" ++let camlp4bin = "$CAMLP4BIN" ++let camlp4lib = "$CAMLP4LIB" ++let camlp4compat = "$CAMLP4COMPAT" ++let coqideincl = "$LABLGTKINCLUDES" ++let cflags = "$cflags" ++let best = "$best_compiler" ++let arch = "$ARCH" ++let has_coqide = "$COQIDE" ++let has_natdynlink = $HASNATDYNLINK ++let natdynlinkflag = "$NATDYNLINKFLAG" ++let osdeplibs = "$OSDEPLIBS" ++let version = "$VERSION" ++let caml_version = "$CAMLVERSION" ++let date = "$DATE" ++let compile_date = "$COMPILEDATE" ++let vo_magic_number = $VOMAGIC ++let state_magic_number = $STATEMAGIC ++let exec_extension = "$EXE" ++let with_geoproof = ref $with_geoproof ++let browser = "$BROWSER" ++let wwwcoq = "$WWWCOQ" ++let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" ++let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" ++let localwwwrefman = "file://$HTMLREFMANDIR/" ++ ++END_OF_COQ_CONFIG ++ ++# to be sure printf is found on windows when spaces occur in PATH variable ++PRINTF=`which printf` ++ ++# Subdirectories of theories/ added in coq_config.ml ++subdirs () { ++ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") ++} ++ ++echo "let theories_dirs = [" >> "$mlconfig_file" ++subdirs theories ++echo "]" >> "$mlconfig_file" ++ ++echo "let plugins_dirs = [" >> "$mlconfig_file" ++subdirs plugins ++echo "]" >> "$mlconfig_file" ++ ++chmod a-w "$mlconfig_file" ++ ++ ++############################################### ++# Building the $COQTOP/config/Makefile file ++############################################### ++ ++rm -f "$config_file" ++ ++sed -e "s|LOCALINSTALLATION|$local|" \ ++ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ ++ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ ++ -e "s|COQSRCDIRECTORY|$COQSRC|" \ ++ -e "s|COQVERSION|$VERSION|" \ ++ -e "s|BINDIRDIRECTORY|$BINDIR|" \ ++ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ ++ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ ++ -e "s|MANDIRDIRECTORY|$MANDIR|" \ ++ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ ++ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ ++ -e "s|EMACSCOMMAND|$EMACS|" \ ++ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ ++ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ ++ -e "s|ARCHITECTURE|$ARCH|" \ ++ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ ++ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ ++ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ ++ -e "s|CAMLTAG|$CAMLTAG|" \ ++ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ ++ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ ++ -e "s|CAMLP4TOOL|$camlp4oexec|" \ ++ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ ++ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ ++ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ ++ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ ++ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ ++ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ ++ -e "s|CCOMPILEFLAGS|$cflags|" \ ++ -e "s|BESTCOMPILER|$best_compiler|" \ ++ -e "s|DLLEXTENSION|$DLLEXT|" \ ++ -e "s|EXECUTEEXTENSION|$EXE|" \ ++ -e "s|BYTECAMLC|$bytecamlc|" \ ++ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ ++ -e "s|NATIVECAMLC|$nativecamlc|" \ ++ -e "s|OCAMLEXEC|$ocamlexec|" \ ++ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ ++ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ ++ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ ++ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ ++ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ ++ -e "s|CCEXEC|$gcc_exec|" \ ++ -e "s|AREXEC|$ar_exec|" \ ++ -e "s|RANLIBEXEC|$ranlib_exec|" \ ++ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ ++ -e "s|COQIDEOPT|$COQIDE|" \ ++ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ ++ -e "s|WITHDOCOPT|$with_doc|" \ ++ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ ++ "$config_template" > "$config_file" ++ ++chmod a-w "$config_file" ++ ++################################################## ++# The end ++#################################################### ++ ++echo "If anything in the above is wrong, please restart './configure'." ++echo ++echo "*Warning* To compile the system for a new architecture" ++echo " don't forget to do a 'make archclean' before './configure'." ++ ++# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch index 431cccac4b0b..aa38ce06e92b 100644 --- a/pkgs/applications/science/logic/coq/configure.patch +++ b/pkgs/applications/science/logic/coq/configure.patch @@ -9,1104 +9,3 @@ diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure esac if test ! -f "$CAMLC" ; then -@@ -628,7 +627,7 @@ - no) LABLGTKLIB=+lablgtk2 # Pour le message - LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - yes) LABLGTKLIB="$lablgtkdir" # Pour le message -- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile - esac;; - no) LABLGTKINCLUDES="";; - esac -diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~ ---- coq-8.3pl3-orig/configure~ 1970-01-01 01:00:00.000000000 +0100 -+++ coq-8.3pl3/configure~ 2011-12-19 22:57:30.000000000 +0100 -@@ -0,0 +1,1088 @@ -+#!/bin/sh -+ -+################################## -+# -+# Configuration script for Coq -+# -+################################## -+ -+VERSION=8.3pl3 -+VOMAGIC=08300 -+STATEMAGIC=58300 -+DATE=`LANG=C date +"%B %Y"` -+ -+# Create the bin/ directory if non-existent -+test -d bin || mkdir bin -+ -+# a local which command for sh -+which () { -+IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) -+for i in $PATH; do -+ if test -z "$i"; then i=.; fi -+ if [ -f "$i/$1" ] ; then -+ IFS=" " -+ echo "$i/$1" -+ break -+ fi -+done -+} -+ -+usage () { -+ printf "Available options for configure are:\n" -+ echo "-help" -+ printf "\tDisplays this help page\n" -+ echo "-prefix " -+ printf "\tSet installation directory to \n" -+ echo "-local" -+ printf "\tSet installation directory to the current source tree\n" -+ echo "-coqrunbyteflags" -+ printf "\tSet link flags for VM-dependent bytecode (coqtop)\n" -+ echo "-coqtoolsbyteflags" -+ printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n" -+ echo "-custom" -+ printf "\tGenerate all bytecode executables with -custom (not recommended)\n" -+ echo "-src" -+ printf "\tSpecifies the source directory\n" -+ echo "-bindir" -+ echo "-libdir" -+ echo "-mandir" -+ echo "-docdir" -+ printf "\tSpecifies where to install bin/lib/man/doc files resp.\n" -+ echo "-emacslib" -+ echo "-emacs" -+ printf "\tSpecifies where emacs files are to be installed\n" -+ echo "-coqdocdir" -+ printf "\tSpecifies where Coqdoc style files are to be installed\n" -+ echo "-camldir" -+ printf "\tSpecifies the path to the OCaml library\n" -+ echo "-lablgtkdir" -+ printf "\tSpecifies the path to the Lablgtk library\n" -+ echo "-camlp5dir" -+ printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n" -+ echo "-arch" -+ printf "\tSpecifies the architecture\n" -+ echo "-opt" -+ printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n" -+ echo "-natdynlink (yes|no)" -+ printf "\tSpecifies whether or not to use dynamic loading of native code\n" -+ echo "-coqide (opt|byte|no)" -+ printf "\tSpecifies whether or not to compile Coqide\n" -+ echo "-browser " -+ printf "\tUse to open URL %%s\n" -+ echo "-with-doc (yes|no)" -+ printf "\tSpecifies whether or not to compile the documentation\n" -+ echo "-with-geoproof (yes|no)" -+ printf "\tSpecifies whether or not to use Geoproof binding\n" -+ echo "-with-cc " -+ echo "-with-ar " -+ echo "-with-ranlib " -+ printf "\tTells configure where to find gcc/ar/ranlib executables\n" -+ echo "-byte-only" -+ printf "\tCompiles only bytecode version of Coq\n" -+ echo "-debug" -+ printf "\tAdd debugging information in the Coq executables\n" -+ echo "-profile" -+ printf "\tAdd profiling information in the Coq executables\n" -+ echo "-annotate" -+ printf "\tCompiles Coq with -dtypes option\n" -+} -+ -+ -+# Default OCaml binaries -+bytecamlc=ocamlc -+nativecamlc=ocamlopt -+ocamlmklibexec=ocamlmklib -+ocamlexec=ocaml -+ocamldepexec=ocamldep -+ocamldocexec=ocamldoc -+ocamllexexec=ocamllex -+ocamlyaccexec=ocamlyacc -+ocamlmktopexec=ocamlmktop -+camlp4oexec=camlp4o -+ -+ -+coq_debug_flag= -+coq_debug_flag_opt= -+coq_profile_flag= -+coq_annotate_flag= -+best_compiler=opt -+cflags="-fno-defer-pop -Wall -Wno-unused" -+natdynlink=yes -+ -+gcc_exec=gcc -+ar_exec=ar -+ranlib_exec=ranlib -+ -+local=false -+coqrunbyteflags_spec=no -+coqtoolsbyteflags_spec=no -+custom_spec=no -+src_spec=no -+prefix_spec=no -+bindir_spec=no -+libdir_spec=no -+mandir_spec=no -+docdir_spec=no -+emacslib_spec=no -+emacs_spec=no -+camldir_spec=no -+lablgtkdir_spec=no -+coqdocdir_spec=no -+arch_spec=no -+coqide_spec=no -+browser_spec=no -+wwwcoq_spec=no -+with_geoproof=false -+with_doc=all -+with_doc_spec=no -+force_caml_version=no -+force_caml_version_spec=no -+ -+COQSRC=`pwd` -+ -+# Parse command-line arguments -+ -+while : ; do -+ case "$1" in -+ "") break;; -+ -help|--help) usage -+ exit;; -+ -prefix|--prefix) prefix_spec=yes -+ prefix="$2" -+ shift;; -+ -local|--local) local=true;; -+ -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes -+ coqrunbyteflags="$2" -+ shift;; -+ -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes -+ coqtoolsbyteflags="$2" -+ shift;; -+ -custom|--custom) custom_spec=yes -+ shift;; -+ -src|--src) src_spec=yes -+ COQSRC="$2" -+ shift;; -+ -bindir|--bindir) bindir_spec=yes -+ bindir="$2" -+ shift;; -+ -libdir|--libdir) libdir_spec=yes -+ libdir="$2" -+ shift;; -+ -mandir|--mandir) mandir_spec=yes -+ mandir="$2" -+ shift;; -+ -docdir|--docdir) docdir_spec=yes -+ docdir="$2" -+ shift;; -+ -emacslib|--emacslib) emacslib_spec=yes -+ emacslib="$2" -+ shift;; -+ -emacs |--emacs) emacs_spec=yes -+ emacs="$2" -+ shift;; -+ -coqdocdir|--coqdocdir) coqdocdir_spec=yes -+ coqdocdir="$2" -+ shift;; -+ -camldir|--camldir) camldir_spec=yes -+ camldir="$2" -+ shift;; -+ -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes -+ lablgtkdir="$2" -+ shift;; -+ -camlp5dir|--camlp5dir) -+ camlp5dir="$2" -+ shift;; -+ -arch|--arch) arch_spec=yes -+ arch=$2 -+ shift;; -+ -opt|--opt) bytecamlc=ocamlc.opt -+ camlp4oexec=camlp4o # can't add .opt since dyn load'll be required -+ nativecamlc=ocamlopt.opt;; -+ -natdynlink|--natdynlink) case "$2" in -+ yes) natdynlink=yes;; -+ *) natdynlink=no -+ esac -+ shift;; -+ -coqide|--coqide) coqide_spec=yes -+ case "$2" in -+ byte|opt) COQIDE=$2;; -+ *) COQIDE=no -+ esac -+ shift;; -+ -browser|--browser) browser_spec=yes -+ BROWSER=$2 -+ shift;; -+ -coqwebsite|--coqwebsite) wwwcoq_spec=yes -+ WWWCOQ=$2 -+ shift;; -+ -with-doc|--with-doc) with_doc_spec=yes -+ case "$2" in -+ yes|all) with_doc=all;; -+ *) with_doc=no -+ esac -+ shift;; -+ -with-geoproof|--with-geoproof) -+ case "$2" in -+ yes) with_geoproof=true;; -+ no) with_geoproof=false;; -+ esac -+ shift;; -+ -with-cc|-with-gcc|--with-cc|--with-gcc) -+ gcc_spec=yes -+ gcc_exec=$2 -+ shift;; -+ -with-ar|--with-ar) -+ ar_spec=yes -+ ar_exec=$2 -+ shift;; -+ -with-ranlib|--with-ranlib) -+ ranlib_spec=yes -+ ranlib_exec=$2 -+ shift;; -+ -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -+ -debug|--debug) coq_debug_flag=-g;; -+ -profile|--profile) coq_profile_flag=-p;; -+ -annotate|--annotate) coq_annotate_flag=-dtypes;; -+ -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) -+ force_caml_version_spec=yes -+ force_caml_version=yes;; -+ *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; -+ esac -+ shift -+done -+ -+if [ $prefix_spec = yes -a $local = true ] ; then -+ echo "Options -prefix and -local are incompatible." -+ echo "Configure script failed!" -+ exit 1 -+fi -+ -+# compile date -+DATEPGM=`which date` -+case $DATEPGM in -+ "") echo "I can't find the program \"date\" in your path." -+ echo "Please give me the current date" -+ read COMPILEDATE;; -+ *) COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;; -+esac -+ -+# Architecture -+ -+case $arch_spec in -+ no) -+ # First we test if we are running a Cygwin system -+ if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then -+ ARCH="win32" -+ else -+ # If not, we determine the architecture -+ if test -x /bin/arch ; then -+ ARCH=`/bin/arch` -+ elif test -x /usr/bin/arch ; then -+ ARCH=`/usr/bin/arch` -+ elif test -x /usr/ucb/arch ; then -+ ARCH=`/usr/ucb/arch` -+ elif test -x /bin/uname ; then -+ ARCH=`/bin/uname -s` -+ elif test -x /usr/bin/uname ; then -+ ARCH=`/usr/bin/uname -s` -+ else -+ echo "I can not automatically find the name of your architecture." -+ printf "%s"\ -+ "Give me a name, please [win32 for Win95, Win98 or WinNT]: " -+ read ARCH -+ fi -+ fi;; -+ yes) ARCH=$arch -+esac -+ -+# executable extension -+ -+case $ARCH in -+ win32) -+ EXE=".exe" -+ DLLEXT=".dll";; -+ *) EXE="" -+ DLLEXT=".so" -+esac -+ -+# Is the source tree checked out from a recognised -+# version control system ? -+if test -e .svn/entries ; then -+ checkedout=svn -+elif [ -d '{arch}' ]; then -+ checkedout=gnuarch -+elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then -+ checkedout=git -+else -+ checkedout=0 -+fi -+ -+# make command -+ -+MAKE=`which make` -+if [ "$MAKE" != "" ]; then -+ MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` -+ MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` -+ MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` -+ if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then -+ echo "You have GNU Make $MAKEVERSION. Good!" -+ else -+ OK="no" -+ if [ -x ./make ]; then -+ MAKEVERSION=`./make -v | head -1` -+ if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi -+ fi -+ if [ $OK = "no" ]; then -+ echo "GNU Make >= 3.81 is needed." -+ echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" -+ echo "then locally installed on a Unix-style system by issuing:" -+ echo " tar xzvf make-3.81.tar.gz" -+ echo " cd make-3.81" -+ echo " ./configure" -+ echo " make" -+ echo " mv make .." -+ echo " cd .." -+ echo "Restart then the configure script and later use ./make instead of make." -+ exit 1 -+ else -+ echo "You have locally installed GNU Make 3.81. Good!" -+ fi -+ fi -+else -+ echo "Cannot find GNU Make >= 3.81." -+fi -+ -+# Browser command -+ -+if [ "$browser_spec" = "no" ]; then -+ case $ARCH in -+ win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;; -+ *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; -+ esac -+fi -+ -+if [ "$wwwcoq_spec" = "no" ]; then -+ WWWCOQ="http://coq.inria.fr/" -+fi -+ -+######################################### -+# Objective Caml programs -+ -+case $camldir_spec in -+ no) CAMLC=`which $bytecamlc` -+ case "$CAMLC" in -+ "") echo "$bytecamlc is not present in your path!" -+ echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " -+ read CAMLC -+ -+ case "$CAMLC" in -+ "") CAMLC=/usr/local/bin/$bytecamlc;; -+ */ocamlc|*/ocamlc.opt) true;; -+ */) CAMLC="${CAMLC}"$bytecamlc;; -+ *) CAMLC="${CAMLC}"/$bytecamlc;; -+ esac -+ esac -+ CAMLBIN=`dirname "$CAMLC"`;; -+ yes) CAMLC=$camldir/$bytecamlc -+ -+ CAMLBIN=`dirname "$CAMLC"` -+ bytecamlc="$CAMLC" -+ nativecamlc=$CAMLBIN/$nativecamlc -+ ocamlexec=$CAMLBIN/ocaml -+ ocamldepexec=$CAMLBIN/ocamldep -+ ocamldocexec=$CAMLBIN/ocamldoc -+ ocamllexexec=$CAMLBIN/ocamllex -+ ocamlyaccexec=$CAMLBIN/ocamlyacc -+ ocamlmktopexec=$CAMLBIN/ocamlmktop -+ ocamlmklibexec=$CAMLBIN/ocamlmklib -+ camlp4oexec=$CAMLBIN/camlp4o -+esac -+ -+if test ! -f "$CAMLC" ; then -+ echo "I can not find the executable '$CAMLC'. Have you installed it?" -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+# Under Windows, OCaml only understands Windows filenames (C:\...) -+case $ARCH in -+ win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;; -+esac -+ -+CAMLVERSION=`"$bytecamlc" -version` -+ -+case $CAMLVERSION in -+ 1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*) -+ echo "Your version of Objective-Caml is $CAMLVERSION." -+ if [ "$force_caml_version" = "yes" ]; then -+ echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." -+ else -+ echo " You need Objective-Caml 3.10.2 or later." -+ echo " Configuration script failed!" -+ exit 1 -+ fi;; -+ ?*) -+ CAMLP4COMPAT="-loc loc" -+ echo "You have Objective-Caml $CAMLVERSION. Good!";; -+ *) -+ echo "I found the Objective-Caml compiler but cannot find its version number!" -+ echo "Is it installed properly?" -+ echo "Configuration script failed!" -+ exit 1;; -+esac -+ -+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` -+ -+# For coqmktop & bytecode compiler -+ -+case $ARCH in -+ win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB -+ CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;; -+ *) -+ CAMLLIB=`"$CAMLC" -where` -+esac -+ -+if [ "$coq_debug_flag" = "-g" ]; then -+ case $CAMLTAG in -+ OCAML31*) -+ # Compilation debug flag -+ coq_debug_flag_opt="-g" -+ ;; -+ esac -+fi -+ -+# Native dynlink -+if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then -+ HASNATDYNLINK=true -+else -+ HASNATDYNLINK=false -+fi -+ -+case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in -+ true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy -+ NATDYNLINKFLAG=os5fixme;; -+ #Possibly a problem on 10.6.0/10.6.1/10.6.2 -+ #May just be a 32 vs 64 problem for all 10.6.* -+ true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 -+ NATDYNLINKFLAG=os5fixme;; -+ true,Darwin,10.*,3.11.*) -+ if [ `getconf LONG_BIT` = "32" ]; then -+ # Still a problem for x86_32 -+ NATDYNLINKFLAG=os5fixme -+ else -+ # Not a problem for x86_64 -+ NATDYNLINKFLAG=$HASNATDYNLINK -+ fi;; -+ *) -+ NATDYNLINKFLAG=$HASNATDYNLINK;; -+esac -+ -+# Camlp4 / Camlp5 configuration -+ -+if [ "$camlp5dir" != "" ]; then -+ CAMLP4=camlp5 -+ CAMLP4LIB=$camlp5dir -+ if [ ! -f $camlp5dir/camlp5.cma ]; then -+ echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+else -+ case $CAMLTAG in -+ OCAML31*) -+ if [ -x "${CAMLLIB}/camlp5" ]; then -+ CAMLP4LIB=+camlp5 -+ elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then -+ CAMLP4LIB=+site-lib/camlp5 -+ else -+ echo "Objective Caml $CAMLVERSION found but no Camlp5 installed." -+ echo "Configuration script failed!" -+ exit 1 -+ fi -+ CAMLP4=camlp5 -+ camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'` -+ ;; -+ *) -+ CAMLP4=camlp4 -+ CAMLP4LIB=+camlp4 -+ ;; -+ esac -+fi -+ -+if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then -+ echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK" -+ echo "(depending also on your ocaml version)." -+ echo "Configuration script failed!" -+ exit 1 -+fi -+ -+ -+case $CAMLP4LIB in -+ +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;; -+ *) FULLCAMLP4LIB=$CAMLP4LIB;; -+esac -+ -+# Assume that camlp(4|5) binaries are at the same place as ocaml ones -+# (this should become configurable some day) -+CAMLP4BIN=${CAMLBIN} -+ -+# do we have a native compiler: test of ocamlopt and its version -+ -+if [ "$best_compiler" = "opt" ] ; then -+ if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then -+ CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` -+ if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then -+ case $CAMLOPTVERSION in -+ 3.09.3|3.1?*) ;; -+ *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3," -+ best_compiler=byte -+ echo "only the bytecode version of Coq will be available." -+ esac -+ elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then -+ best_compiler=byte -+ echo "Cannot find native-code $CAMLP4," -+ echo "only the bytecode version of Coq will be available." -+ else -+ if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then -+ echo "Native and bytecode compilers do not have the same version!" -+ fi -+ echo "You have native-code compilation. Good!" -+ fi -+ else -+ best_compiler=byte -+ echo "You have only bytecode compilation." -+ fi -+fi -+ -+# OS dependent libraries -+ -+case $ARCH in -+ sun4*) OS=`uname -r` -+ case $OS in -+ 5*) OS="Sun Solaris $OS" -+ OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";; -+ *) OS="Sun OS $OS" -+ OSDEPLIBS="-cclib -lunix" -+ esac;; -+ alpha) OSDEPLIBS="-cclib -lunix";; -+ win32) OS="Win32" -+ OSDEPLIBS="-cclib -lunix" -+ cflags="-mno-cygwin $cflags";; -+ *) OSDEPLIBS="-cclib -lunix" -+esac -+ -+# lablgtk2 and CoqIDE -+ -+# -byte-only should imply -coqide byte, unless the user decides otherwise -+ -+if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then -+ coqide_spec=yes -+ COQIDE=byte -+fi -+ -+# Which coqide is asked ? which one is possible ? -+ -+if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then -+ echo "CoqIde disabled as requested." -+else -+ case $lablgtkdir_spec in -+ no) -+ if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/lablgtk2 -+ elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then -+ lablgtkdir=${CAMLLIB}/site-lib/lablgtk2 -+ fi;; -+ yes) -+ if [ ! -f "$lablgtkdir/glib.mli" ]; then -+ echo "Incorrect LablGtk2 library (glib.mli not found)." -+ echo "Configuration script failed!" -+ exit 1 -+ fi;; -+ esac -+ if [ "$lablgtkdir" = "" ]; then -+ echo "LablGtk2 not found: CoqIde will not be available." -+ COQIDE=no -+ elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then -+ echo "LablGtk2 found but too old: CoqIde will not be available." -+ COQIDE=no; -+ elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then -+ echo "LablGtk2 found, bytecode CoqIde will be used as requested." -+ COQIDE=byte -+ elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then -+ echo "LablGtk2 found, no native threads: bytecode CoqIde will be available." -+ COQIDE=byte -+ else -+ echo "LablGtk2 found, native threads: native CoqIde will be available." -+ COQIDE=opt -+ fi -+fi -+ -+case $COQIDE in -+ byte|opt) -+ case $lablgtkdir_spec in -+ no) LABLGTKLIB=+lablgtk2 # Pour le message -+ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile -+ yes) LABLGTKLIB="$lablgtkdir" # Pour le message -+ LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile -+ esac;; -+ no) LABLGTKINCLUDES="";; -+esac -+ -+# strip command -+ -+case $ARCH in -+ win32) -+ # true -> strip : it exists under cygwin ! -+ STRIPCOMMAND="strip";; -+ *) -+ if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] || -+ [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ] -+ then -+ STRIPCOMMAND="true" -+ else -+ STRIPCOMMAND="strip" -+ fi -+esac -+ -+# mktexlsr -+#MKTEXLSR=`which mktexlsr` -+#case $MKTEXLSR in -+# "") MKTEXLSR=true;; -+#esac -+ -+# " -+### Test if documentation can be compiled (latex, hevea) -+ -+if test "$with_doc" = "all" -+then -+ for cmd in "latex" "hevea" ; do -+ if test ! -x "`which $cmd`" -+ then -+ echo "$cmd was not found; documentation will not be available" -+ with_doc=no -+ break -+ fi -+ done -+fi -+ -+########################################### -+# bindir, libdir, mandir, docdir, etc. -+ -+case $src_spec in -+ no) COQTOP=${COQSRC} -+esac -+ -+# OCaml only understand Windows filenames (C:\...) -+case $ARCH in -+ win32) COQTOP=`cygpath -m ${COQTOP}` -+esac -+ -+case $ARCH in -+ win32) -+ bindir_def='C:\coq\bin' -+ libdir_def='C:\coq\lib' -+ mandir_def='C:\coq\man' -+ docdir_def='C:\coq\doc' -+ emacslib_def='C:\coq\emacs' -+ coqdocdir_def='C:\coq\latex';; -+ *) -+ bindir_def=/usr/local/bin -+ libdir_def=/usr/local/lib/coq -+ mandir_def=/usr/local/man -+ docdir_def=/usr/local/share/doc/coq -+ emacslib_def=/usr/local/share/emacs/site-lisp -+ coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; -+esac -+ -+emacs_def=emacs -+ -+case $bindir_spec/$prefix_spec/$local in -+ yes/*/*) BINDIR=$bindir ;; -+ */yes/*) BINDIR=$prefix/bin ;; -+ */*/true) BINDIR=$COQTOP/bin ;; -+ *) printf "Where should I install the Coq binaries [$bindir_def]? " -+ read BINDIR -+ case $BINDIR in -+ "") BINDIR=$bindir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $libdir_spec/$prefix_spec/$local in -+ yes/*/*) LIBDIR=$libdir;; -+ */yes/*) -+ case $ARCH in -+ win32) LIBDIR=$prefix ;; -+ *) LIBDIR=$prefix/lib/coq ;; -+ esac ;; -+ */*/true) LIBDIR=$COQTOP ;; -+ *) printf "Where should I install the Coq library [$libdir_def]? " -+ read LIBDIR -+ case $LIBDIR in -+ "") LIBDIR=$libdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $mandir_spec/$prefix_spec/$local in -+ yes/*/*) MANDIR=$mandir;; -+ */yes/*) MANDIR=$prefix/man ;; -+ */*/true) MANDIR=$COQTOP/man ;; -+ *) printf "Where should I install the Coq man pages [$mandir_def]? " -+ read MANDIR -+ case $MANDIR in -+ "") MANDIR=$mandir_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $docdir_spec/$prefix_spec/$local in -+ yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;; -+ *) printf "Where should I install the Coq documentation [$docdir_def]? " -+ read DOCDIR -+ case $DOCDIR in -+ "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;; -+ *) true;; -+ esac;; -+esac -+ -+case $emacslib_spec/$prefix_spec/$local in -+ yes/*/*) EMACSLIB=$emacslib;; -+ */yes/*) -+ case $ARCH in -+ win32) EMACSLIB=$prefix/emacs ;; -+ *) EMACSLIB=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) EMACSLIB=$COQTOP/tools/emacs ;; -+ *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? " -+ read EMACSLIB -+ case $EMACSLIB in -+ "") EMACSLIB=$emacslib_def;; -+ *) true;; -+ esac;; -+esac -+ -+case $coqdocdir_spec/$prefix_spec/$local in -+ yes/*/*) COQDOCDIR=$coqdocdir;; -+ */yes/*) -+ case $ARCH in -+ win32) COQDOCDIR=$prefix/latex ;; -+ *) COQDOCDIR=$prefix/share/emacs/site-lisp ;; -+ esac ;; -+ */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;; -+ *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? " -+ read COQDOCDIR -+ case $COQDOCDIR in -+ "") COQDOCDIR=$coqdocdir_def;; -+ *) true;; -+ esac;; -+esac -+ -+# Determine if we enable -custom by default (Windows and MacOS) -+CUSTOM_OS=no -+if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then -+ CUSTOM_OS=yes -+fi -+ -+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!" -+case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in -+ yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";; -+ */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";; -+ */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; -+ *) -+ COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" -+ BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; -+esac -+case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in -+ yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; -+ */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";; -+ *) COQTOOLSBYTEFLAGS="";; -+esac -+ -+# case $emacs_spec in -+# no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? " -+# read EMACS -+ -+# case $EMACS in -+# "") EMACS=$emacs_def;; -+# *) true;; -+# esac;; -+# yes) EMACS=$emacs;; -+# esac -+ -+ -+ -+########################################### -+# Summary of the configuration -+ -+echo "" -+echo " Coq top directory : $COQTOP" -+echo " Architecture : $ARCH" -+if test ! -z "$OS" ; then -+ echo " Operating system : $OS" -+fi -+echo " Coq VM bytecode link flags : $COQRUNBYTEFLAGS" -+echo " Coq tools bytecode link flags : $COQTOOLSBYTEFLAGS" -+echo " OS dependent libraries : $OSDEPLIBS" -+echo " Objective-Caml/Camlp4 version : $CAMLVERSION" -+echo " Objective-Caml/Camlp4 binaries in : $CAMLBIN" -+echo " Objective-Caml library in : $CAMLLIB" -+echo " Camlp4 library in : $CAMLP4LIB" -+if test "$best_compiler" = opt ; then -+echo " Native dynamic link support : $HASNATDYNLINK" -+fi -+if test "$COQIDE" != "no"; then -+echo " Lablgtk2 library in : $LABLGTKLIB" -+fi -+if test "$with_doc" = "all"; then -+echo " Documentation : All" -+else -+echo " Documentation : None" -+fi -+echo " CoqIde : $COQIDE" -+echo " Web browser : $BROWSER" -+echo " Coq web site : $WWWCOQ" -+echo "" -+ -+echo " Paths for true installation:" -+echo " binaries will be copied in $BINDIR" -+echo " library will be copied in $LIBDIR" -+echo " man pages will be copied in $MANDIR" -+echo " documentation will be copied in $DOCDIR" -+echo " emacs mode will be copied in $EMACSLIB" -+echo "" -+ -+################################################## -+# Building the $COQTOP/dev/ocamldebug-coq file -+################################################## -+ -+OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq -+ -+if test "$coq_debug_flag" = "-g" ; then -+ rm -f $OCAMLDEBUGCOQ -+ sed -e "s|COQTOPDIRECTORY|$COQTOP|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\ -+ $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ -+ chmod a-w,a+x $OCAMLDEBUGCOQ -+fi -+ -+#################################################### -+# Fixing lablgtk types (before/after 2.6.0) -+#################################################### -+ -+if [ ! "$COQIDE" = "no" ]; then -+ if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then -+ if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then -+ cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli -+ else -+ cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli -+ fi -+ else -+ cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli -+ fi -+fi -+ -+############################################## -+# Creation of configuration files -+############################################## -+ -+mlconfig_file="$COQSRC/config/coq_config.ml" -+config_file="$COQSRC/config/Makefile" -+config_template="$COQSRC/config/Makefile.template" -+ -+ -+### Warning !! -+### After this line, be careful when using variables, -+### since some of them (e.g. $COQSRC) will be escaped -+ -+ -+# An escaped version of a variable -+escape_var () { -+"$ocamlexec" 2>&1 1>/dev/null < $mlconfig_file -+(* DO NOT EDIT THIS FILE: automatically generated by ../configure *) -+ -+let local = $local -+let coqrunbyteflags = "$COQRUNBYTEFLAGS" -+let coqlib = "$LIBDIR" -+let coqsrc = "$COQSRC" -+let ocaml = "$ocamlexec" -+let ocamlc = "$bytecamlc" -+let ocamlopt = "$nativecamlc" -+let ocamlmklib = "$ocamlmklibexec" -+let ocamldep = "$ocamldepexec" -+let ocamldoc = "$ocamldocexec" -+let ocamlyacc = "$ocamlyaccexec" -+let ocamllex = "$ocamllexexec" -+let camlbin = "$CAMLBIN" -+let camllib = "$CAMLLIB" -+let camlp4 = "$CAMLP4" -+let camlp4o = "$camlp4oexec" -+let camlp4bin = "$CAMLP4BIN" -+let camlp4lib = "$CAMLP4LIB" -+let camlp4compat = "$CAMLP4COMPAT" -+let coqideincl = "$LABLGTKINCLUDES" -+let cflags = "$cflags" -+let best = "$best_compiler" -+let arch = "$ARCH" -+let has_coqide = "$COQIDE" -+let has_natdynlink = $HASNATDYNLINK -+let natdynlinkflag = "$NATDYNLINKFLAG" -+let osdeplibs = "$OSDEPLIBS" -+let version = "$VERSION" -+let caml_version = "$CAMLVERSION" -+let date = "$DATE" -+let compile_date = "$COMPILEDATE" -+let vo_magic_number = $VOMAGIC -+let state_magic_number = $STATEMAGIC -+let exec_extension = "$EXE" -+let with_geoproof = ref $with_geoproof -+let browser = "$BROWSER" -+let wwwcoq = "$WWWCOQ" -+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/" -+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/" -+let localwwwrefman = "file://$HTMLREFMANDIR/" -+ -+END_OF_COQ_CONFIG -+ -+# to be sure printf is found on windows when spaces occur in PATH variable -+PRINTF=`which printf` -+ -+# Subdirectories of theories/ added in coq_config.ml -+subdirs () { -+ (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file") -+} -+ -+echo "let theories_dirs = [" >> "$mlconfig_file" -+subdirs theories -+echo "]" >> "$mlconfig_file" -+ -+echo "let plugins_dirs = [" >> "$mlconfig_file" -+subdirs plugins -+echo "]" >> "$mlconfig_file" -+ -+chmod a-w "$mlconfig_file" -+ -+ -+############################################### -+# Building the $COQTOP/config/Makefile file -+############################################### -+ -+rm -f "$config_file" -+ -+sed -e "s|LOCALINSTALLATION|$local|" \ -+ -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \ -+ -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \ -+ -e "s|COQSRCDIRECTORY|$COQSRC|" \ -+ -e "s|COQVERSION|$VERSION|" \ -+ -e "s|BINDIRDIRECTORY|$BINDIR|" \ -+ -e "s|COQLIBDIRECTORY|$LIBDIR|" \ -+ -e "s|BUILDLDPATH=|$BUILDLDPATH|" \ -+ -e "s|MANDIRDIRECTORY|$MANDIR|" \ -+ -e "s|DOCDIRDIRECTORY|$DOCDIR|" \ -+ -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \ -+ -e "s|EMACSCOMMAND|$EMACS|" \ -+ -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \ -+ -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \ -+ -e "s|ARCHITECTURE|$ARCH|" \ -+ -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \ -+ -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \ -+ -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \ -+ -e "s|CAMLTAG|$CAMLTAG|" \ -+ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -+ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ -+ -e "s|CAMLP4TOOL|$camlp4oexec|" \ -+ -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \ -+ -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \ -+ -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \ -+ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -+ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ -+ -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \ -+ -e "s|CCOMPILEFLAGS|$cflags|" \ -+ -e "s|BESTCOMPILER|$best_compiler|" \ -+ -e "s|DLLEXTENSION|$DLLEXT|" \ -+ -e "s|EXECUTEEXTENSION|$EXE|" \ -+ -e "s|BYTECAMLC|$bytecamlc|" \ -+ -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \ -+ -e "s|NATIVECAMLC|$nativecamlc|" \ -+ -e "s|OCAMLEXEC|$ocamlexec|" \ -+ -e "s|OCAMLDEPEXEC|$ocamldepexec|" \ -+ -e "s|OCAMLDOCEXEC|$ocamldocexec|" \ -+ -e "s|OCAMLLEXEXEC|$ocamllexexec|" \ -+ -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \ -+ -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \ -+ -e "s|CCEXEC|$gcc_exec|" \ -+ -e "s|AREXEC|$ar_exec|" \ -+ -e "s|RANLIBEXEC|$ranlib_exec|" \ -+ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -+ -e "s|COQIDEOPT|$COQIDE|" \ -+ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ -+ -e "s|WITHDOCOPT|$with_doc|" \ -+ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ -+ "$config_template" > "$config_file" -+ -+chmod a-w "$config_file" -+ -+################################################## -+# The end -+#################################################### -+ -+echo "If anything in the above is wrong, please restart './configure'." -+echo -+echo "*Warning* To compile the system for a new architecture" -+echo " don't forget to do a 'make archclean' before './configure'." -+ -+# $Id: configure 14833 2011-12-19 21:57:30Z notin $ diff --git a/pkgs/applications/science/logic/coq/default.8.3.nix b/pkgs/applications/science/logic/coq/default.8.3.nix new file mode 100644 index 000000000000..bf759a4a3260 --- /dev/null +++ b/pkgs/applications/science/logic/coq/default.8.3.nix @@ -0,0 +1,69 @@ +# - coqide compilation can be disabled by setting lablgtk to null; + +{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: + +let + version = "8.3pl4"; + buildIde = lablgtk != null; + ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + idePatch = if buildIde then '' + substituteInPlace scripts/coqmktop.ml --replace \ + "\"-I\"; \"+lablgtk2\"" \ + "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" + '' else ""; +in + +stdenv.mkDerivation { + name = "coq-${version}"; + + src = fetchurl { + url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; + sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; + }; + + buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; + + prefixKey = "-prefix "; + + preConfigure = '' + configureFlagsArray=( + -opt + -camldir ${ocaml}/bin + -camlp5dir $(ocamlfind query camlp5) + ${ideFlags} + ) + ''; + + buildFlags = "world"; # Debug with "world VERBOSE=1"; + + patches = [ ./configure.patch ]; + + postPatch = '' + UNAME=$(type -tp uname) + RM=$(type -tp rm) + substituteInPlace configure --replace "/bin/uname" "$UNAME" + substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + ${idePatch} + ''; + + # This post install step is needed to build ssrcoqide from the ssreflect package + # It could be made optional, but I see little harm in including it in the default + # distribution -- roconnor + # This will likely no longer be necessary for coq >= 8.4. -- roconnor + postInstall = if buildIde then '' + cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ + '' else ""; + + meta = { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.roconnor ]; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bf759a4a3260..9596c30ee6af 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,15 +1,13 @@ # - coqide compilation can be disabled by setting lablgtk to null; -{stdenv, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: +{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.3pl4"; + version = "8.4"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - idePatch = if buildIde then '' - substituteInPlace scripts/coqmktop.ml --replace \ - "\"-I\"; \"+lablgtk2\"" \ - "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\"" + idePath = if buildIde then '' + CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs '' else ""; in @@ -17,24 +15,11 @@ stdenv.mkDerivation { name = "coq-${version}"; src = fetchurl { - url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; - sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; + url = "http://pauillac.inria.fr/~herbelin/coq/distrib/V${version}/files/coq-${version}.tar.gz"; + sha256 = "0ka2lak9il4hlblk461awf0hbi3mxqhc1wz6kllxradyy2vfaspl"; }; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - prefixKey = "-prefix "; - - preConfigure = '' - configureFlagsArray=( - -opt - -camldir ${ocaml}/bin - -camlp5dir $(ocamlfind query camlp5) - ${ideFlags} - ) - ''; - - buildFlags = "world"; # Debug with "world VERBOSE=1"; + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; patches = [ ./configure.patch ]; @@ -43,16 +28,21 @@ stdenv.mkDerivation { RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${idePatch} ''; - # This post install step is needed to build ssrcoqide from the ssreflect package - # It could be made optional, but I see little harm in including it in the default - # distribution -- roconnor - # This will likely no longer be necessary for coq >= 8.4. -- roconnor - postInstall = if buildIde then '' - cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ - '' else ""; + preConfigure = '' + buildFlagsArray=(${idePath}) + configureFlagsArray=( + -opt + -camldir ${ocaml}/bin + -camlp5dir $(ocamlfind query camlp5) + ${ideFlags} + ) + ''; + + prefixKey = "-prefix "; + + buildFlags = "revision coq coqide"; meta = { description = "Coq proof assistant"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55e16d3d8798..f15f34ff36f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8428,6 +8428,11 @@ let camlp5 = ocamlPackages.camlp5_transitional; }; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + cvc3 = callPackage ../applications/science/logic/cvc3 {}; eprover = callPackage ../applications/science/logic/eProver { @@ -8481,6 +8486,7 @@ let spass = callPackage ../applications/science/logic/spass {}; ssreflect = callPackage ../applications/science/logic/ssreflect { + coq = coq_8_3; camlp5 = ocamlPackages.camlp5_transitional; }; From eafd2008f14ec5d428eb01ad44e58d5dd7412fe8 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 19 Aug 2012 01:06:15 -0400 Subject: [PATCH 0691/1120] Correcting filename. --- pkgs/applications/science/logic/coq/{default.8.3.nix => 8.3.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/applications/science/logic/coq/{default.8.3.nix => 8.3.nix} (100%) diff --git a/pkgs/applications/science/logic/coq/default.8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix similarity index 100% rename from pkgs/applications/science/logic/coq/default.8.3.nix rename to pkgs/applications/science/logic/coq/8.3.nix From 525b8015e7bc163cb80efd10d0cdfa09b37e6fac Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 19 Aug 2012 01:11:11 -0400 Subject: [PATCH 0692/1120] Fixing configure patch for coq 8.3. --- pkgs/applications/science/logic/coq/8.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index bf759a4a3260..f23622de8a03 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { buildFlags = "world"; # Debug with "world VERBOSE=1"; - patches = [ ./configure.patch ]; + patches = [ ./configure.8.3.patch ]; postPatch = '' UNAME=$(type -tp uname) From 830e9db5ddfec4c2f8708318d566874eae83c7a3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Aug 2012 12:36:43 +0200 Subject: [PATCH 0693/1120] virtualbox: Use Linux's kbuild to build modules. Don't rely on VirtualBox's in-tree build scripts to set include paths correctly and use the official way of the Linux kernel to build the modules. That way we don't need to make ugly symlinks in the kernel tree or heavily patch VirtualBox. --- .../virtualization/virtualbox/default.nix | 42 ++++++++----------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 2736c603a48d..6fc9dcf4bc22 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ - --disable-pulse --disable-hardening \ + --disable-pulse --disable-hardening --disable-kmods \ --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk @@ -63,51 +63,43 @@ stdenv.mkDerivation { enableParallelBuilding = true; - preBuild = '' + buildPhase = '' source env.sh kmk - cd out/linux.*/release/bin/src - export KERN_DIR=${kernel}/lib/modules/*/build ''; - postBuild = '' - cd ../../../../.. - ''; - installPhase = '' libexec=$out/libexec/virtualbox - + # Install VirtualBox files cd out/linux.*/release/bin mkdir -p $libexec cp -av * $libexec - - # Install kernel module - cd src - kernelVersion=$(cd ${kernel}/lib/modules; ls) - export MODULE_DIR=$out/lib/modules/$kernelVersion/misc - - # Remove root ownership stuff, since this does not work in a chroot environment - for i in `find . -name Makefile`; do - sed -i -e "s|-o root||g" \ - -e "s|-g root||g" $i - done - + # Install kernel modules - make install - + curdir="$(pwd)" + for makefile in $curdir/out/linux.*/release/bin/src/*/Makefile \ + $curdir/out/linux.*/release/bin/additions/src/*/Makefile + do + mod="$(dirname "$makefile")" + name="$(basename "$mod")" + export INSTALL_MOD_PATH="$out" + export INSTALL_MOD_DIR=misc + make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD= modules_install + done + # Create wrapper script mkdir -p $out/bin for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do ln -s "$libexec/$file" $out/bin/$file done - + # Create and fix desktop item mkdir -p $out/share/applications sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop ln -sfv $libexec/virtualbox.desktop $out/share/applications ''; - + meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; From 31d8a9a1f4043205978e5b2587b53aba841850d5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Aug 2012 14:45:14 +0200 Subject: [PATCH 0694/1120] virtualbox: Fix wrong path when recursing modules. The for loop didn't find $curdir, because it was set _after_ the directory has been changed. The variable is now called $srcroot and is set before the installPhase is changing directories. --- pkgs/applications/virtualization/virtualbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6fc9dcf4bc22..f0b9e7d078e6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation { ''; installPhase = '' + srcroot="$(pwd)" libexec=$out/libexec/virtualbox # Install VirtualBox files @@ -77,9 +78,8 @@ stdenv.mkDerivation { cp -av * $libexec # Install kernel modules - curdir="$(pwd)" - for makefile in $curdir/out/linux.*/release/bin/src/*/Makefile \ - $curdir/out/linux.*/release/bin/additions/src/*/Makefile + for makefile in $srcroot/out/linux.*/release/bin/src/*/Makefile \ + $srcroot/out/linux.*/release/bin/additions/src/*/Makefile do mod="$(dirname "$makefile")" name="$(basename "$mod")" From e32d7843da1dd53cde43c938cb83c109f57de0b0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Aug 2012 14:47:25 +0200 Subject: [PATCH 0695/1120] virtualbox: Set depmod path to /do_not_use_depmod. The scripts/depmod.sh checks whether the path in $DEPMOD is executable and only executes it if that's the case. So, by setting DEPMOD to "/do_not_use_depmod" the destination path doesn't exist _and_ thus isn't executable aswell. --- pkgs/applications/virtualization/virtualbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f0b9e7d078e6..16ff38b4bcba 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { name="$(basename "$mod")" export INSTALL_MOD_PATH="$out" export INSTALL_MOD_DIR=misc - make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD= modules_install + make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod modules_install done # Create wrapper script From 3e62a02b17096cf44050e1e5d197234c7abe0f9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 18 Aug 2012 16:47:13 +0200 Subject: [PATCH 0696/1120] virtualbox: Separate modules build and install. First of all, modules won't install when there is no "make modules" prior to it, so we're doing this now with a new function called forEachModule, so we can avoid duplication as much as possible. In addition this sets $sourcedir to the current directory of the configurePhase, so we're able to find the source tree later on, after several chdir()s. --- .../virtualization/virtualbox/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 16ff38b4bcba..07f0aae746e0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -8,9 +8,19 @@ with stdenv.lib; -let version = "4.1.18"; in - -stdenv.mkDerivation { +let + version = "4.1.18"; + forEachModule = action: '' + for makefile in $sourcedir/out/linux.*/release/bin/src/*/Makefile \ + $sourcedir/out/linux.*/release/bin/additions/src/*/Makefile + do + mod="$(dirname "$makefile")" + export INSTALL_MOD_PATH="$out" + export INSTALL_MOD_DIR=misc + make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} + done + ''; +in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; @@ -42,6 +52,7 @@ stdenv.mkDerivation { ''; configurePhase = '' + sourcedir="$(pwd)" ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ @@ -66,6 +77,7 @@ stdenv.mkDerivation { buildPhase = '' source env.sh kmk + ${forEachModule "modules"} ''; installPhase = '' @@ -78,15 +90,7 @@ stdenv.mkDerivation { cp -av * $libexec # Install kernel modules - for makefile in $srcroot/out/linux.*/release/bin/src/*/Makefile \ - $srcroot/out/linux.*/release/bin/additions/src/*/Makefile - do - mod="$(dirname "$makefile")" - name="$(basename "$mod")" - export INSTALL_MOD_PATH="$out" - export INSTALL_MOD_DIR=misc - make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod modules_install - done + ${forEachModule "modules_install"} # Create wrapper script mkdir -p $out/bin From 9fb1d2e6fc16d64264fd5ef96cda4fb230a538f3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 18 Aug 2012 16:50:15 +0200 Subject: [PATCH 0697/1120] virtualbox: Remove redundant NIX_CFLAGS_COMPILE. The "include/generated" stuff is already added to the search path by the kernel modules build system, so no need to hack it in like this. --- pkgs/applications/virtualization/virtualbox/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 07f0aae746e0..e28d38936524 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,8 +23,6 @@ let in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; - NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7"; From 1b8ec2eeec021ad6a60bb0644cb93c0bcaad1142 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 18 Aug 2012 16:52:51 +0200 Subject: [PATCH 0698/1120] virtualbox: Don't build modules for guests. We're the host so we don't need the kernel modules for the guest additions, as they're build with in a separate derivation anyway. --- pkgs/applications/virtualization/virtualbox/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index e28d38936524..70d4bc072763 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,8 +11,7 @@ with stdenv.lib; let version = "4.1.18"; forEachModule = action: '' - for makefile in $sourcedir/out/linux.*/release/bin/src/*/Makefile \ - $sourcedir/out/linux.*/release/bin/additions/src/*/Makefile + for makefile in $sourcedir/out/linux.*/release/bin/src/*/Makefile do mod="$(dirname "$makefile")" export INSTALL_MOD_PATH="$out" From 0f9a5eb0273f64ff14944c61be4d9c1b5bb1213a Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 18 Aug 2012 19:20:28 +0200 Subject: [PATCH 0699/1120] virtualbox: Add symbol versions to all modules. Copy all symbol versions from the ones generated in the vboxdrv build. --- .../virtualization/virtualbox/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 70d4bc072763..ddbb58e55fb7 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,11 +11,18 @@ with stdenv.lib; let version = "4.1.18"; forEachModule = action: '' - for makefile in $sourcedir/out/linux.*/release/bin/src/*/Makefile + for mod in \ + $sourcedir/out/linux.*/release/bin/src/vboxdrv \ + $sourcedir/out/linux.*/release/bin/src/vboxpci \ + $sourcedir/out/linux.*/release/bin/src/vboxnetadp \ + $sourcedir/out/linux.*/release/bin/src/vboxnetflt do - mod="$(dirname "$makefile")" - export INSTALL_MOD_PATH="$out" - export INSTALL_MOD_DIR=misc + if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] + then + cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \ + "$mod/Module.symvers" + fi + INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} done ''; From 347e8c32a32fba2b9f171d109dc943173bb5cf52 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 18 Aug 2012 19:31:34 +0200 Subject: [PATCH 0700/1120] virtualbox: Remove unused variable $srcroot. Thanks to @shlevy for mentioning this. --- pkgs/applications/virtualization/virtualbox/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ddbb58e55fb7..ce81ff3bf9fe 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -85,7 +85,6 @@ in stdenv.mkDerivation { ''; installPhase = '' - srcroot="$(pwd)" libexec=$out/libexec/virtualbox # Install VirtualBox files From 0ac1cf106d6dd8942442f96a6255d868b18bed70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 19 Aug 2012 15:50:50 +0200 Subject: [PATCH 0701/1120] gpsbabel: Update to 1.4.3. --- pkgs/applications/misc/gpsbabel/default.nix | 26 ++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index a8ccb1c0fef0..29d5b1ee7cc8 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,15 +1,19 @@ -{ fetchurl, stdenv, zlib, expat }: +{ fetchurl, stdenv, zlib, expat, which }: -stdenv.mkDerivation rec { - name = "gpsbabel-1.3.6"; +let version = "1.4.3"; in +stdenv.mkDerivation { + name = "gpsbabel-${version}"; src = fetchurl { - url = "http://www.gpsbabel.org/plan9.php?dl=${name}.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "1dm9lpcdsj0vz699zz932xc1vphvap627wl0qp61izlkzh25vg88"; + # gpgbabel.org makes it hard to get the source tarball automatically, so + # get it from elsewhere. + url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz"; + sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi"; }; - buildInputs = [ zlib expat ]; + # FIXME: Would need libxml2 for one of the tests, but that in turns require + # network access for the XML schemas. + buildInputs = [ zlib expat which ]; /* FIXME: Building the documentation, with "make doc", requires this: @@ -17,7 +21,10 @@ stdenv.mkDerivation rec { But FOP isn't packaged yet. */ - configureFlags = "--with-zlib=system"; + preConfigure = "cd gpsbabel"; + configureFlags = [ "--with-zlib=system" ]; + + doCheck = true; meta = { description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; @@ -44,5 +51,8 @@ stdenv.mkDerivation rec { homepage = http://www.gpsbabel.org/; license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From bccab0ff91cdb176b766f1300e68373802b42ba6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Aug 2012 16:00:24 -0400 Subject: [PATCH 0702/1120] slim: Build with ConsoleKit support --- 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 2de64d0d11ef..7dc8dee2dbd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7520,9 +7520,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; From 255c72ede6e2e9a183cd54f14eedb69e421a67b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 20 Aug 2012 10:13:57 +0200 Subject: [PATCH 0703/1120] gcc 4.5: Update to 4.5.4. --- pkgs/development/compilers/gcc/4.5/default.nix | 2 +- pkgs/development/compilers/gcc/4.5/sources.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b3c639c6f0ae..9cf38718a473 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -40,7 +40,7 @@ assert libelf != null -> zlib != null; with stdenv.lib; with builtins; -let version = "4.5.3"; +let version = "4.5.4"; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at # `configure' time. diff --git a/pkgs/development/compilers/gcc/4.5/sources.nix b/pkgs/development/compilers/gcc/4.5/sources.nix index acf1ec2971cb..71e1e483cacd 100644 --- a/pkgs/development/compilers/gcc/4.5/sources.nix +++ b/pkgs/development/compilers/gcc/4.5/sources.nix @@ -1,26 +1,26 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.5.3. */ + For GCC 4.5.4. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: -assert version == "4.5.3"; +assert version == "4.5.4"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87"; + sha256 = "894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b"; + sha256 = "f7e3bab5e22713fbce46c2acb35fb727748473a34a942ce00393d75e1b09b6b9"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "618e8a2334eb3e2baf00891e9b2da47f32e797520e230acddb5f02fada0006cd"; + sha256 = "cf0803b4f5334a526dd8da1b2171d6724f50c17346b2d5c509b6abc973d2ef34"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "c687198d4882c9d505eeb406595dad041602a5b6c67da5cf15d4941b34d20144"; + sha256 = "c98398da6f8c4c7d1758e291089d99853fdd27112cd3f146b7a8c26e6d762a23"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "686a6d2453bc325f32ddc90edf86502dc68320c7cd6948d60d93d0b0f5965b8f"; + sha256 = "8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e"; }) ++ [] From a5615adc974bfb50b497ecbd8018fefe580702b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 20 Aug 2012 10:15:42 +0200 Subject: [PATCH 0704/1120] gcc 4.7: Add `gcc47_debug'. --- pkgs/top-level/all-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dc8dee2dbd5..1183746de101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2050,6 +2050,15 @@ let else null; })); + gcc47_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { + stripped = false; + + inherit noSysDirs; + cross = null; + libcCross = null; + binutilsCross = null; + })); + gccApple = wrapGCC (makeOverridable (if stdenv.system == "i686-darwin" From 08e09e4cafc9bebbaa6b5be27e527199ba5fb70a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:18:05 +0200 Subject: [PATCH 0705/1120] haskell-comonad: update to version 3.0.0.2 --- .../libraries/haskell/comonad/{3.0.0.1.nix => 3.0.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/comonad/{3.0.0.1.nix => 3.0.0.2.nix} (79%) diff --git a/pkgs/development/libraries/haskell/comonad/3.0.0.1.nix b/pkgs/development/libraries/haskell/comonad/3.0.0.2.nix similarity index 79% rename from pkgs/development/libraries/haskell/comonad/3.0.0.1.nix rename to pkgs/development/libraries/haskell/comonad/3.0.0.2.nix index b73e29fc1e0c..3394de012060 100644 --- a/pkgs/development/libraries/haskell/comonad/3.0.0.1.nix +++ b/pkgs/development/libraries/haskell/comonad/3.0.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.0.1"; - sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz"; + version = "3.0.0.2"; + sha256 = "01q71b446mdbdj81qjrxjl5bshbg4bjih5zpw9fd4y5431bclfhi"; buildDepends = [ semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/comonad/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e04f18c3ae2..0590bcf8d408 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -533,8 +533,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonad_3_0_0_1 = callPackage ../development/libraries/haskell/comonad/3.0.0.1.nix {}; - comonad = self.comonad_3_0_0_1; + comonad_3_0_0_2 = callPackage ../development/libraries/haskell/comonad/3.0.0.2.nix {}; + comonad = self.comonad_3_0_0_2; comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { comonad = self.comonad_1_1_1_6; From 2879d112b0abba76b0edf5f7800f008f6056d481 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:19:29 +0200 Subject: [PATCH 0706/1120] haskell-network: update to version 2.3.1.0 --- .../libraries/haskell/network/{2.3.0.14.nix => 2.3.1.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.3.0.14.nix => 2.3.1.0.nix} (80%) diff --git a/pkgs/development/libraries/haskell/network/2.3.0.14.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.3.0.14.nix rename to pkgs/development/libraries/haskell/network/2.3.1.0.nix index bbc43abc42bf..28fa50d83424 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.14.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.0.14"; - sha256 = "0naqg7ai50m3p093mi342w2z0flaagarf9n9smkn1dqvq8jg75x5"; + version = "2.3.1.0"; + sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; buildDepends = [ parsec ]; meta = { homepage = "http://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0590bcf8d408..fddc9589d3ae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -128,7 +128,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP = self.HTTP_4000_2_3; # 7.5 ok HUnit = self.HUnit_1_2_5_1; # 7.5 ok mtl = self.mtl_2_1_2; # 7.5 ok - network = self.network_2_3_0_14; # 7.5 ok + network = self.network_2_3_1_0; # 7.5 ok OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail parallel = self.parallel_3_2_0_2; # 7.5 fail parsec = self.parsec_3_1_3; # 7.5 ok @@ -1110,8 +1110,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {}; network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {}; network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; - network_2_3_0_14 = callPackage ../development/libraries/haskell/network/2.3.0.14.nix {}; - network = self.network_2_3_0_14; + network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; + network = self.network_2_3_1_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; From 46d8125a70ebf3c1530171cf4a2c452af2d99c1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:17 +0200 Subject: [PATCH 0707/1120] haskell-MonadCatchIO-mtl: update to version 0.3.0.5 --- .../libraries/haskell/MonadCatchIO-mtl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index 10b28522a506..9b044f6dbab5 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-mtl"; - version = "0.3.0.4"; - sha256 = "0wzdrfplwa4v9miv88rg3jvf7l6gphc29lpdp5qjm5873y57jxm7"; + version = "0.3.0.5"; + sha256 = "01c2xif4aly2lmg2qkri791ignq3r2qg4xbc8m06cdm6gh5a2dqp"; buildDepends = [ extensibleExceptions mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; From 2f187b26ace37d8373d039c56de077d5951f1f53 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0708/1120] haskell-case-insensitive: update to version 0.4.0.3 --- .../libraries/haskell/case-insensitive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/case-insensitive/default.nix b/pkgs/development/libraries/haskell/case-insensitive/default.nix index 4b2305f31ac2..7f53773f1ab6 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/default.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "case-insensitive"; - version = "0.4.0.2"; - sha256 = "1awr74lxmcpjkz099mcfk3372q4l7apar0pjxr4d2rgsvi5yx8jd"; + version = "0.4.0.3"; + sha256 = "1lpfxfwfxiimvh5nxqrnjqj2687dp7rmv9wkrpmw2zm5wkxwcmzf"; buildDepends = [ hashable text ]; meta = { homepage = "https://github.com/basvandijk/case-insensitive"; From f3ad91448173737d0f33963ab3109f15d14e164f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0709/1120] haskell-hoogle: update to version 4.2.13 --- 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 db5dc38e38f8..e13ab47beaac 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.12"; - sha256 = "1j726bm8sx4qamaib6l14s4a4jz4z6szhj1vk8n5b6f3g38s7hwy"; + version = "4.2.13"; + sha256 = "0asw9lr22d8jxr58b7w2j5hgllxhw2w8kllh5aq5jjs272hjiy9i"; isLibrary = true; isExecutable = true; buildDepends = [ From 439ba01f0af1dd60e7e9e3d9a0f0a528fae8ea9d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0710/1120] haskell-io-choice: update to version 0.0.2 --- pkgs/development/libraries/haskell/io-choice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index 85e49f5a67f1..f8b1f1d51a42 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.1"; - sha256 = "0jwxqs65g88q9l0w4xzllj7svz3qr2zgiaq2fyq5jmh33lz74r63"; + version = "0.0.2"; + sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; From 5e19db2ce5ca3786b87fb31839d51af82b36ab69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0711/1120] haskell-semigroups: update to version 0.8.4 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 8ca726c7eff3..795c690d7a24 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8.3.2"; - sha256 = "0g433l4rinc6r2yr91jnl6wh5b2kn5vsrp08cmznkgaz45lb7n7c"; + version = "0.8.4"; + sha256 = "0xphwxxzddgcw2hr4h60l3y27f1x032w049wkjs71f5hdypwapv4"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; From 490f8c4382f2c895f4942da15b8a64e551a99ba9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0712/1120] haskell-tagsoup: update to version 0.12.7 --- pkgs/development/libraries/haskell/tagsoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index f6d2dd29dbf0..78f52a3ad325 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.12.6"; - sha256 = "1q1dzsaj131fcvibka72i7si1i0gxkz5d9zl0akd8mbapy5mmlv5"; + version = "0.12.7"; + sha256 = "0f4f0552n9qkycvh01jyk52190nk4frlp9za8vyczayrm3vmw268"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; From 2731fd220fe25a8cd7eec26b6bf41c795b865a97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0713/1120] haskell-threadmanager: update to version 0.1.5 --- pkgs/development/libraries/haskell/threadmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 776a2422265a..dc058844247d 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "threadmanager"; - version = "0.1.4"; - sha256 = "0p35ihdc9k9svzbwiszll5i53km09rvw5mqshph273fby7nvni9i"; + version = "0.1.5"; + sha256 = "0jdr0rrpx7frnh0a2vibg0170w48wvn6gv8imkiqiz6y6481ny5p"; meta = { homepage = "http://github.com/bsl/threadmanager"; description = "Simple thread management"; From 7f8246c76ed97a7ffc941aa266a99409d624288a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:25:18 +0200 Subject: [PATCH 0714/1120] haskell-hlint: update to version 1.8.31 --- 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 471b22a5825d..bb61bbaa7dcc 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.30"; - sha256 = "1c52h7pi759dnqzfq46nyckp75aswpqkf2n7aag2np955ky7rd05"; + version = "1.8.31"; + sha256 = "0d7m7viqf1cawbafiy4nj67hkavlxkv537qypy2vlhr502fispa4"; isLibrary = true; isExecutable = true; buildDepends = [ From a886d4f2ab30befdfabbc124b745c322314fddcf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 10:34:30 +0200 Subject: [PATCH 0715/1120] bash-completion: update to version 2.0 Please note that this update changes the directory structure quite a bit. In particular, the file "/etc/bash_completion" no longer exists, which means that shell code which relies on that path must be updated. I'll commit appropriate changes for NixOS in a moment. --- pkgs/shells/bash-completion/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 916c7600dfd0..7e4c0f230155 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,21 +1,17 @@ { stdenv, fetchurl }: let - version = "1.3"; + version = "2.0"; in stdenv.mkDerivation { name = "bash-completion-${version}"; src = fetchurl { url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2"; - sha256 = "8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec"; + sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; }; - postInstall = '' - rm $out/etc/profile.d/bash_completion.sh - rmdir $out/etc/profile.d - sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion - ''; + doCheck = true; meta = { homepage = "http://bash-completion.alioth.debian.org/"; From e91a4fb1e45d7293666c19783ca600fb6c4513c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Aug 2012 09:56:39 -0400 Subject: [PATCH 0716/1120] linux: Update to 3.2.28 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index df457bcb7e22..bea68decf64f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.27"; + version = "3.2.28"; testing = false; modDirVersion = version; @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1lchjh6s6mld83yq8gmcla6pydyap412bkyg3qb591ylnhdmg51k"; + sha256 = "0v4mbqf0mgnshhkq3symlliaz1jwa7vx7195r3qls390plc9g0nl"; }; config = configWithPlatform stdenv.platform; From 970a326ebb2e5c860b1092f21c6595fbf5de96e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Aug 2012 16:36:20 +0200 Subject: [PATCH 0717/1120] bash-completion: automatically source any completion files that the user might have installed in ~/.nix-profile/etc/bash_completion.d --- pkgs/shells/bash-completion/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 7e4c0f230155..d79c9774569b 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation { sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804"; }; + postInstall = '' + sed -i "$out/share/bash-completion/bash_completion" \ + -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|' + ''; + doCheck = true; meta = { From 1b2acb25e6d88c3cbd8a99e6e3d469702188fe86 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Aug 2012 16:36:10 -0400 Subject: [PATCH 0718/1120] xclip: Bump --- pkgs/tools/misc/xclip/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index ae9fed671173..1014f11453b9 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, x11, libXmu }: -stdenv.mkDerivation { - name = "xclip-0.11"; +stdenv.mkDerivation rec { + name = "xclip-0.12"; src = fetchurl { - url = "mirror://sourceforge/xclip/xclip-0.11.tar.gz"; - sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg"; + url = "mirror://sourceforge/xclip/${name}.tar.gz"; + sha256 = "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp"; }; buildInputs = [ x11 libXmu ]; From 265b8c565b4ebd814a1f9613f500d00ee6c17751 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Aug 2012 22:22:02 -0400 Subject: [PATCH 0719/1120] gptfdisk: Bump --- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index f82c94c0a726..9db39411854b 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libuuid, popt, icu, ncurses }: stdenv.mkDerivation rec { - name = "gptfdisk-0.8.0"; + name = "gptfdisk-0.8.5"; src = fetchurl { url = "mirror://sourceforge/gptfdisk/${name}.tar.gz"; - sha256 = "096qmlqcsvjklihggwphdmd0y78jz4ghf7gf4fvjnskp7mg4ng31"; + sha256 = "1yaax2mga7n847x1ihbgvv4drzvndgnn4mii0mz1ab1150gnkk0m"; }; buildInputs = [ libuuid popt icu ncurses ]; From 6e9a6a5924f9e28dad95013bd8c8aa892e1269d6 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 21 Aug 2012 10:26:44 +0200 Subject: [PATCH 0720/1120] linux-3.3: upgrade to 3.3.8 - aufs patch: upgrade to latest stable 3.3 --- pkgs/os-specific/linux/kernel/linux-3.3.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 956e55014e58..c56df955b791 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -236,7 +236,7 @@ in import ./generic.nix ( rec { - version = "3.3.6"; + version = "3.3.8"; testing = false; preConfigure = '' @@ -245,7 +245,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "04hplilmy9ks6nxi4292mcqwil6b5vinx90w23m41bll1x32gbq8"; + sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 12f9569ce10d..072952b02d26 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -149,13 +149,13 @@ rec { aufs3_3 = rec { name = "aufs3.3"; - version = "3.3"; + version = "3.3.20120730"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "91c3d8c80172db05575ee82c931f3541947a6aff"; - sha256 = "8fe54993b6a7a290649c193aab5a4f7f2dcecaedb5422d951f898d03753b83fb"; + rev = "ff0c9f1c002ef564d7bd52dd56a9b72f4ee7ce0c"; + sha256 = "cfa1a06669c984e1b8755da649aac40152e8018ee87939c5f0825100e45e196e"; }; features.aufsBase = true; features.aufs3 = true; From 192b29181b84cf3f488d767a56dc38ee37645edf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 21 Aug 2012 10:27:13 +0200 Subject: [PATCH 0721/1120] linux-3.4: upgrade to 3.4.9 - aufs patch: upgrade to latest stable 3.4 --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index ae5f5dcaa3f7..7d421af4917a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.7"; + version = "3.4.9"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0y93f6vjax4bwl6w73yqxn7dnv43ywd5vf5f5q27fm7y49m9ch95"; + sha256 = "02rnzpnfs7hfsglrgwr1450ssj47da1w079rmvzh1k0apy7qdpzm"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 072952b02d26..7aa365a67de9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -163,13 +163,13 @@ rec { aufs3_4 = rec { name = "aufs3.4"; - version = "3.4"; + version = "3.4.20120730"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "a5f7df8e59d57d6d9d749d49adc7e5a37ce2e342"; - sha256 = "20a8f113bb654f92231726de8177eb51d7be1b900fd42c2b5f48726a7d5d3ce6"; + rev = "8d7338df43d5e5372424813679c7531cf96ec260"; + sha256 = "37880124df88791d51089277230df0816fc5545c9752be3fa5173385489362c6"; }; features.aufsBase = true; features.aufs3 = true; From 85c88d473b6e555714da4c169be86c870682060a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 21 Aug 2012 10:33:06 +0200 Subject: [PATCH 0722/1120] emacs: add "rect-mark" --- .../editors/emacs-modes/rect-mark/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/rect-mark/default.nix diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix new file mode 100644 index 000000000000..ac01e02b4334 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "rect-mark-1.4"; + + src = fetchurl { + url = "http://emacswiki.org/emacs/download/rect-mark.el"; + sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src rect-mark.el + emacs --batch -f batch-byte-compile rect-mark.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install rect-mark.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Mark a rectangle of text with highlighting."; + homepage = http://emacswiki.org/emacs/RectangleMark; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1183746de101..e7ccf6fcd19f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6751,6 +6751,8 @@ let quack = callPackage ../applications/editors/emacs-modes/quack { }; + rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; + remember = callPackage ../applications/editors/emacs-modes/remember { }; rudel = callPackage ../applications/editors/emacs-modes/rudel { }; From a5663aee4d387f388916eb20cd5b5e72cdf5e6e3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 21 Aug 2012 10:33:20 +0200 Subject: [PATCH 0723/1120] emacs: add "sunrise commander" --- .../emacs-modes/sunrise-commander/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix new file mode 100644 index 000000000000..c15ff6afcb20 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "sunrise-commander-6"; + + src = fetchurl { + url = "http://www.emacswiki.org/emacs/download/sunrise-commander.el"; + sha256 = "1bbpm00nc7ry0f2k4zaqbvp6w9py31asfcr9hddggc138pnfajvq"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src sunrise-commander.el + emacs --batch -f batch-byte-compile sunrise-commander.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install sunrise-commander.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Two-pane file manager for Emacs based on Dired and inspired by MC."; + homepage = http://www.emacswiki.org/emacs/Sunrise_Commander; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7ccf6fcd19f..485f28f1d9c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6758,6 +6758,8 @@ let rudel = callPackage ../applications/editors/emacs-modes/rudel { }; scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; + + sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; }; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; From 00fa89e41f559e0a868408d0df1a5303c03380db Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 21 Aug 2012 12:38:44 +0200 Subject: [PATCH 0724/1120] pv: upgrade to 1.3.4 --- pkgs/tools/misc/pv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 8150e7118dc7..444408fec41d 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.3.1"; + name = "pv-1.3.4"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1fwvdj663g3jf3rcxi788pv1l7s86sxna78xi2nl5qimng05y8jl"; + sha256 = "114b730pghgg4gv9d798817n3am88p2b0xgdavch1vhklzh33c16"; }; meta = { From c557db2d5ca294456419da629675176be2450e26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Aug 2012 17:27:00 -0400 Subject: [PATCH 0725/1120] nix: Update to 1.2pre2793_d950cfe Necessary for systemd. --- 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 c3743c7583d5..103d92a0ee90 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.1pre2789_7671018"; + name = "nix-1.2pre2793_d950cfe"; src = fetchurl { - url = "http://hydra.nixos.org/build/2949617/download/4/${name}.tar.bz2"; - sha256 = "64ae790a7326893dc92f77c297862c4a74b1381c17b5fc559428fb7988421109"; + url = "http://hydra.nixos.org/build/2955697/download/4/${name}.tar.bz2"; + sha256 = "f91367d8e7ed795b2bc9a47fb3ecff00d005633f248ecaafa25e8e101a5dc682"; }; buildNativeInputs = [ perl pkgconfig ]; From 1dadeaeb18944d81c05c4afe49c99efa9ae3c496 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Aug 2012 17:27:29 -0400 Subject: [PATCH 0726/1120] man-pages: Update to 3.42 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0aca88a46c06..f9e4f1b43715 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.41"; + name = "man-pages-3.42"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz"; - sha256 = "1fldlsw51al9cvmz8dixrfv2j80bamjd5bzxsa66cvhc48n8p2nf"; + sha256 = "11kh0ifzqbxk797lq037ixqhpf6h90w9xxygzh796mddg4rr4s9j"; }; preBuild = From 6121046a1c5dbea7703521f9dc816abf47eab943 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 08:33:10 -0400 Subject: [PATCH 0727/1120] systemd: Set the path to pkttyagent This allows commands like "systemctl reboot" to ask for authentication when run by mere mortals. --- pkgs/os-specific/linux/systemd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4cda7191e4a2..e6e5822c9eac 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -49,7 +49,14 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\" -DKBD_SETFONT=\"${kbd}/bin/setfont\" -fno-stack-protector"; + NIX_CFLAGS_COMPILE = + [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\"" + "-DKBD_SETFONT=\"${kbd}/bin/setfont\"" + # Can't say ${polkit}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + "-fno-stack-protector" + ]; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; From ab3788b3824fc9c60536978b54eb1145ba68f494 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 08:34:04 -0400 Subject: [PATCH 0728/1120] upower: Update to 0.9.18 and enable systemd support --- pkgs/os-specific/linux/upower/default.nix | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 71a05486b482..2f870e5d9994 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit -, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils +, useSystemd ? false, systemd ? null +}: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.9.17"; + name = "upower-0.9.18"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0a1j2pg44r6ljj9jgzlw8i5fzabpm2b2jk058kxsr77ciz96i7yg"; + sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1"; }; - buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; + buildInputs = + [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ] + ++ stdenv.lib.optional useSystemd systemd; buildNativeInputs = [ pkgconfig ]; - configureFlags = "--with-backend=linux --localstatedir=/var"; + configureFlags = + [ "--with-backend=linux" "--localstatedir=/var" ] + ++ stdenv.lib.optional useSystemd + [ "--enable-systemd" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + ]; preConfigure = '' substituteInPlace src/linux/up-backend.c \ --replace /usr/bin/pm- ${pmutils}/bin/pm- \ --replace /usr/sbin/pm- ${pmutils}/sbin/pm- + substituteInPlace src/notify-upower.sh \ + --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send ''; installFlags = "historydir=$(TMPDIR)/foo"; From 8b6edfe78da24cf3f08b9eea6c596d2c32ea45d3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 08:34:59 -0400 Subject: [PATCH 0729/1120] polkit: Update to 0.105 and enable systemd (logind) support There are even newer polkit releases, but they have a spidermonkey dependency which I don't want to bother with right now. --- pkgs/development/libraries/polkit/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index dd83d7dfd8f1..88daab5ff92f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,29 +1,31 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext -, gobjectIntrospection }: +, gobjectIntrospection +, useSystemd ? false, systemd ? null }: let system = "/var/run/current-system/sw"; - + foolVars = { LOCALSTATE = "/var"; SYSCONF = "/etc"; LIB = "${system}/lib"; DATA = "${system}/share"; }; - + in stdenv.mkDerivation rec { - name = "polkit-0.104"; + name = "polkit-0.105"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1yf7307svs8qk76qdlgww1bhgdcia5cm92n16xz7njhy73c162kb"; + url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; + sha256 = "1pz1hn4z0f1wk4f7w8q1g6ygwan1b6kxmfad3b7gql27pb47rp4g"; }; buildInputs = - [ pkgconfig glib expat pam intltool gobjectIntrospection ]; + [ pkgconfig glib expat pam intltool gobjectIntrospection ] + ++ stdenv.lib.optional useSystemd systemd; configureFlags = "--libexecdir=$(out)/libexec/polkit-1"; @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0 ''; - + postInstall = '' # Allow some files with paranoid permissions to be stripped in @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/PolicyKit; + homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; platforms = platforms.linux; maintainers = [ maintainers.urkud ]; From 606e6acd6f87c97fe8077459c131b8f001b2131c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 08:41:11 -0400 Subject: [PATCH 0730/1120] postgresql: Update to latest versions Fixes CVE-2012-3488, CVE-2012-3489. --- pkgs/servers/sql/postgresql/8.3.x.nix | 6 +++--- pkgs/servers/sql/postgresql/8.4.x.nix | 6 +++--- pkgs/servers/sql/postgresql/9.0.x.nix | 6 +++--- pkgs/servers/sql/postgresql/9.1.x.nix | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index fb4c8302d812..d4ddb36d4feb 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.19"; in +let version = "8.3.20"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1maq1gjnd111jn45d7k58av1dm273vypvwhhsbhknqywgr5hsvwq"; + sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index 14e948d3d4ef..e1150543f362 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.12"; in +let version = "8.4.13"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0xqgzi6qrx4g7g8f38hp02qj8grrfnvc33kyijc2hf0qxhqb7dwr"; + sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index a4896d02a3a4..a28e5c337791 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.8"; in +let version = "9.0.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1hhb9kaayrs3bqm1afg8g4p9mr3mc8hskrgy24hnwfablsl1p652"; + sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 8dbaf93df8fd..14488d4649e0 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.4"; in +let version = "9.1.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; - + src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "04lp7hfh8z2n8gzib6b9j1fq70h1s91z2fxn2hlilbdfnf75lyd0"; + sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b"; }; buildInputs = [ zlib readline ]; From 6adc5cedae266349bd7440099379b2fa9e959ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Aug 2012 15:29:07 +0200 Subject: [PATCH 0731/1120] stdenv: Add `isGlibc' function. --- pkgs/stdenv/generic/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 749de01deff6..7a8c74506b74 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -30,7 +30,7 @@ let lib.filter lib.isDerivation initialPath; } - // { + // rec { meta = { description = "The default build environment for Unix packages in Nixpkgs"; @@ -96,6 +96,9 @@ let || result.system == "armv7l-linux" || result.system == "mips64el-linux"; isGNU = result.system == "i686-gnu"; # GNU/Hurd + isGlibc = isGNU # useful for `stdenvNative' + || isLinux + || result.system = "x86_64-kfreebsd-gnu"; isSunOS = result.system == "i686-solaris" || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; From d53cb937f5e8489f40cb09b9a7fc1749159f7f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Aug 2012 15:29:37 +0200 Subject: [PATCH 0732/1120] libiconvOrNull: Do not use an external libiconv on glibc systems. --- 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 485f28f1d9c8..17d303c5db44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4146,7 +4146,7 @@ let libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv; - libiconvOrNull = if gcc ? libc then null else libiconv; + libiconvOrNull = if ((gcc ? libc) || stdenv.isGlibc) then null else libiconv; libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv; From f959a26e3335f8896a35fa5eb1f93f6346b74ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Aug 2012 15:30:50 +0200 Subject: [PATCH 0733/1120] stdenv: Fix typo. --- 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 7a8c74506b74..a3284bea8e47 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -98,7 +98,7 @@ let isGNU = result.system == "i686-gnu"; # GNU/Hurd isGlibc = isGNU # useful for `stdenvNative' || isLinux - || result.system = "x86_64-kfreebsd-gnu"; + || result.system == "x86_64-kfreebsd-gnu"; isSunOS = result.system == "i686-solaris" || result.system == "x86_64-solaris"; isCygwin = result.system == "i686-cygwin"; From 11602dad82867c7f82424cead91b84c8810bb764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Aug 2012 15:53:43 +0200 Subject: [PATCH 0734/1120] glib: Use `libiconvOrNull' instead of `libiconv'. --- pkgs/development/libraries/glib/2.30.x.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index 092fa7f27e09..72baf0154d9f 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi , python, pcre }: # TODO: @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ pcre ] + ++ (if libiconvOrNull != null + then [ libiconvOrNull ] + else []); + buildNativeInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ zlib libffi ]; From 45ce8c915dfd64a0de6eb21c7ec1a8135d18c330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Aug 2012 16:58:55 +0200 Subject: [PATCH 0735/1120] libiconvOrNull: Fix libc check. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17d303c5db44..80c5ee77ec6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4146,7 +4146,10 @@ let libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv; - libiconvOrNull = if ((gcc ? libc) || stdenv.isGlibc) then null else libiconv; + libiconvOrNull = + if ((gcc ? libc && (gcc.libc != null)) || stdenv.isGlibc) + then null + else libiconv; libiconvOrLibc = if (libiconvOrNull == null) then gcc.libc else libiconv; From dc2f0f64740d1d96a2c5ff6733caaa558e0ac97f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 14:27:00 -0400 Subject: [PATCH 0736/1120] gdb: Update to 7.5 --- 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 1bc908185be4..08fde14eb53a 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.4.1"; + basename = "gdb-7.5"; # 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 = "8854d34691087ec127d934692639855f"; + md5 = "24a6779a9fe0260667710de1b082ef61"; }; # I think python is not a native input, but I leave it From d7fc07705a1465b4a54e73130c7b7fb020fa8e02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Aug 2012 15:57:41 -0400 Subject: [PATCH 0737/1120] Add latest patchelf prerelease --- .../development/tools/misc/patchelf/unstable.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/tools/misc/patchelf/unstable.nix diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix new file mode 100644 index 000000000000..aa8418496eaa --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "patchelf-0.7pre160_1c057cd"; + + src = fetchurl { + url = http://hydra.nixos.org/build/2961500/download/2/patchelf-0.7pre160_1c057cd.tar.bz2; + sha256 = "bbc46169f6b6803410e0072cf57e631481e3d5f1dde234f4eacbccb6562c5f4f"; + }; + + meta = { + homepage = http://nixos.org/patchelf.html; + license = "GPL"; + description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80c5ee77ec6e..dc179111fa06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3137,6 +3137,8 @@ let patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelfUnstable = callPackage ../development/tools/misc/patchelf/unstable.nix { }; + peg = callPackage ../development/tools/parsing/peg { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; From 0e768ba98d96148b0f1630e8712234be8b9300fc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Aug 2012 05:41:58 +0200 Subject: [PATCH 0738/1120] nss: Update NSS to version 3.13.6. So to begin with fixing NSS let's get to the latest upstream release and start fixing, so we won't carry around historic crap we then will throw away anyway. --- pkgs/development/libraries/nss/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3b4d10eaa089..2a4ebbfc4318 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,12 +9,16 @@ let in -stdenv.mkDerivation { - name = "nss-3.13.3"; +stdenv.mkDerivation rec { + name = "nss-${version}"; + version = "3.13.6"; - src = fetchurl { - url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-3.13.3.tar.gz; - sha256 = "efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587"; + src = let + uscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; + releasePath = "releases/NSS_${uscoreVersion}_RTM/src/nss-${version}.tar.gz"; + in fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/${releasePath}"; + sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0"; }; buildInputs = [nspr perl zlib]; From 485dcc915283661a5d859313484aa8ecaf1a520d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Aug 2012 09:39:55 +0200 Subject: [PATCH 0739/1120] nss: Build using system libsqlite. Let's use system SQLite library, which makes sense anyway. More importantly because it conflicts with the sqlite package, as NSS is building this as a shared library aswell. --- pkgs/development/libraries/nss/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 2a4ebbfc4318..7bdbf9e199f4 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}: +{ stdenv, fetchurl, nspr, perl, zlib, sqlite +, includeTools ? false +}: let @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0"; }; - buildInputs = [nspr perl zlib]; + buildInputs = [ nspr perl zlib sqlite ]; patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { makeFlags = [ "NSPR_CONFIG_STATUS=" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" - "NSS_ENABLE_ECC=1" + "NSS_ENABLE_ECC=1" "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; From 5f4ca8ec18cf3a4253845f6f50813833c883d7cc Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 21 Aug 2012 06:10:33 +0200 Subject: [PATCH 0740/1120] nss: Add nss-pem module from fedora. This is a compatibility module which adds suport for PEM certificates used by OpenSSL and compatible libraries. The module gets built but isn't used at the moment, so we're going to work on integration of it later. --- pkgs/development/libraries/nss/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 7bdbf9e199f4..a957996d1f12 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nspr, perl, zlib, sqlite +{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite , includeTools ? false }: @@ -9,6 +9,12 @@ let sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd"; }; + nssPEM = fetchgit { + url = "git://git.fedorahosted.org/git/nss-pem.git"; + rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; + sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8"; + }; + in stdenv.mkDerivation rec { @@ -25,12 +31,19 @@ stdenv.mkDerivation rec { buildInputs = [ nspr perl zlib sqlite ]; + postUnpack = '' + cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \ + "$sourceRoot/mozilla/security/nss/lib/ckfw/" + chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem" + ''; + patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; # Based on the build instructions at # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html postPatch = '' + sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile ''; From 29fce94665b6434ca22e78d873a01396bcd2a85a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 21 Aug 2012 10:47:29 +0200 Subject: [PATCH 0741/1120] nss: Clean up build/make flags. First of all, let's remove that redundant BUILD_OPT variable. This variable already is in makeFlags, so we really don't want it to be lurking around in the attribute set of the derivation, and it annoys me for being there for days. We now state build targets explicitly rather than relying on "nss_build_all". This makes NSPR_CONFIG_STATUS and the touch of build_nspr stamp obsolete, as only nss_build_all includes build_nspr. In addition, we don't need the -lz hack anymore, as this has been fixed in recent NSS versions, so we can completly remove the postBuild hook. And while we're at it, we're removing those outdated build instructions as well, especially because we don't and can't follow official building guidelines anymore, as those are difficult to apply to Nix. --- pkgs/development/libraries/nss/default.nix | 32 +++++++--------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a957996d1f12..222fd6e94f6f 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -39,9 +39,6 @@ stdenv.mkDerivation rec { patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; - # Based on the build instructions at - # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html - postPatch = '' sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile @@ -49,26 +46,17 @@ stdenv.mkDerivation rec { preConfigure = "cd mozilla/security/nss"; - BUILD_OPT = "1"; + makeFlags = [ + "NSPR_INCLUDE_DIR=${nspr}/include/nspr" + "NSPR_LIB_DIR=${nspr}/lib" + "NSDISTMODE=copy" + "BUILD_OPT=1" + "SOURCE_PREFIX=\$(out)" + "NSS_ENABLE_ECC=1" + "NSS_USE_SYSTEM_SQLITE=1" + ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; - makeFlags = - [ "NSPR_CONFIG_STATUS=" "NSDISTMODE=copy" "BUILD_OPT=1" "SOURCE_PREFIX=\$(out)" - "NSS_ENABLE_ECC=1" "NSS_USE_SYSTEM_SQLITE=1" - ] - ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; - - buildFlags = "nss_build_all"; - - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr"; - - preBuild = - '' - # Fool it into thinking NSPR has already been built. - touch build_nspr - - # Hack to make -lz dependencies work. - touch cmd/signtool/-lz cmd/modutil/-lz - ''; + buildFlags = [ "build_coreconf" "build_dbm" "all" ]; postInstall = '' From 9e0aaf30aab7c61e5cacd4cdc44243a7557e2d2b Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 21 Aug 2012 21:35:46 +0200 Subject: [PATCH 0742/1120] nss: Sign libraries after striping. Running NSS in FIPS mode is only possible if the libraries are signed correctly, so we're doing this in the postFixup hook, to insure nothing gets altered after that phase. For more information about FIPS mode, please see: https://developer.mozilla.org/en-US/docs/NSS/FIPS_Mode_-_an_explanation --- pkgs/development/libraries/nss/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 222fd6e94f6f..3b6cc15754e2 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -86,4 +86,12 @@ stdenv.mkDerivation rec { --subst-var-by includedir $out/include/nss \ --subst-var-by libdir $out/lib ''; # */ + + postFixup = '' + for libname in freebl3 nssdbm3 softokn3 + do + libfile="$out/lib/lib$libname.so" + LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" + done + ''; } From 38a4d77665075713673ab802860276da86cf99a9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 02:46:48 +0200 Subject: [PATCH 0743/1120] nss: Fix referencePath to security modules. This adds a patch from Debian, as they're already have security modules from NSS in it's own library directory rather than /usr/lib{,64}/ and patch in loading of libsoftokn as well. The patch and our own fix of the patch (well, they hardcode Debian specific stuff in there) ensures that SECMOD_AddNewModule() will find the right module from the derivation's output path, so the built-in CA root certificates are recognized and verified correctly. --- pkgs/development/libraries/nss/default.nix | 13 +++-- .../libraries/nss/nix_secload_fixup.patch | 50 +++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/nss/nix_secload_fixup.patch diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3b6cc15754e2..e71e2ef3f9d1 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -15,9 +15,12 @@ let sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8"; }; -in + secLoadPatch = fetchurl { + url = "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.5-1/85_security_load.patch"; + sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; + }; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "nss-${version}"; version = "3.13.6"; @@ -37,7 +40,11 @@ stdenv.mkDerivation rec { chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem" ''; - patches = [ ./nss-3.12.5-gentoo-fixups.diff ]; + patches = [ + ./nss-3.12.5-gentoo-fixups.diff + secLoadPatch + ./nix_secload_fixup.patch + ]; postPatch = '' sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch new file mode 100644 index 000000000000..960fe0ef7a75 --- /dev/null +++ b/pkgs/development/libraries/nss/nix_secload_fixup.patch @@ -0,0 +1,50 @@ +diff --git a/mozilla/security/coreconf/config.mk b/mozilla/security/coreconf/config.mk +index 72557c6..bdcbf88 100644 +--- a/mozilla/security/coreconf/config.mk ++++ b/mozilla/security/coreconf/config.mk +@@ -207,3 +207,5 @@ endif + DEFINES += -DUSE_UTIL_DIRECTLY + USE_UTIL_DIRECTLY = 1 + ++# nix specific stuff: ++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" +diff --git a/mozilla/security/nss/cmd/shlibsign/shlibsign.c b/mozilla/security/nss/cmd/shlibsign/shlibsign.c +index 5ce626e..e1e8039 100644 +--- a/mozilla/security/nss/cmd/shlibsign/shlibsign.c ++++ b/mozilla/security/nss/cmd/shlibsign/shlibsign.c +@@ -770,7 +770,7 @@ int main(int argc, char **argv) + assert(libname != NULL); + lib = PR_LoadLibrary(libname); + if (!lib) +- lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so"); ++ lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so"); + assert(lib != NULL); + PR_FreeLibraryName(libname); + +diff --git a/mozilla/security/nss/lib/util/secload.c b/mozilla/security/nss/lib/util/secload.c +index 7d6fc22..0b7759b 100644 +--- a/mozilla/security/nss/lib/util/secload.c ++++ b/mozilla/security/nss/lib/util/secload.c +@@ -105,9 +105,9 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + /* Remove the trailing filename from referencePath and add the new one */ + c = strrchr(referencePath, PR_GetDirectorySeparator()); + if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0] +- * and program was called from $PATH. Hack to get libs from /usr/lib */ +- referencePath = "/usr/lib/"; +- c = &referencePath[8]; /* last / */ ++ * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */ ++ referencePath = NIX_NSS_LIBDIR; ++ c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */ + } + if (c) { + size_t referencePathSize = 1 + c - referencePath; +@@ -125,8 +125,7 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) { + memcpy(fullName + referencePathSize -4, "lib", 3); + } +- strcpy(fullName + referencePathSize, "nss/"); +- strcpy(fullName + referencePathSize + 4, name); ++ strcpy(fullName + referencePathSize, name); + dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL + #ifdef PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory From c672997dc6671e74b3256bd4d0b905afb4d9b8b9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 04:22:43 +0200 Subject: [PATCH 0744/1120] nss: Remove redundant nss-config.in. This file is already contained in nss-3.12.5-gentoo-fixups.diff, so we don't need to do all that cruft twice. --- pkgs/development/libraries/nss/default.nix | 40 +++++----------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e71e2ef3f9d1..414e66864c17 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -4,11 +4,6 @@ let - nssConfig = fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/dev-libs/nss/files/3.12-nss-config.in?rev=1.2"; - sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd"; - }; - nssPEM = fetchgit { url = "git://git.fedorahosted.org/git/nss-pem.git"; rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; @@ -65,34 +60,15 @@ in stdenv.mkDerivation rec { buildFlags = [ "build_coreconf" "build_dbm" "all" ]; - postInstall = - '' - #find $out -name "*.a" | xargs rm - rm -rf $out/private - mv $out/public $out/include - mv $out/*.OBJ/* $out/ - rmdir $out/*.OBJ - ${if includeTools then "" else "rm -rf $out/bin"} + postInstall = '' + rm -rf $out/private + mv $out/public $out/include + mv $out/*.OBJ/* $out/ + rmdir $out/*.OBJ + ${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"} - # Borrowed from Gentoo. Firefox expects an nss-config script, - # but NSS doesn't provide it. - - NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` - NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` - NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` - - ${if includeTools then "" else "mkdir $out/bin"} - cp ${nssConfig} $out/bin/nss-config - chmod u+x $out/bin/nss-config - substituteInPlace $out/bin/nss-config \ - --subst-var-by MOD_MAJOR_VERSION $NSS_VMAJOR \ - --subst-var-by MOD_MINOR_VERSION $NSS_VMINOR \ - --subst-var-by MOD_PATCH_VERSION $NSS_VPATCH \ - --subst-var-by prefix $out \ - --subst-var-by exec_prefix $out \ - --subst-var-by includedir $out/include/nss \ - --subst-var-by libdir $out/lib - ''; # */ + cp -av config/nss-config $out/bin/nss-config + ''; postFixup = '' for libname in freebl3 nssdbm3 softokn3 From 808108105dd62421effebe3dbadf2183e7668be2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 04:24:44 +0200 Subject: [PATCH 0745/1120] nss: Just delete files if includeTools is false. Before, the entire directory was deleted and recreated, which fails if we want to sign libraries (shlibsign is obviously deleted in that step as well), so we delete everything but "nss-config" on postFixup. --- pkgs/development/libraries/nss/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 414e66864c17..38e9d80d5b71 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -65,7 +65,6 @@ in stdenv.mkDerivation rec { mv $out/public $out/include mv $out/*.OBJ/* $out/ rmdir $out/*.OBJ - ${if includeTools then "" else "rm -rf $out/bin; mkdir $out/bin"} cp -av config/nss-config $out/bin/nss-config ''; @@ -76,5 +75,7 @@ in stdenv.mkDerivation rec { libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile" done + '' + stdenv.lib.optionalString (!includeTools) '' + find $out/bin -type f \( -name nss-config -o -delete \) ''; } From 8b4fae76b37d682ef3c5941429a5bdbe3540ae1f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 04:28:14 +0200 Subject: [PATCH 0746/1120] chromium: Build with NSS by default. Hurray! This is the first time chromium is working with NSS _and_ is able to verify certificates using the root certificates built in into NSS. Optimally it would use certs from OPENSSL_X509_CERT_FILE, but at least it's working, so let's add that at some later point. --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fb3d1109e148..84cdf556d02d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -32,7 +32,7 @@ let channel = "stable"; selinux = false; nacl = false; - openssl = true; + openssl = false; gnome = false; gnomeKeyring = false; proprietaryCodecs = true; @@ -59,7 +59,7 @@ let use_system_libpng = true; use_system_libxml = true; use_system_speex = true; - use_system_ssl = true; + use_system_ssl = config.openssl; use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; From 5df4e12c92bd76c2b48e36f529e869c544939481 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 05:00:12 +0200 Subject: [PATCH 0747/1120] firefox: Build against system NSS. So, now even Firefox can be built with our shiny new fixed up NSS derivation, and as this is desired (especially if we want to support certificates from the CA bundle), let's make it the default. --- pkgs/applications/networking/browsers/firefox/12.0.nix | 6 +++--- pkgs/applications/networking/browsers/firefox/13.0.nix | 6 +++--- pkgs/applications/networking/browsers/firefox/3.6.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/12.0.nix b/pkgs/applications/networking/browsers/firefox/12.0.nix index 6a22b1d8e5f4..97e23d1b8b26 100644 --- a/pkgs/applications/networking/browsers/firefox/12.0.nix +++ b/pkgs/applications/networking/browsers/firefox/12.0.nix @@ -33,7 +33,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - # "--with-system-nss" + "--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" @@ -54,7 +54,7 @@ rec { [ 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 + alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXext xlibs.xextproto sqlite unzip ]; @@ -129,7 +129,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip ]; diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix index 1b0219557427..fbbf3275ad1a 100644 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ b/pkgs/applications/networking/browsers/firefox/13.0.nix @@ -33,7 +33,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - # "--with-system-nss" + "--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" @@ -54,7 +54,7 @@ rec { [ 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 + alsaLib nspr nss libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper ]; @@ -136,7 +136,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip ]; diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 40b7959139d2..c430bb7089a8 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -31,7 +31,7 @@ rec { "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - #"--with-system-nss" + "--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" #"--enable-system-sqlite" # <-- this seems to be discouraged @@ -59,7 +59,7 @@ rec { [ 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 + alsaLib nspr nss libnotify xlibs.pixman ]; preConfigure = if stdenv.isMips then '' @@ -118,7 +118,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman ]; From ec6926bf7e20cca717feb5d8c8ee173c357995fa Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 22 Aug 2012 09:59:01 +0200 Subject: [PATCH 0748/1120] ncdu: New package, starting at version 1.8. `ncdu` is a little ncurses tool to browse the filesystem tree sorted by disk usage. --- pkgs/tools/misc/ncdu/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/misc/ncdu/default.nix diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix new file mode 100644 index 000000000000..944b6ea77e1e --- /dev/null +++ b/pkgs/tools/misc/ncdu/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ncdu-${version}"; + version = "1.8"; + + src = fetchurl { + url = "http://dev.yorhel.nl/download/${name}.tar.gz"; + sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099"; + }; + + buildInputs = [ ncurses ]; + + meta = { + description = "An ncurses disk usage analyzer."; + homepage = http://dev.yorhel.nl/ncdu; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc179111fa06..b50adc5720be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7344,6 +7344,8 @@ let navit = callPackage ../applications/misc/navit { }; + ncdu = callPackage ../tools/misc/ncdu { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; From 559f5be0978f50b2c2397fb1f1ed84cb2b8cc7a4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 22 Aug 2012 13:08:49 +0400 Subject: [PATCH 0749/1120] release.nix: use the freshest release GIMP version (2.8.0) --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5391b3a51c57..a665d1271eba 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -104,7 +104,7 @@ with (import ./release-lib.nix); ghdl = linux; ghostscript = linux; ghostscriptX = linux; - gimp = linux; + gimp28 = linux; git = linux; gitFull = linux; glibc = linux; From 30a36ad6e50dbbe9314a3b1ebc29f6bc439ecb4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Aug 2012 14:13:32 +0200 Subject: [PATCH 0750/1120] hadoop: add version 2.0.1-alpha --- .../networking/cluster/hadoop/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/networking/cluster/hadoop/default.nix diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix new file mode 100644 index 000000000000..7d475a675587 --- /dev/null +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, which, jre, bash }: + +stdenv.mkDerivation rec { + + name = "hadoop-2.0.1-alpha"; + + src = fetchurl { + url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; + sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = '' + for n in "bin/"* "sbin/"*; do + sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" + done + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor + ''; + + installPhase = '' + mkdir -p $out + mv *.txt share/doc/hadoop/ + mv * $out + + for n in $out/{bin,sbin}"/"*; do + wrapProgram $n --prefix PATH : "${which}/bin:${jre}/bin:${bash}/bin" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out" + done + ''; + + meta = { + homepage = "http://hadoop.apache.org/"; + description = "framework for distributed processing of large data sets across clusters of computers"; + license = stdenv.lib.licenses.asl20; + + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b50adc5720be..630c69d89988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2684,6 +2684,8 @@ let guile = guile_2_0; + hadoop = callPackage ../applications/networking/cluster/hadoop { }; + io = callPackage ../development/interpreters/io { }; j = callPackage ../development/interpreters/j {}; From 966b4c336d03a963b56bc3dd40fc9e60df1c0fe4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Aug 2012 14:28:50 +0200 Subject: [PATCH 0751/1120] mirrors.nix: use GNU mirrors before hitting the master site Our first download URL of choice is http://ftpmirror.gnu.org/, which is an automatic re-director. --- pkgs/build-support/fetchurl/mirrors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 0491e4994b6d..dd81692b5f2d 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -24,9 +24,6 @@ rec { # GNU (http://www.gnu.org/prep/ftp.html). gnu = [ - # This one is the master repository, and thus it's always up-to-date. - http://ftp.gnu.org/pub/gnu/ - # This one redirects to a (supposedly) nearby and (supposedly) up-to-date # mirror. http://ftpmirror.gnu.org/ @@ -37,6 +34,9 @@ rec { ftp://ftp.cs.tu-berlin.de/pub/gnu/ ftp://ftp.chg.ru/pub/gnu/ ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/ + + # This one is the master repository, and thus it's always up-to-date. + http://ftp.gnu.org/pub/gnu/ ]; # GCC. From 1f18f243870be80570753a2a922d25575377af91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Aug 2012 14:30:15 +0200 Subject: [PATCH 0752/1120] gcc-4.7: download source code from a mirror instead of hard-coding the URL of the master site --- pkgs/development/compilers/gcc/4.7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 084e56173a2b..02733d042033 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation ({ builder = ./builder.sh; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2"; + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; }; From 695ca8c4986a2edb74c543c5a3c9564419f1f2f9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 22 Aug 2012 09:14:05 -0400 Subject: [PATCH 0753/1120] node.js: Bump --- pkgs/development/web/nodejs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 980423598575..c8d553d468ef 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }: stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.8.7"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0dgcw6qpgvsxcvcbkmvpjz2i9f2r286zcrcg0jnxnds9fj41s2k0"; + sha256 = "014x3r5vayb1zhmv4cdd9kwdcz408g2yjgvdwfk8xl3s6j4995zs"; }; configureFlags = [ From aa4ce180774b398a80aa7496290b5cd67a82160c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 22 Aug 2012 09:44:38 -0400 Subject: [PATCH 0754/1120] node-packages.nix: Export buildNodePackage --- pkgs/top-level/node-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index d263e68981ad..c16c53d4a05f 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,13 +1,13 @@ { pkgs, stdenv, nodejs, fetchurl }: -let buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs; -}; in - let self = { + buildNodePackage = import ../development/web/nodejs/build-node-package.nix { + inherit stdenv nodejs; + }; + "coffee-script" = self."coffee-script-1.3.3"; - "coffee-script-1.3.3" = buildNodePackage rec { + "coffee-script-1.3.3" = self.buildNodePackage rec { name = "coffee-script-1.3.3"; src = fetchurl { url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; From af3a95d6f34ac64cae3af52bf07203599d228bb5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 22 Aug 2012 16:56:01 +0200 Subject: [PATCH 0755/1120] libiconvOrEmpty: always return a list - fixes nixpkgs-tarball --- 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 630c69d89988..62feb0aac9f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4148,7 +4148,7 @@ let libiconv = callPackage ../development/libraries/libiconv { }; - libiconvOrEmpty = if (libiconvOrNull == null) then [] else libiconv; + libiconvOrEmpty = if (libiconvOrNull == null) then [] else [libiconv]; libiconvOrNull = if ((gcc ? libc && (gcc.libc != null)) || stdenv.isGlibc) From 48d98bd582e2037aed655e3a9b34c61683f0a565 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 22 Aug 2012 17:49:56 +0200 Subject: [PATCH 0756/1120] gimp28 should probably be gimp_2_8 --- pkgs/top-level/release.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index a665d1271eba..d8e192a6e550 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -104,7 +104,7 @@ with (import ./release-lib.nix); ghdl = linux; ghostscript = linux; ghostscriptX = linux; - gimp28 = linux; + gimp_2_8 = linux; git = linux; gitFull = linux; glibc = linux; @@ -448,7 +448,7 @@ with (import ./release-lib.nix); xlsclients = linux; xmessage = linux; xorgserver = linux; - xprop = linux; + xprop = linux; xrandr = linux; xrdb = linux; xset = linux; @@ -474,4 +474,3 @@ with (import ./release-lib.nix); }; } )) - From 39cfbf6163b4d47f2e854506a63f91306057706b Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 22 Aug 2012 17:51:17 +0200 Subject: [PATCH 0757/1120] Set platforms for packages depending on CUDA to none. --- .../libraries/haskell/accelerate-examples/default.nix | 2 +- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index f1f7aefb736e..f88824c21fed 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -22,7 +22,7 @@ cabal.mkDerivation (self: { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 5c0614bc0b44..296d639918e3 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -37,7 +37,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) From cdc0c13c00c7b22d25b44d64151cc8f9e94d5d96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 22 Aug 2012 15:35:00 -0400 Subject: [PATCH 0758/1120] buildNodePackage: Remove absolute path to source tarball to avoid runtime dependency --- pkgs/development/web/nodejs/build-node-package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 56941ddf27e7..981367091704 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -32,4 +32,8 @@ stdenv.mkDerivation ({ fi runHook postInstall ''; + + preFixup = '' + find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' + ''; } // args) From 85047983a152b55e01f01ca6ee984696af9da684 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 11:42:51 -0400 Subject: [PATCH 0759/1120] stdenv/generic/default.nix: Simplify the code using the "or" construct --- pkgs/stdenv/generic/default.nix | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index a3284bea8e47..3555ea980150 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -42,30 +42,23 @@ let (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let - buildInputs = if attrs ? buildInputs then attrs.buildInputs - else []; - buildNativeInputs = if attrs ? buildNativeInputs then - attrs.buildNativeInputs else []; - propagatedBuildInputs = if attrs ? propagatedBuildInputs then - attrs.propagatedBuildInputs else []; - propagatedBuildNativeInputs = if attrs ? - propagatedBuildNativeInputs then - attrs.propagatedBuildNativeInputs else []; - crossConfig = if (attrs ? crossConfig) then attrs.crossConfig else - null; + buildInputs = attrs.buildInputs or []; + buildNativeInputs = attrs.buildNativeInputs or []; + propagatedBuildInputs = attrs.propagatedBuildInputs or []; + propagatedBuildNativeInputs = attrs.propagatedBuildNativeInputs or []; + crossConfig = attrs.crossConfig or null; in { - builder = if attrs ? realBuilder then attrs.realBuilder else shell; - args = if attrs ? args then attrs.args else - ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; + builder = attrs.realBuilder or shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; stdenv = result; system = result.system; - # That build by the cross compiler + # Inputs built by the cross compiler. buildInputs = lib.optionals (crossConfig != null) buildInputs; propagatedBuildInputs = lib.optionals (crossConfig != null) propagatedBuildInputs; - # That build by the usual native compiler + # Inputs built by the usual native compiler. buildNativeInputs = buildNativeInputs ++ lib.optionals (crossConfig == null) buildInputs; propagatedBuildNativeInputs = propagatedBuildNativeInputs ++ @@ -77,13 +70,11 @@ let # passed to the builder and is not a dependency. But since we # include it in the result, it *is* available to nix-env for # queries. - // - { meta = if attrs ? meta then attrs.meta else {}; } + // { meta = attrs.meta or {}; } # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the # derivation (e.g., in assertions). - // - (if attrs ? passthru then attrs.passthru else {}); + // (attrs.passthru or {}); # Utility flags to test the type of platform. isDarwin = result.system == "i686-darwin" From bf2b75ca7ec6e69f85e7e05ec1bd85785163b5f4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:21:10 -0400 Subject: [PATCH 0760/1120] Add hacky way to prevent Hydra from building/distributing unfree packages If the environment variable HYDRA_DISALLOW_UNFREE is set to "1", then evaluation of a package with license "unfree" will throw an error. Thus such packages or any packages that depend on them will fail to evaluate. --- pkgs/stdenv/generic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 3555ea980150..9197ff8314b4 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -10,6 +10,8 @@ let lib = import ../../lib; + disallowUnfree = builtins.getEnv "HYDRA_DISALLOW_UNFREE" == "1"; + stdenvGenerator = setupScript: rec { # The stdenv that we are producing. @@ -39,6 +41,9 @@ let # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: + if disallowUnfree && attrs.meta.license or "" == "unfree" then + throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate" + else (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let From 8020c37f55c3a2a6236ca46cec963f8928f77192 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:24:04 -0400 Subject: [PATCH 0761/1120] Remove obsolete JDK versions These are the JDK 5 on powerpc-linux (no longer a maintained Nixpkgs platform), JDK 1.4 (required a manual download) and JDK 5 on Linux (idem). --- pkgs/development/compilers/jdk/builder.sh | 34 ------------------ .../development/compilers/jdk/default-1.4.nix | 9 ----- pkgs/development/compilers/jdk/default-5.nix | 9 ----- pkgs/development/compilers/jdk/default.nix | 2 -- pkgs/development/compilers/jdk/ibm-builder.sh | 29 --------------- .../compilers/jdk/j2sdk-1.4.x-sun-linux.nix | 24 ------------- .../compilers/jdk/jdk5-ibm-powerpc-linux.nix | 17 --------- .../compilers/jdk/jdk5-oracle-linux.nix | 36 ------------------- .../development/compilers/jdk/jdk6-cygwin.nix | 2 +- pkgs/development/compilers/jdk/jdk6-linux.nix | 2 +- pkgs/top-level/all-packages.nix | 25 +++---------- 11 files changed, 7 insertions(+), 182 deletions(-) delete mode 100644 pkgs/development/compilers/jdk/builder.sh delete mode 100644 pkgs/development/compilers/jdk/default-1.4.nix delete mode 100644 pkgs/development/compilers/jdk/default-5.nix delete mode 100644 pkgs/development/compilers/jdk/ibm-builder.sh delete mode 100644 pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix delete mode 100644 pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix delete mode 100644 pkgs/development/compilers/jdk/jdk5-oracle-linux.nix diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh deleted file mode 100644 index ccfe2838d1b6..000000000000 --- a/pkgs/development/compilers/jdk/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -buildInputs="$unzip" -source $stdenv/setup - -unzip $src || true - -mkdir -p $out -mv $dirname/* $out/ - -# Remove crap in the root directory. -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done - -# Set the dynamic linker. -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done -find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -# Unpack .pack files. -for i in $(find $out -name "*.pack"); do - echo "unpacking $i..." - $out/bin/unpack200 "$i" "$(dirname $i)/$(basename $i .pack).jar" - rm "$i" -done - -# Put the *_md.h files in the right place. -cd $out/include && ln -s */*_md.h . diff --git a/pkgs/development/compilers/jdk/default-1.4.nix b/pkgs/development/compilers/jdk/default-1.4.nix deleted file mode 100644 index 48eb5e6e7b71..000000000000 --- a/pkgs/development/compilers/jdk/default-1.4.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -if stdenv.system == "i686-linux" - then - (import ./j2sdk-1.4.x-sun-linux.nix) { - inherit stdenv fetchurl; - } - else - abort "the Java 2 SDK is not supported on this platform" diff --git a/pkgs/development/compilers/jdk/default-5.nix b/pkgs/development/compilers/jdk/default-5.nix deleted file mode 100644 index dfd4e31f4b37..000000000000 --- a/pkgs/development/compilers/jdk/default-5.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl, unzip, requireFile}: - -if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then - (import ./jdk5-oracle-linux.nix) { - inherit stdenv fetchurl unzip requireFile; - } - else - abort "the Java 5 SDK is not supported on this platform" diff --git a/pkgs/development/compilers/jdk/default.nix b/pkgs/development/compilers/jdk/default.nix index 547833c15cd4..8940be7f34d5 100644 --- a/pkgs/development/compilers/jdk/default.nix +++ b/pkgs/development/compilers/jdk/default.nix @@ -2,8 +2,6 @@ args: if args.stdenv.system == "i686-linux" || args.stdenv.system == "x86_64-linux" then (import ./jdk6-linux.nix) ( removeAttrs args ["cabextract"] ) -else if args.stdenv.system == "powerpc-linux" then - (import ./jdk5-ibm-powerpc-linux.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "cabextract"]) else if args.stdenv.system == "i686-cygwin" then (import ./jdk6-cygwin.nix) (removeAttrs args ["pluginSupport" "xlibs" "installjdk" "xlibs"]) else diff --git a/pkgs/development/compilers/jdk/ibm-builder.sh b/pkgs/development/compilers/jdk/ibm-builder.sh deleted file mode 100644 index 2ff3a71322a6..000000000000 --- a/pkgs/development/compilers/jdk/ibm-builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -if ! test -e "$pathname"; then - echo "" - echo "SORRY!" - echo "You should download \`$(basename $pathname)' from IBM and place it in $(dirname $pathname)." - echo "Blame IBM, not us." - echo "" - exit 1 -fi - -actual=$(md5sum -b $pathname | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi - -tar zxf $pathname || true - -mkdir -p $out -mv $dirname/* $out/ - -# Remove crap in the root directory. -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done diff --git a/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix b/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix deleted file mode 100644 index 846055ce523d..000000000000 --- a/pkgs/development/compilers/jdk/j2sdk-1.4.x-sun-linux.nix +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This Nix expression requires the user to download the j2sdk - * distribution to /tmp. Please obtain j2sdk-1_4_2_03-linux-i586.bin - * from java.sun.com by hand and place it in /tmp. Blame Sun, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - * - * @author Martin Bravenboer - */ -{stdenv, fetchurl}: - -assert stdenv.system == "i686-linux"; - -derivation { - name = "j2sdk-1.4.2"; - filename = "j2sdk-1.4.2_05"; - dirname = "j2sdk1.4.2_05"; - system = stdenv.system; - builder = ./builder.sh; - pathname = "/tmp/j2sdk-1_4_2_05-linux-i586.bin"; - md5 = "825ff134f3e370f6e677638d32962082"; - stdenv = stdenv; -} diff --git a/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix b/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix deleted file mode 100644 index a4c2bd589afe..000000000000 --- a/pkgs/development/compilers/jdk/jdk5-ibm-powerpc-linux.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ swingSupport ? true -, stdenv, fetchurl, unzip, makeWrapper, libX11 ? null, libXext ? null -}: - -assert stdenv.system == "powerpc-linux"; - -assert swingSupport -> libX11 != null && libXext != null; - -(stdenv.mkDerivation { - name = "jdk-1.5.0"; - builder = ./ibm-builder.sh; - dirname = "ibm-java2-ppc-50"; - pathname = "/tmp/ibm-java2-sdk-50-linux-ppc.tgz"; - md5 = "6bed4ae0b24d3eea2914f2f6dcc0ceb4"; - libraries = - (if swingSupport then [libX11 libXext] else []); -} // {inherit swingSupport;}) diff --git a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix b/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix deleted file mode 100644 index 8884585d154d..000000000000 --- a/pkgs/development/compilers/jdk/jdk5-oracle-linux.nix +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This Nix expression requires the user to download the Java 5.0 JDK - * distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for - * 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems - * from java.sun.com (look for archived software downloads) - * by hand and place it in /tmp. Blame Oracle, not me. - * - * Note that this is not necessary if someone has already pushed a - * binary. - */ -{stdenv, fetchurl, unzip, requireFile}: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "jdk-1_5_0_22"; - dirname = "jdk1.5.0_22"; - builder = ./builder.sh; - src = requireFile { - message = '' - SORRY! - We may not download the needed binary distribution automatically. - You should download ${distfilename} from Sun and add it to store. - For example, "nix-prefetch-url file:///\$PWD/${distfilename}" in the - directory where you saved it is OK. - Blame Sun, not us. - ''; - name = distfilename; - sha256 = if stdenv.system == "x86_64-linux" then - "1h63gigvg8id95igcj8xw7qvxs4p2y9hvx4xbvkwg8bji3ifb0sk" - else "0655n2q1y023zzwbk6gs9vwsnb29jc0m3bg3x3xdw623qgb4k6px"; - }; - distfilename = if stdenv.system == "x86_64-linux" then "${name}-linux-amd64.bin" else "${name}-linux-i586.bin"; - - inherit unzip stdenv; -} diff --git a/pkgs/development/compilers/jdk/jdk6-cygwin.nix b/pkgs/development/compilers/jdk/jdk6-cygwin.nix index 766151dfe6b3..2ea050f51335 100644 --- a/pkgs/development/compilers/jdk/jdk6-cygwin.nix +++ b/pkgs/development/compilers/jdk/jdk6-cygwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "jdk-1.6.0_20"; src = fetchurl { - url = file:///tmp/jdk-6u20-windows-i586.exe ; + url = file:///tmp/jdk-6u20-windows-i586.exe; sha256 = "0w4afz8a9gi1iyhh47gvhiy59dfrzx0fnmywdff3v5cx696w25fh"; }; diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 224f77a13570..04b9d5d75800 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { inherit installjdk; buildInputs = [unzip makeWrapper]; - + /** * libXt is only needed on amd64 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62feb0aac9f2..f24089874922 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2352,18 +2352,8 @@ let jreOnly = true; }; - j2sdk14x = ( - assert system == "i686-linux"; - import ../development/compilers/jdk/default-1.4.nix { - inherit fetchurl stdenv; - }); - - jdk5 = ( - assert system == "i686-linux" || system == "x86_64-linux"; - callPackage ../development/compilers/jdk/default-5.nix { }); - - jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; - jre = jdkdistro false false; + jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; + jre = jdkdistro false false; jdkPlugin = lowPrio (jdkdistro true true); jrePlugin = lowPrio (jdkdistro false true); @@ -2371,8 +2361,7 @@ let supportsJDK = system == "i686-linux" || system == "x86_64-linux" || - system == "i686-cygwin" || - system == "powerpc-linux"; + system == "i686-cygwin"; jdkdistro = installjdk: pluginSupport: (assert supportsJDK; @@ -2883,8 +2872,6 @@ let apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; - apacheAnt14 = apacheAnt.override { jdk = j2sdk14x; }; - apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm @@ -5033,9 +5020,7 @@ let javasvn = callPackage ../development/libraries/java/javasvn { }; - jclasslib = callPackage ../development/tools/java/jclasslib { - ant = apacheAnt14; - }; + jclasslib = callPackage ../development/tools/java/jclasslib { }; jdom = callPackage ../development/libraries/java/jdom { }; @@ -5304,7 +5289,7 @@ let rpcbind = callPackage ../servers/rpcbind { }; - monetdb = callPackage ../servers/sql/monetdb { }; + #monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { boost = boost149; From 2bc9508034816d887956cf2a6ac41a93c3ccc337 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:24:44 -0400 Subject: [PATCH 0762/1120] Prevent the JDK from appearing in the Nixpkgs channel --- pkgs/development/compilers/jdk/jdk6-cygwin.nix | 2 ++ pkgs/development/compilers/jdk/jdk6-linux.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/jdk/jdk6-cygwin.nix b/pkgs/development/compilers/jdk/jdk6-cygwin.nix index 2ea050f51335..31c9c6140314 100644 --- a/pkgs/development/compilers/jdk/jdk6-cygwin.nix +++ b/pkgs/development/compilers/jdk/jdk6-cygwin.nix @@ -43,4 +43,6 @@ stdenv.mkDerivation rec { ./jre/lib/ext/localedata.pack \ ./lib/tools.pack ''; + + meta.license = "unfree"; } diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix index 04b9d5d75800..b564d3110144 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/jdk/jdk6-linux.nix @@ -67,4 +67,6 @@ stdenv.mkDerivation { inherit (xlibs) libX11; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; + + meta.license = "unfree"; } From ac73fc486cfe59087387e0784a8364831540bc57 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:28:55 -0400 Subject: [PATCH 0763/1120] Removed unused jdkPlugin attribute --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f24089874922..4ea178f13bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2355,7 +2355,6 @@ let jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; jre = jdkdistro false false; - jdkPlugin = lowPrio (jdkdistro true true); jrePlugin = lowPrio (jdkdistro false true); supportsJDK = From 964880ec8f14dd686c0eb5f678a913e55789c9f6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:55:46 -0400 Subject: [PATCH 0764/1120] virtualbox: Drop accidental JDK dependency --- pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ce81ff3bf9fe..1d399468d1b6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL - libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk + libcap glib kernel python alsaLib curl pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk ++ optional pythonBindings python; @@ -70,7 +70,9 @@ in stdenv.mkDerivation { cat >> AutoConfig.kmk << END_PATHS VBOX_PATH_APP_PRIVATE := $out VBOX_PATH_APP_DOCS := $out/doc - VBOX_JAVA_HOME := ${jdk} + ${optionalString javaBindings '' + VBOX_JAVA_HOME := ${jdk} + ''} END_PATHS echo "VBOX_WITH_DOCS :=" >> LocalConfig.kmk echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk From 22b545c3255a6ad2a2758880192f7e073c94d3c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 15:59:26 -0400 Subject: [PATCH 0765/1120] nvidia-x11: Update to 304.37 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b9cb0de57dab..8714c342f1ae 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.22"; in +let versionNumber = "304.37"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1nyyirimpmifr7ka83q5i4wld9zpb5a7ib6vssnlq8rz825fcjqp"; + sha256 = "0dxka66vp15xgm7z9v6x01gdvyvj3l9c33sa7zyahdxbr6h78cdb"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1jhrb9b2x8l3fy25miyyp5h11ajnj4nf45889dkxj3acrdz3z4zs"; + sha256 = "1xjg91sh7zyn6djdm78wdfas8j7cqn96nyy5zavsnd9jh7v1i0gp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From e188f8ec66ba628e51c7f0c34f1a56dd6882d5b4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Aug 2012 16:48:03 -0400 Subject: [PATCH 0766/1120] virtualbox: Update to 4.1.20 --- .../virtualization/virtualbox/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1d399468d1b6..1067300a2ef6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -9,7 +9,9 @@ with stdenv.lib; let - version = "4.1.18"; + + version = "4.1.20"; + forEachModule = action: '' for mod in \ $sourcedir/out/linux.*/release/bin/src/vboxdrv \ @@ -26,12 +28,13 @@ let make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} done ''; + in stdenv.mkDerivation { name = "virtualbox-${version}-${kernel.version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "e650e4fdc23581b9edc0e5d5705cc596c76796851ebf65ccda0edb8e413fa3b7"; + sha256 = "b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb"; }; buildInputs = @@ -48,8 +51,8 @@ in stdenv.mkDerivation { -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -i configure - ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 - ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 + ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 find . -type f | xargs sed 's/depmod -a/true/' -i export USER=nix set +x From c43f385e67619d2ac88780550bfc51b348a8578d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Aug 2012 23:20:44 +0200 Subject: [PATCH 0767/1120] qemu-kvm: update to 1.1.1 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 8 +++--- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 ------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f4..a24b06cb5b93 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,17 +3,17 @@ assert stdenv.isLinux; -let version = "1.0.1"; in +let version = "1.1.1"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { - url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; + url = "mirror://sourceforge/kvm/${name}.tar.gz"; + sha256 = "1pwnqxcz0xxm7ljhr7gjr3rs0h811a2271kj6kmmvbfwr9ybbyn6"; }; - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; + patches = [ ./smb-tmpdir.patch ]; postPatch = '' for i in $(find kvm -type f) diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch deleted file mode 100644 index 446a69a146b0..000000000000 --- a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From http://patchwork.ozlabs.org/patch/137186/ - -diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c ---- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200 -+++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100 -@@ -1,7 +1,7 @@ - /* - * Block driver for the Virtual Disk Image (VDI) format - * -- * Copyright (c) 2009 Stefan Weil -+ * Copyright (c) 2009, 2012 Stefan Weil - * - * 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 -@@ -767,8 +767,12 @@ - acb->header_modified = 1; - } - acb->bmap_last = block_index; -+ /* Copy data to be written to new block and zero unused parts. */ -+ memset(block, 0, sector_in_block * SECTOR_SIZE); - memcpy(block + sector_in_block * SECTOR_SIZE, - acb->buf, n_sectors * SECTOR_SIZE); -+ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0, -+ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE); - acb->hd_iov.iov_base = (void *)block; - acb->hd_iov.iov_len = s->block_size; - qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1); From 607c28ea3832b734ea90bc9dd19bc9f2a09272ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Aug 2012 23:27:58 +0200 Subject: [PATCH 0768/1120] qemu-kvm: I missed a change present in a previous reverted update Eelco pointed it out. --- pkgs/os-specific/linux/qemu-kvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index a24b06cb5b93..aa39a0e30203 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./smb-tmpdir.patch ]; postPatch = - '' for i in $(find kvm -type f) + '' for i in $(find . -type f) do sed -i "$i" \ -e 's|/bin/bash|/bin/sh|g ; From 9b1c34f8f262395abce670f6c7951f1fadf33310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 23 Aug 2012 00:07:20 +0200 Subject: [PATCH 0769/1120] qemu-kvm: Revert the qemu update to 1.1.1 This reverts commit 607c28ea3832b734ea90bc9dd19bc9f2a09272ca and c43f385e67619d2ac88780550bfc51b348a8578d. Some builds hang, as they did with 1.1.0. http://hydra.nixos.org/build/2963125 --- pkgs/os-specific/linux/qemu-kvm/default.nix | 10 +++---- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 +++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index aa39a0e30203..f6709bb439f4 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -3,20 +3,20 @@ assert stdenv.isLinux; -let version = "1.1.1"; in +let version = "1.0.1"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { - url = "mirror://sourceforge/kvm/${name}.tar.gz"; - sha256 = "1pwnqxcz0xxm7ljhr7gjr3rs0h811a2271kj6kmmvbfwr9ybbyn6"; + url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; + sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; }; - patches = [ ./smb-tmpdir.patch ]; + patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ]; postPatch = - '' for i in $(find . -type f) + '' for i in $(find kvm -type f) do sed -i "$i" \ -e 's|/bin/bash|/bin/sh|g ; diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch new file mode 100644 index 000000000000..446a69a146b0 --- /dev/null +++ b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch @@ -0,0 +1,27 @@ +From http://patchwork.ozlabs.org/patch/137186/ + +diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c +--- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200 ++++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100 +@@ -1,7 +1,7 @@ + /* + * Block driver for the Virtual Disk Image (VDI) format + * +- * Copyright (c) 2009 Stefan Weil ++ * Copyright (c) 2009, 2012 Stefan Weil + * + * 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 +@@ -767,8 +767,12 @@ + acb->header_modified = 1; + } + acb->bmap_last = block_index; ++ /* Copy data to be written to new block and zero unused parts. */ ++ memset(block, 0, sector_in_block * SECTOR_SIZE); + memcpy(block + sector_in_block * SECTOR_SIZE, + acb->buf, n_sectors * SECTOR_SIZE); ++ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0, ++ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE); + acb->hd_iov.iov_base = (void *)block; + acb->hd_iov.iov_len = s->block_size; + qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1); From a167fadc074889d11e59bdbbdb3299038a52aa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 22 Aug 2012 17:24:38 +0200 Subject: [PATCH 0770/1120] gnutls: Disable tests on FreeBSD. --- pkgs/development/libraries/gnutls/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 401433343da8..b8f88c6f5b85 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ nettle libtasn1 ]; - doCheck = true; + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD); meta = { description = "The GNU Transport Layer Security Library"; From 270c7f2209618d3a55def6aafee5527bb4ad0b08 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 22 Aug 2012 18:54:47 -0400 Subject: [PATCH 0771/1120] nodejs: Bump and backport fix to support ESPIPE --- pkgs/development/web/nodejs/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index c8d553d468ef..75e0df0e89e4 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,12 +1,21 @@ { stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }: +let + + espipe_patch = fetchurl { + url = https://github.com/joyent/libuv/commit/0ac2fdc55455794e057e4999a2e785ca8fbfb1b2.patch; + sha256 = "0mqgbsz23b3zp19dwk12ys14b031hssmlp40dylb7psj937qcpzi"; + }; + +in + stdenv.mkDerivation rec { - version = "0.8.7"; + version = "0.8.8"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "014x3r5vayb1zhmv4cdd9kwdcz408g2yjgvdwfk8xl3s6j4995zs"; + sha256 = "0cri5r191l5pw8a8pf3gs7hfjm3rrz6kdnm3l8wghmp9p12p0aq9"; }; configureFlags = [ @@ -21,6 +30,9 @@ stdenv.mkDerivation rec { prePatch = '' sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure + pushd deps/uv + patch -p 1 < ${espipe_patch} + popd ''; postInstall = '' From 222b6e21a5edf588aa4c176d165095a4b84df7a8 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 23 Aug 2012 00:13:43 +0400 Subject: [PATCH 0772/1120] gimp: revert broken gimp-2.6 dependencies --- pkgs/applications/graphics/gimp/default.nix | 8 ++++---- pkgs/development/libraries/babl/0_0_22.nix | 16 ++++++++++++++++ pkgs/development/libraries/gegl/0_0_22.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 ++++++++- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/babl/0_0_22.nix create mode 100644 pkgs/development/libraries/gegl/0_0_22.nix diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index ad35b7512315..b59b2bb67503 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk, freetype -, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl -, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl +, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl +, perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22 }: stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk freetype fontconfig - libart_lgpl libtiff libjpeg libpng libexif zlib perl - perlXMLParser python pygtk gettext intltool babl gegl + libart_lgpl libtiff libjpeg libpng12 libexif zlib perl + perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22 ]; passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix new file mode 100644 index 000000000000..2464a09f51aa --- /dev/null +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "babl-0.0.22"; + + src = fetchurl { + url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2; + sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s"; + }; + + meta = { + description = "Image pixel format conversion library"; + homepage = http://gegl.org/babl/; + license = "GPL3"; + }; +} diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix new file mode 100644 index 000000000000..150ba1ac961a --- /dev/null +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg +, librsvg, pango, gtk }: + +stdenv.mkDerivation { + name = "gegl-0.0.22"; + + src = fetchurl { + url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2; + sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5"; + }; + + configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them + + buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; + + meta = { + description = "Graph-based image processing framework"; + homepage = http://www.gegl.org; + license = "GPL3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ea178f13bbb..184363571189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3273,6 +3273,8 @@ let axis = callPackage ../development/libraries/axis { }; + babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { }; + babl = callPackage ../development/libraries/babl { }; beecrypt = callPackage ../development/libraries/beecrypt { }; @@ -3526,6 +3528,9 @@ let # avocodec avformat librsvg }; + gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { + # avocodec avformat librsvg + }; geoclue = callPackage ../development/libraries/geoclue {}; geoip = builderDefsPackage ../development/libraries/geoip { @@ -6891,7 +6896,7 @@ let get_iplayer = callPackage ../applications/misc/get_iplayer {}; - gimp = callPackage ../applications/graphics/gimp { + gimp_2_6 = callPackage ../applications/graphics/gimp { inherit (gnome) libart_lgpl; }; @@ -6899,6 +6904,8 @@ let inherit (gnome) libart_lgpl; }; + gimp = gimp_2_6; + gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins { inherit pkgs gimp; }); From 518c90d36125870923600947933aeb1db2a966bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 23 Aug 2012 10:15:12 +0200 Subject: [PATCH 0773/1120] cscope: update to 15.8a --- pkgs/development/tools/misc/cscope/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 3cba5cd2e76a..b9d2c10f5371 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, pkgconfig, emacs}: stdenv.mkDerivation rec { - name = "cscope-15.7a"; + name = "cscope-15.8a"; src = fetchurl { - url = "mirror://sourceforge/cscope/${name}.tar.bz2"; - sha256 = "0dv0r66x31y2xxvad54x0wal8yb1krwbx3gjc82qpg4hlz5qnqq2"; + url = "mirror://sourceforge/cscope/${name}.tar.gz"; + sha256 = "07jdhxvp3dv7acvp0pwsdab1g2ncxjlcf838lj7vxgjs1p26lwzb"; }; preConfigure = '' From 7b5d312720977bcf27a908f6d53a00ddd5bc1dc5 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 23 Aug 2012 11:22:06 +0200 Subject: [PATCH 0774/1120] Add pstack, a wrapper script for gdb. Used to be part of gdb. --- pkgs/development/tools/misc/gdb/pstack.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/development/tools/misc/gdb/pstack.nix diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix new file mode 100644 index 000000000000..12cdc6542609 --- /dev/null +++ b/pkgs/development/tools/misc/gdb/pstack.nix @@ -0,0 +1,11 @@ +{ stdenv, gdb }: +stdenv.mkDerivation { + name = "pstack-20120823"; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/pstack < Date: Thu, 23 Aug 2012 14:15:56 +0200 Subject: [PATCH 0775/1120] Forgot to commit all-packages.nix for pstack. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 184363571189..2ee6dc66b2d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3142,6 +3142,8 @@ let premake = callPackage ../development/tools/misc/premake { }; + pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; From 5318c4652cbfa1673a219d50b48130919be8b78d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:37:40 +0200 Subject: [PATCH 0776/1120] Patch overzealous dependency restrictions in Haskell packages. --- pkgs/development/libraries/haskell/clientsession/default.nix | 3 +++ pkgs/development/libraries/haskell/filestore/default.nix | 3 +++ .../libraries/haskell/happstack/happstack-server.nix | 3 +++ pkgs/development/libraries/haskell/hledger-lib/default.nix | 3 +++ pkgs/development/libraries/haskell/hledger/default.nix | 3 +++ pkgs/development/libraries/haskell/mime-mail/default.nix | 3 +++ pkgs/development/libraries/haskell/pandoc/default.nix | 3 +++ .../development/libraries/haskell/wai-app-static/default.nix | 5 ++++- 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index da933207e23e..417e568092d7 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged ]; + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' clientsession.cabal + ''; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 355c6ef876ce..b0cc40d39140 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + patchPhase = '' + sed -i -e 's|split.*,|split,|' filestore.cabal + ''; noHaddock = true; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index d171795d266d..410eb7e1d051 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { html monadControl mtl network parsec sendfile syb systemFilepath text time transformers transformersBase utf8String xhtml zlib ]; + patchPhase = '' + sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' happstack-server.cabal + ''; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index ef244bcb7689..644406ae1ec0 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String ]; + patchPhase = '' + sed -i -e 's|,split.*|,split|' hledger-lib.cabal + ''; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 815ca1b87fd9..efc2936f4063 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -13,6 +13,9 @@ cabal.mkDerivation (self: { cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe shakespeareText split text time utf8String ]; + patchPhase = '' + sed -i -e 's|,split.*|,split|' hledger.cabal + ''; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 37e76284919b..9abc588a0e76 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' mime-mail.cabal + ''; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index c1aabed388b5..8f34d2d88a0a 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -15,6 +15,9 @@ cabal.mkDerivation (self: { highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; + patchPhase = '' + sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' pandoc.cabal + ''; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index ea4ddd7ae827..e1f2cb9116da 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -13,7 +13,10 @@ cabal.mkDerivation (self: { cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; - meta = { + patchPhase = '' + sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' wai-app-static.cabal + ''; + meta = { homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; From f3f58a84652791eb6ea6e745c6706ad762f1739c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:46 +0200 Subject: [PATCH 0777/1120] haskell-RepLib: update to version 0.5.3.1 --- pkgs/development/libraries/haskell/RepLib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 1bc52184474f..15cba0c0b283 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "RepLib"; - version = "0.5.3"; - sha256 = "1kpd4qli6fclrr3i21kmdwbpa0la7ssi9pgagzclr3yj2ca2hsgw"; + version = "0.5.3.1"; + sha256 = "0lc1ma6h5wdfl4crnvg1vyvlx4xvps4l2nwb9dl6nyspmpjad807"; buildDepends = [ mtl typeEquality ]; meta = { homepage = "http://code.google.com/p/replib/"; From 87fdf726cabd19b97c4a4f224edb3d35278b301b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0778/1120] haskell-async: update to version 2.0.1.2 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index ca759009817f..499dc394ece1 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.1.1"; - sha256 = "132xr0sb3j02s134my4p7khj95d3v3jlpxqjrgn6h8brw0gp6wcq"; + version = "2.0.1.2"; + sha256 = "03mmrs1xrw91pv9xpas8acxvrh4j6bq5l24bqk4vmaq2pdy9snn3"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; From f3d1ddc21f3aa95f23ebfc56d137201e29fc2fbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0779/1120] haskell-glpk-hs: update to version 0.3.3 --- pkgs/development/libraries/haskell/glpk-hs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix index 621a7e9c4c51..006f227a8c20 100644 --- a/pkgs/development/libraries/haskell/glpk-hs/default.nix +++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "glpk-hs"; - version = "0.3.2"; - sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8"; + version = "0.3.3"; + sha256 = "1pnq0v5va7f40ky9xb8c4z9wcmmnny2vk4afasz5pwivbxh42mfl"; buildDepends = [ deepseq mtl ]; extraLibraries = [ glpk ]; meta = { From a9a09e632ab04ee55667f4fc8d574276e304f907 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0780/1120] haskell-http-types: update to version 0.7.3 --- 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 27216b3e970c..14d347f39f50 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.2"; - sha256 = "06yvjq4246sp6gfillwbk6xz1d9l0zq06qy70a5zdyaw6viz2h76"; + version = "0.7.3"; + sha256 = "1s2y2fl9l75xd6fls9ajasn37i7cqxfw772rkw50d3vxvk2fdxjh"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From 636db52af2828ec9f8e3089abfd1b2240d926d6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0781/1120] haskell-postgresql-libpq: update to version 0.8.2.1 --- .../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 19f729a56414..040c931d1f61 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"; - sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g"; + version = "0.8.2.1"; + sha256 = "0fjy451gc9lg3kcglq4s5s3hja8ni3adh4jmxd01kfyvyhwggv4d"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From 776d748c5bb37fc06c34fb50ff7f2fa0cb986b61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0782/1120] haskell-postgresql-simple: update to version 0.2.4.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index da78cafde6c0..28b5c0dec850 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.3.0"; - sha256 = "0lbvd7mq7xqz1cala4vvw5zj96sbqi0qqnmfj5h0844ci2f25i97"; + version = "0.2.4.0"; + sha256 = "1n1s650j4z82cz34rq9qgj805yc9x852snnqjaa1iwrg9i3r150f"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From ff960a56035c021266dee6b0e26bad0c5017ddaf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0783/1120] haskell-split: update to version 0.2.0.0 --- pkgs/development/libraries/haskell/split/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 33f927e3d576..42d33d10a066 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.1.4.3"; - sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + version = "0.2.0.0"; + sha256 = "1gk0nx6bw5j9gxaa6ki70wqszbllz7c1ccfnwg49fl3qfabg1i7c"; meta = { - homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 7f80024b2ac513838382eb0c905cd7e309d3813e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0784/1120] haskell-unbound: update to version 0.4.1.1 --- pkgs/development/libraries/haskell/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 466285d3e55e..a90381202e1a 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.1"; - sha256 = "1fryjs5byyqha945qy8vyfpq4fzjmnh0jc01wzvk6ri292qipsyn"; + version = "0.4.1.1"; + sha256 = "0niv8mm4zjkndj0g32dgr32177dfp647hi32hqzwiis77vcfvdzb"; buildDepends = [ mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; From da94736f6ae371db1959ba26b9d9d378eac9fbbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0785/1120] haskell-vault: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 84fd27a36426..4d74884a1a7f 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vault"; - version = "0.2.0.0"; - sha256 = "1hv87kvi2bwf9ff8mhjzdf8rvqhk1xpschzs1x3swadj1kc9f1sv"; + version = "0.2.0.1"; + sha256 = "027wgbnmdnp98f0wvc9xsfh175n7rq8m2j9i7j1c5vxwgi61dqxq"; buildDepends = [ hashable unorderedContainers ]; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; From bbd07b136fd463ecd4179b4d87b9fefc409836c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0786/1120] haskell-wl-pprint-text: update to version 1.1.0.0 --- pkgs/development/libraries/haskell/wl-pprint-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index 0db3ef08060b..083f269255a0 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-text"; - version = "1.0.0.0"; - sha256 = "1zvjsbn98g0lja2jj00d7mvqjq4rik7v7wsy5655wibmy0hbll90"; + version = "1.1.0.0"; + sha256 = "18xgsrxg20sk18m9dwds6161vl4hgdp052qbb0cg9jqy50vhddis"; buildDepends = [ text ]; meta = { description = "A Wadler/Leijen Pretty Printer for Text values"; From 336aa54bf0d0cfc21e8996b9810e2507ac06c52e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0787/1120] haskell-yesod-core: update to version 1.1.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 85dbca15fdbb..219a83e1e96d 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.0.1"; - sha256 = "1shjw18bh1kqay3imij41678dk2hpc39a8jdg89mn8mnj7gdzjxw"; + version = "1.1.1"; + sha256 = "1rq0zdn9d6f34s7wnnr32hnbz23z8bvz3j2ylv8sz5h3nwmbfz99"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From 1138fe508515f6e7d03ed42e99d47b538f507550 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:47 +0200 Subject: [PATCH 0788/1120] haskell-yesod-form: update to version 1.1.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 60042697e1d3..35a0adc2592b 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.1.0.1"; - sha256 = "1fcffvaw1hv5qdgl1h4m93jjv9qwr1b9ggr4zy7ij2cbjynavawq"; + version = "1.1.1"; + sha256 = "04wlfhaqx7qg904n6f1yz00m3c2sa5ywbhz6m0pmzfm9a7byggcc"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From 165257a8ee7bf7dd3007d5758d9582790a1949f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Aug 2012 17:41:48 +0200 Subject: [PATCH 0789/1120] haskell-yesod: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 2e0a16fb3b28..eeb2e3766801 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.0.1"; - sha256 = "03r4w2pax8ikdk3ah744pninpk82cylkccg69dl2xr2546m2alh2"; + version = "1.1.0.2"; + sha256 = "0r89sg0nnv3x46l9z39gn109a38jzr46lgx33v18268maqlc7brb"; isLibrary = true; isExecutable = true; buildDepends = [ From dbe524fe3f1ccb0765d273e056a8ec3dd5c40e49 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 23 Aug 2012 13:57:31 -0400 Subject: [PATCH 0790/1120] flac: Add description --- pkgs/applications/audio/flac/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 4eef90b575cc..fa201d20c3fb 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,24 +1,25 @@ -{stdenv, fetchurl, libogg}: +{ stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { name = "flac-1.2.1"; - + src = fetchurl { url = mirror://sourceforge/flac/flac-1.2.1.tar.gz; sha256 = "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn"; }; - buildInputs = [libogg]; + buildInputs = [ libogg ]; + + patches = + [ # Fix for building on GCC 4.3. + (fetchurl { + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; + sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; + }) + ]; - patches = [ - # Fix for building on GCC 4.3. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1"; - sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr"; - }) - ]; - meta = { homepage = http://flac.sourceforge.net; + description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; }; } From 6ed6d1c5c0ba55ac5e989878a5618d5032776c45 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 Aug 2012 23:07:38 -0400 Subject: [PATCH 0791/1120] Add expression to create an openjdk bootstrap capable of building the full openjdk --- .../compilers/openjdk/make-bootstrap.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/make-bootstrap.nix diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix new file mode 100644 index 000000000000..539e1bd23502 --- /dev/null +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -0,0 +1,19 @@ +{ runCommand, openjdk }: + +let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in + +runCommand "${openjdk.name}-bootstrap" {} '' + mkdir -p $out/bin + mkdir -p $out/lib + mkdir -p $out/jre/lib/{security,ext,${arch}/{jli,server,headless}} + cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} $out/bin + cp ${openjdk}/lib/tools.jar $out/lib + cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} $out/jre/lib + cp ${openjdk}/jre/lib/security/java.security $out/jre/lib/security + cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} $out/jre/lib/ext + cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} $out/jre/lib/${arch} + cp ${openjdk}/jre/lib/${arch}/jli/libjli.so $out/jre/lib/${arch}/jli + cp ${openjdk}/jre/lib/${arch}/server/libjvm.so $out/jre/lib/${arch}/server + cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so $out/jre/lib/${arch}/headless + cp -a ${openjdk}/include $out +'' From 87a3bcd4706c9d6b449cf6390d36a6265069019d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 24 Aug 2012 09:20:27 +0200 Subject: [PATCH 0792/1120] libreoffice: trying to make it build with openjdk --- pkgs/applications/office/openoffice/libreoffice.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index fb577be03907..da786c23c33e 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -144,6 +144,8 @@ stdenv.mkDerivation rec { "--without-system-nss" "--without-system-sampleicc" "--without-system-libexttextcat" + + "--with-java-target-version=1.6" # The default 1.7 not supported ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee6dc66b2d6..aaeaf48d2128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7170,6 +7170,7 @@ let inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; boost = boost149; + jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf From 4cc7571b9d515aad1051a0b696a3d2fa35b1fa60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Aug 2012 13:42:48 +0200 Subject: [PATCH 0793/1120] haskell-fclabels: update to version 1.1.4.1 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 25ec69c84592..82a96856ab80 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.4"; - sha256 = "0b15nvnsxckw75q7dgrfxnnjc93ah140gi3s5wpb41q0fnvl9npz"; + version = "1.1.4.1"; + sha256 = "09k601kijdflazmrxygwwd8lmxr9vx2bzc25qiwcc9id2rp43asm"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From a4b39fac652c6d829ea39c10f72b43f2074b1609 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 24 Aug 2012 08:30:48 -0400 Subject: [PATCH 0794/1120] openjdk-bootstrap: nukerefs the whole thing and put it in a tarball --- .../compilers/openjdk/make-bootstrap.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index 539e1bd23502..ca6533b72acc 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -1,19 +1,24 @@ -{ runCommand, openjdk }: +{ runCommand, openjdk, nukeReferences }: let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in -runCommand "${openjdk.name}-bootstrap" {} '' - mkdir -p $out/bin - mkdir -p $out/lib - mkdir -p $out/jre/lib/{security,ext,${arch}/{jli,server,headless}} - cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} $out/bin - cp ${openjdk}/lib/tools.jar $out/lib - cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} $out/jre/lib - cp ${openjdk}/jre/lib/security/java.security $out/jre/lib/security - cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} $out/jre/lib/ext - cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} $out/jre/lib/${arch} - cp ${openjdk}/jre/lib/${arch}/jli/libjli.so $out/jre/lib/${arch}/jli - cp ${openjdk}/jre/lib/${arch}/server/libjvm.so $out/jre/lib/${arch}/server - cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so $out/jre/lib/${arch}/headless - cp -a ${openjdk}/include $out +runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' + mkdir -p openjdk-bootstrap/bin + mkdir -p openjdk-bootstrap/lib + mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,headless}} + cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin + cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib + cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib + cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security + cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext + cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch} + cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli + cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server + cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless + cp -a ${openjdk}/include openjdk-bootstrap + + chmod -R +w openjdk-bootstrap + find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs + + tar cv openjdk-bootstrap | xz > $out '' From 32e339da54c8e8d07fe10cec3cb4d624071b9547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 25 Aug 2012 01:57:24 +0200 Subject: [PATCH 0795/1120] Adding jack_capture: A program for recording soundfiles with jack --- .../audio/jack-capture/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/jack-capture/default.nix diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix new file mode 100644 index 000000000000..3b8f0f652a8b --- /dev/null +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }: + +stdenv.mkDerivation rec { + name = "jack_capture-${version}"; + version = "0.9.69"; + + src = fetchurl { + url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; + sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; + }; + + buildInputs = [ jackaudio libsndfile pkgconfig ]; + + buildPhase = "PREFIX=$out make jack_capture"; + + installPhase = '' + mkdir -p $out/bin + cp jack_capture $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A program for recording soundfiles with jack"; + homepage = http://archive.notam02.no/arkiv/src; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aaeaf48d2128..a5e69c7ebb0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7117,6 +7117,8 @@ let bip = callPackage ../applications/networking/irc/bip { }; + jack_capture = callPackage ../applications/audio/jack-capture { }; + jackmeter = callPackage ../applications/audio/jackmeter { }; jedit = callPackage ../applications/editors/jedit { }; From 228c35f0b2b386635e6bbd8c6513e9fc5bafeb2f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 24 Aug 2012 22:29:23 -0400 Subject: [PATCH 0796/1120] openjdk: Build from bootstrap --- .../compilers/openjdk/bootstrap.nix | 21 +++++++++++++++++++ .../development/compilers/openjdk/default.nix | 1 + .../compilers/openjdk/make-bootstrap.nix | 4 +++- pkgs/top-level/all-packages.nix | 7 ++++++- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/bootstrap.nix diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix new file mode 100644 index 000000000000..8f603bb2354d --- /dev/null +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -0,0 +1,21 @@ +{ runCommand, glibc, fetchurl }: + +let + # !!! These should be on nixos.org + src = if glibc.system == "x86_64-linux" then + fetchurl { + url = ftp://linode.shealevy.com/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; + sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; + } + else if glibc.system == "i686-linux" then + fetchurl { + url = ftp://linode.shealevy.com/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; + sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; + } + else throw "No bootstrap for system"; +in + +runCommand "openjdk-bootstrap" {} '' + xz -dc ${src} | sed "s/e*-glibc-[^/]*/$(basename ${glibc})/g" | tar xv + mv openjdk-bootstrap $out +'' diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index cf85c1706a8a..5f5148911ec2 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "DROPS_DIR=$(DROPS_PATH)" + "SKIP_BOOT_CYCLE=false" ]; configurePhase = '' diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index ca6533b72acc..aa5b8ad39f56 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -5,7 +5,7 @@ let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' mkdir -p openjdk-bootstrap/bin mkdir -p openjdk-bootstrap/lib - mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,headless}} + mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}} cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib @@ -14,6 +14,8 @@ runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch} cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server + cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client || + rmdir openjdk-bootstrap/jre/lib/${arch}/client cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless cp -a ${openjdk}/include openjdk-bootstrap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee6dc66b2d6..37ff40aac930 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2342,11 +2342,16 @@ let path64 = callPackage ../development/compilers/path64 { }; + openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; + openjdk = if stdenv.isDarwin then callPackage ../development/compilers/openjdk-darwin { } else - callPackage ../development/compilers/openjdk { }; + callPackage ../development/compilers/openjdk { + jdk = pkgs.openjdkBootstrap; + ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; + }; openjre = callPackage ../development/compilers/openjdk { jreOnly = true; From 130a4aa5074100d32a288900effa29ca9a3bc56d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:12:54 +0200 Subject: [PATCH 0797/1120] add perl packages: IPC-Signal, mime-construct, Proc-WaitStat --- pkgs/top-level/perl-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8ef55d3ff4cc..eeba996990dc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2219,6 +2219,14 @@ rec { }; }; + IPCSignal = buildPerlPackage rec { + name = "IPC-Signal-1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "1l3g0zrcwf2whwjhbpwdcridb7c77mydwxvfykqg1h6hqb4gj8bw"; + }; + }; + JSON = buildPerlPackage rec { name = "JSON-2.53"; src = fetchurl { @@ -2464,6 +2472,15 @@ rec { }; }; + mimeConstruct = buildPerlPackage rec { + name = "mime-construct-1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; + }; + buildInputs = [ ProcWaitStat ]; + }; + MIMETypes = buildPerlPackage rec { name = "MIME-Types-1.27"; src = fetchurl { @@ -3129,6 +3146,15 @@ rec { doCheck = false; }; + ProcWaitStat = buildPerlPackage rec { + name = "Proc-WaitStat-1.00"; + src = fetchurl { + url = "mirror://cpan//authors/id/R/RO/ROSCH/${name}.tar.gz"; + sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; + }; + propagatedBuildInputs = [ IPCSignal ]; + }; + PSGI = buildPerlPackage rec { name = "PSGI-1.03"; src = fetchurl { From 8c96572638982826a4bf7e2466755c9a65998fab Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:13:20 +0200 Subject: [PATCH 0798/1120] add liblockfile-1.09 --- .../libraries/liblockfile/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/liblockfile/default.nix diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix new file mode 100644 index 000000000000..2db90845f699 --- /dev/null +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + _name = "liblockfile"; + version = "1.09"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz"; + sha256 = "0zqvbxls1632wqfhv4v3q2djzlz9391h0wdgsvhnaqrr0nx9x5qn"; + }; + + preConfigure = '' + sed -i -e 's/install -g [^ ]* /install /' Makefile.in + ''; + + preInstall = '' + mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3} + ''; + + + meta = { + description = "Liblockfile is a shared library with NFS-safe locking functions."; + homepage = http://packages.debian.org/unstable/libs/liblockfile1; + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0862b7eee27e..cf591b9db3e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4122,6 +4122,8 @@ let liblqr1 = callPackage ../development/libraries/liblqr-1 { }; + liblockfile = callPackage ../development/libraries/liblockfile { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmtp = callPackage ../development/libraries/libmtp { }; From e5cc68e8d58ae2f98b80c6bc0912eef87ae96aba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:13:59 +0200 Subject: [PATCH 0799/1120] add lockfile-progs-0.1.16 --- pkgs/tools/misc/lockfile-progs/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/lockfile-progs/default.nix diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix new file mode 100644 index 000000000000..41fca2121581 --- /dev/null +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, liblockfile }: + +stdenv.mkDerivation rec { + _name = "lockfile-progs"; + version = "0.1.16"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; + sha256 = "0sca19mg0lk68ms6idy4vfp8dyjpcbq9f143v9qzjyk86bb34lgr"; + }; + + buildInputs = [ liblockfile ]; + + installPhase = '' + mkdir -p $out/bin $out/man/man1 + install -s bin/* $out/bin + install man/*.1 $out/man/man1 + ''; + + meta = { + description = "Programs for locking and unlocking files and mailboxes"; + homepage = http://packages.debian.org/sid/lockfile-progs; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf591b9db3e4..6ef8f298028c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -966,6 +966,8 @@ let less = callPackage ../tools/misc/less { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; + logstash = callPackage ../tools/misc/logstash { }; klavaro = callPackage ../games/klavaro {}; From 528b508b879ceb21f4ff35df68c8744c5882d273 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:14:40 +0200 Subject: [PATCH 0800/1120] add logcheck 1.3.15 nixos-module follows soon --- pkgs/tools/system/logcheck/default.nix | 45 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/system/logcheck/default.nix diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix new file mode 100644 index 000000000000..1c57711940bf --- /dev/null +++ b/pkgs/tools/system/logcheck/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, lockfileProgs, perl, mimeConstruct }: + +stdenv.mkDerivation rec { + _name = "logcheck"; + version = "1.3.15"; + name = "${_name}-${version}"; + + src = fetchurl { + url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz"; + sha256 = "1rdrs12hkm5i5yyz89a6cwhf4fzjkbcd4q4zy6sk148aji9lg6xj"; + }; + + preConfigure = '' + substituteInPlace src/logtail --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perl}/bin/perl" + + sed -i -e 's|! -f /usr/bin/lockfile|! -f ${lockfileProgs}/bin/lockfile|' \ + -e 's|^\([ \t]*\)lockfile-|\1${lockfileProgs}/bin/lockfile-|' \ + -e "s|/usr/sbin/logtail2|$out/sbin/logtail2|" \ + -e 's|mime-construct|${mimeConstruct}/bin/mime-construct|' \ + -e 's|\$(run-parts --list "\$dir")|"$dir"/*|' src/logcheck + ''; + + makeFlags = [ + "DESTDIR=$(out)" + "SBINDIR=sbin" + "BINDIR=bin" + "SHAREDIR=share/logtail/detectrotate" + ]; + + meta = { + description = "Mails anomalies in the system logfiles to the administrator."; + longDescription = '' + Mails anomalies in the system logfiles to the administrator. + + Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. + Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. + ''; + homepage = http://logcheck.org; + license = "GPLv2"; + + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef8f298028c..0987fcfae24b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1000,6 +1000,10 @@ let libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + logcheck = callPackage ../tools/system/logcheck { + inherit (perlPackages) mimeConstruct; + }; + logrotate = callPackage ../tools/system/logrotate { }; logstalgica = callPackage ../tools/graphics/logstalgica {}; From 9dace1124e5919a3bc5e0793d5c5fea6a9d90600 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 Aug 2012 16:02:27 +0200 Subject: [PATCH 0801/1120] urweb: Update to version 20120807. The previous version seemed rather old and not even the examples from the official site compile with that fossil. As there are no reverse dependencies, this update should be trivial and hopefully doesn't hurt someones personal feelings. --- pkgs/development/compilers/urweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 7dbbe3752839..c518d863e7ee 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20120110"; + version = "20120807"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1f67nj2akji9dh3n2hwmcrrwd61zlrnb0xh841fpb3n20ycjzg6j"; + sha256 = "15g1cz108dkzlp433cg56x76f20y6zcs9sbgxgdniyfakmn4ld6l"; }; buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; From ca3f140e9b16905005f5ad0121bab1d5db511259 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 Aug 2012 16:08:01 +0200 Subject: [PATCH 0802/1120] urweb: Use lib.licenses.bsd3 in meta attributes. --- pkgs/development/compilers/urweb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index c518d863e7ee..7c0ddde66128 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.impredicative.com/ur/; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 2ab159451230b2a41502ef2a08497a8f37d09875 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 25 Aug 2012 21:24:17 +0400 Subject: [PATCH 0803/1120] Atop: add package (atop is one more load monitor) --- pkgs/os-specific/linux/atop/default.nix | 39 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/atop/default.nix diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix new file mode 100644 index 000000000000..0e2df1e25fb0 --- /dev/null +++ b/pkgs/os-specific/linux/atop/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, zlib, ncurses}: + +stdenv.mkDerivation rec { + version = "1.27-3"; + name = "atop-${version}"; + + src = fetchurl { + url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; + sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f"; + }; + + buildInputs = [zlib ncurses]; + + makeFlags = [ + ''SCRPATH=$out/etc/atop'' + ''LOGPATH=/var/log/atop'' + ''INIPATH=$out/etc/rc.d/init.d'' + ''CRNPATH=$out/etc/cron.d'' + ''ROTPATH=$out/etc/logrotate.d'' + ]; + + preConfigure = '' + sed -e "s@/usr/@$out/@g" -i $(find . -type f ) + sed -e "/mkdir.*LOGPATH/s@mkdir@echo missing dir @" -i Makefile + sed -e "/touch.*LOGPATH/s@touch@echo should have created @" -i Makefile + sed -e 's/chown/true/g' -i Makefile + sed -e '/chkconfig/d' -i Makefile + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + description = ''Console system performance monitor''; + + longDescription = '' + Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0987fcfae24b..aa88a26c7a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5475,6 +5475,8 @@ let inherit (perlPackages) LocaleGettext TermReadKey RpcXML; }; + atop = callPackage ../os-specific/linux/atop { }; + b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { }; From 79e3d1728044403a37e851ae90a71268f7515f4e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:39:19 +0200 Subject: [PATCH 0804/1120] update ecj to 3.7.2 --- pkgs/development/eclipse/ecj/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 53343f00ca55..8d083126e4cf 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, ant, gcj }: let - version = "3.6.1"; - date = "201009090800"; + version = "3.7.2"; + date = "201202080800"; isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj"; javaExec = if isGCJ then "gij" else "java"; javaFlags = if isGCJ then "--cp" else "-cp"; @@ -11,8 +11,8 @@ in name = "ecj-${version}"; src = fetchurl { - url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.zip"; - sha256 = "0xfsig2pzd9wy524wp11s7pc7cj81s28g1485995b44d9qbi17h8"; + url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar"; + sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; }; buildInputs = [ unzip ant gcj ]; From 1d26619edfed9ade95519c70871e6dcde451eb15 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:39:49 +0200 Subject: [PATCH 0805/1120] use openjdk as default for ant-build.nix --- pkgs/build-support/release/ant-build.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 696f179a2ed0..0cabdf2f7e79 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -8,8 +8,8 @@ , antProperties ? [] , antBuildInputs ? [] , buildfile ? "build.xml" -, ant ? pkgs.ant -, jre ? pkgs.jre +, ant ? pkgs.apacheAntOpenJDK +, jre ? pkgs.openjdk , hydraAntLogger ? pkgs.hydraAntLogger , ... } @ args: From d1d5c6d9830d9509999ab3d554fac6bbadca3ec7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:40:15 +0200 Subject: [PATCH 0806/1120] Update URL for xmlbeans 2.2.0 --- pkgs/development/libraries/java/rhino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 800ae7ba7185..3e666c9fa234 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -5,7 +5,7 @@ let options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. xbeans = fetchurl { - url = "http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; + url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in From 77948b72045bbd155098ef6ce59fdc00581c82d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:43:54 +0200 Subject: [PATCH 0807/1120] Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 --- pkgs/misc/maven/3.0.nix | 15 --------------- pkgs/misc/maven/default.nix | 6 +++--- pkgs/misc/maven/maven-1.0.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 5 ++--- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/misc/maven/3.0.nix delete mode 100644 pkgs/misc/maven/maven-1.0.nix diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix deleted file mode 100644 index 3d14a064a94f..000000000000 --- a/pkgs/misc/maven/3.0.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, jdk, makeWrapper}: - -assert jdk != null; - -stdenv.mkDerivation { - name = "apache-maven-3.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.0.3-bin.tar.gz; - sha256 = "b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a"; - }; - - buildInputs = [makeWrapper]; - inherit jdk; -} diff --git a/pkgs/misc/maven/default.nix b/pkgs/misc/maven/default.nix index 857949016504..ec2b57e222a0 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -3,11 +3,11 @@ assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-2.2.1"; + name = "apache-maven-3.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-2.2.1-bin.tar.gz; - sha256 = "0xnk08ndf1jx458sr5dfr8rh7wi92kyn887vqyzjm1ka91cnb8xr"; + url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; + sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; }; buildInputs = [makeWrapper]; diff --git a/pkgs/misc/maven/maven-1.0.nix b/pkgs/misc/maven/maven-1.0.nix deleted file mode 100644 index 2c84b6f006cb..000000000000 --- a/pkgs/misc/maven/maven-1.0.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, jdk}: - -assert jdk != null; - -stdenv.mkDerivation { - name = "maven-1.0.2"; - mavenBinary = "maven"; - builder = ./builder.sh; - src = fetchurl { - url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2; - md5 = "81a6b4393e550635efe19e95cea38718"; - }; - makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh; - - inherit jdk; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa88a26c7a73..36ec708e8ca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8662,9 +8662,8 @@ let martyr = callPackage ../development/libraries/martyr { }; - maven = callPackage ../misc/maven/maven-1.0.nix { }; - maven2 = callPackage ../misc/maven { }; - maven3 = callPackage ../misc/maven/3.0.nix { }; + maven = maven3; + maven3 = callPackage ../misc/maven { jdk = openjdk; }; mess = callPackage ../misc/emulators/mess { inherit (pkgs.gnome) GConf; From 55b964e1799881d4314c6e14412d978cc132a682 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:15:06 +0200 Subject: [PATCH 0808/1120] add: haskell-split older version (0.1) --- pkgs/development/libraries/haskell/split/0.1.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/split/0.1.nix diff --git a/pkgs/development/libraries/haskell/split/0.1.nix b/pkgs/development/libraries/haskell/split/0.1.nix new file mode 100644 index 000000000000..ad0df5c2cb02 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.1.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.1.4.3"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + meta = { + homepage = "http://code.haskell.org/~byorgey/code/split"; + description = "Combinator library for splitting lists"; + 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 fddc9589d3ae..9a252bbc0f29 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1410,6 +1410,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; + split_0_1 = callPackage ../development/libraries/haskell/split/0.1.nix {}; split = callPackage ../development/libraries/haskell/split {}; stbImage = callPackage ../development/libraries/haskell/stb-image {}; From 7202f40707a5fb37cea33018f70a762bd05ddbe9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:16:55 +0200 Subject: [PATCH 0809/1120] xmonad-extras: pass old version of split optional features depend on it. --- pkgs/top-level/haskell-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9a252bbc0f29..f2d6e28de4b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1782,6 +1782,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix { X11 = self.X11_1_5_0_1; + split = self.split_0_1; }; # Tools. From 84e1da4b09e2332447e5a2d9fc4e45b2499d7cc0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 25 Aug 2012 17:55:21 -0400 Subject: [PATCH 0810/1120] openjdk bootstrap tarballs are on nixos.org now. --- pkgs/development/compilers/openjdk/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 8f603bb2354d..2ac2eed117c6 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -4,12 +4,12 @@ let # !!! These should be on nixos.org src = if glibc.system == "x86_64-linux" then fetchurl { - url = ftp://linode.shealevy.com/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; + url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; } else if glibc.system == "i686-linux" then fetchurl { - url = ftp://linode.shealevy.com/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; + url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; } else throw "No bootstrap for system"; From 224098757f84db54ec39345b9ad3c7f473fcdf62 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 02:52:33 +0200 Subject: [PATCH 0811/1120] chromium/update.sh: Fix spacing in cache messages. This commit doesn't add any feature and just fixes a small annoyance which result in messages like this: Checking if xxx applies...no. See that there is no whitespace between "..." and "no"? Well, the world cares for more important things, but for me personally those minor annoyances can turn into major annoyances. --- pkgs/applications/networking/browsers/chromium/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 4721ded385ae..c978ee4adf3a 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -83,9 +83,9 @@ get_channel_exprs() echo -n "Checking if sha256 of version $version is cached..." >&2; if sha256="$(sha_lookup "$version")"; then - echo "yes: $sha256" >&2; + echo " yes: $sha256" >&2; else - echo "no." >&2; + echo " no." >&2; sha256="$(get_sha256 "$channel" "$version" "$url")"; fi; From 819ee63851170fc2256e37429dddacfc13a04993 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 02:56:59 +0200 Subject: [PATCH 0812/1120] chromium: Update to new release channels. If you look at what changed, you'll surely notice that version 22 is now in beta, so we have to expect things to break. And one thing that will break for sure is the seccomp patch, because beginning with 22 the new BPF seccomp sandbox is going to replace the mode 1 seccomp sandbox. --- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index a250cda76102..8ae373438f59 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "22.0.1229.8"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.8.tar.bz2"; - sha256 = "0gaa4mqvd0v4y587y6mri2f3b0rc8npmcbs9bfs4wwb8n1cp8kw0"; + version = "23.0.1243.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1243.2.tar.bz2"; + sha256 = "1idsc1k0c392mvh2rhfv0sr50rmzdab18ilh9p90mab5a6fk32rh"; }; beta = { - version = "21.0.1180.79"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2"; - sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8"; + version = "22.0.1229.14"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.14.tar.bz2"; + sha256 = "11z5wc1m5443bsassq3np79yqr2bwr06ph672by3saikl2xkadn5"; }; stable = { - version = "21.0.1180.79"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.79.tar.bz2"; - sha256 = "1jscpibv02pyqpcj6djcx0d1qwq8hcxampfqbsz8dicgjprp22c8"; + version = "21.0.1180.81"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.81.tar.bz2"; + sha256 = "1b5svzg7xxx46bz9s5ayai2ig9b7s0x4s1yl7r42p9g27qwf0dpl"; }; } From b1a6a98139f9ba3a6a30b751dfed332f8727a8e1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 03:03:24 +0200 Subject: [PATCH 0813/1120] chromium: Drop dependency on subversion. Versions older than 21 needed subversion in order to build. As the oldest version we support is 21, we no longer need this dependency. --- pkgs/applications/networking/browsers/chromium/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 84cdf556d02d..5949be2a4c80 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,8 +1,5 @@ { stdenv, getConfig, fetchurl, makeWrapper, which -# this is needed in order to build the versions older than 21.x -, subversion - # default dependencies , bzip2, flac, speex , libevent, expat, libjpeg @@ -73,14 +70,12 @@ let use_system_v8 = false; }; - needsSubversion = stdenv.lib.versionOlder sourceInfo.version "21.0.0.0"; - defaultDependencies = [ bzip2 flac speex libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib - ] ++ stdenv.lib.optional needsSubversion subversion; + ]; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; From c67d8bcabe33e7dd8effa25510f4aca3a2442ce1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 07:36:57 +0200 Subject: [PATCH 0814/1120] chromium: Don't use the sandbox patch on v21. The patch doesn't apply in version 22 and newer, because mode 1 sandboxes are connsidered "legacy" (well, apart from the fact that I'd personally prefer BPF anyway), for reasons I wasn't able to find, yet. But let's proceed on BPF integration and thus gain more insight on the exact reasons. --- pkgs/applications/networking/browsers/chromium/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5949be2a4c80..f9424f4d614a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -77,6 +77,10 @@ let xdg_utils yasm zlib ]; + needSeccompPatch = + stdenv.lib.versionOlder sourceInfo.version "22.0.0.0" + && !config.selinux; + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -108,7 +112,7 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = stdenv.lib.optional (!config.selinux) ./enable_seccomp.patch + patches = stdenv.lib.optional needSeccompPatch ./enable_seccomp.patch ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch; From c89a0d6c4f875fe4a3340b017b66057caec1ab6f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 26 Aug 2012 14:43:25 +0200 Subject: [PATCH 0815/1120] Add package: plowshare-git20120807 --- pkgs/tools/misc/plowshare/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/plowshare/default.nix diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix new file mode 100644 index 000000000000..0e7d688670fc --- /dev/null +++ b/pkgs/tools/misc/plowshare/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, bash }: + +let + + v = "20120807"; + +in stdenv.mkDerivation { + + name = "plowshare-git${v}"; + + src = fetchurl { + url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz"; + sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; + }; + + phases = [ "unpackPhase" "installPhase" "postInstallPhase" ]; + + installPhase = ''make PREFIX="$out" install''; + + postInstallPhase = '' + find "$out" -name "*.sh" -exec \ + sed -i "s@#!/bin/bash@#!${bash}/bin/bash@" '{}' \; + ''; + + meta = { + description = '' + A command-line download/upload tool for popular file sharing websites + ''; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 466be2abbacc..30d8410cad96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1295,6 +1295,8 @@ let plotutils = callPackage ../tools/graphics/plotutils { }; + plowshare = callPackage ../tools/misc/plowshare { }; + pngcrush = callPackage ../tools/graphics/pngcrush { }; pngnq = callPackage ../tools/graphics/pngnq { }; From 016b665402807c7c4f54622cce75fd94c13aa55e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 13:33:44 -0400 Subject: [PATCH 0816/1120] Default 'jdk' and 'jre' to openjdk and openjre, respectively, on supporting systems --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36ec708e8ca6..b09de3fe16ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2363,8 +2363,12 @@ let jreOnly = true; }; - jdk = if stdenv.isDarwin then openjdk else jdkdistro true false; - jre = jdkdistro false false; + jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjdk + else jdkdistro true false; + jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then openjre + else jdkdistro false false; jrePlugin = lowPrio (jdkdistro false true); From c03efbd8f9201c6c852b5f60016700ebdacea976 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:10:36 +0400 Subject: [PATCH 0817/1120] Fix libical Libical searched zoneinfo in /usr/share/zoneinfo, and failed to find it. This leads to, e.g., random Kontact freezes. --- .../development/libraries/libical/default.nix | 15 +++++---- .../libraries/libical/respect-env-tzdir.patch | 32 +++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/libical/respect-env-tzdir.patch diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 54dfc1aecc62..80f3a1b8e71f 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,10 +1,13 @@ -{stdenv, fetchurl, perl}: +{stdenv, fetchsvn, perl, cmake}: stdenv.mkDerivation rec { - name = "libical-0.48"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${name}.tar.gz"; - sha256 = "1w6znkh0xxhbcm717mbzfva9ycrqs2lajhng391i7pghaw3qprra"; + name = "libical-0.48-p20120623"; + src = fetchsvn { + url = "https://freeassociation.svn.sourceforge.net/svnroot/freeassociation/trunk/libical"; + rev = "1130"; + sha256 = "56caf19abdf44807fda75a67ef0886319551e53c4e4ece4da4fc862e34c64e1a"; }; - buildNativeInputs = [ perl ]; + buildNativeInputs = [ perl cmake ]; + + patches = [ ./respect-env-tzdir.patch ]; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch new file mode 100644 index 000000000000..12da8d41c7b5 --- /dev/null +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -0,0 +1,32 @@ +* Remove /usr/*/zoneinfo from the default search path +* Respect $TZDIR +diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c +index adf7598..d2fd5c8 100644 +--- a/src/libical/icaltz-util.c ++++ b/src/libical/icaltz-util.c +@@ -108,7 +108,7 @@ typedef struct + + static int r_pos [] = {1, 2, 3, -2, -1}; + +-static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; ++static char *search_paths [] = {"/etc/zoneinfo"}; + static char *zdir = NULL; + + #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) +@@ -195,6 +195,16 @@ set_zonedir (void) + const char *fname = ZONES_TAB_SYSTEM_FILENAME; + int i; + ++ const char *env_tzdir = strdup (getenv ("TZDIR")); ++ if (env_tzdir) { ++ sprintf (file_path, "%s/%s", env_tzdir, fname); ++ if (!access (file_path, F_OK|R_OK)) { ++ zdir = env_tzdir; ++ return; ++ } ++ free (env_tzdir); ++ } ++ + for (i = 0;i < NUM_SEARCH_PATHS; i++) { + sprintf (file_path, "%s/%s", search_paths [i], fname); + if (!access (file_path, F_OK|R_OK)) { From 1e3c42eb696815f644127fe4e88e0473879da7ae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:44:04 +0400 Subject: [PATCH 0818/1120] Libspectre: a couple of upstream patches (fix 2 crashes) --- ...-documents-containing-an-invalid-Pag.patch | 29 ++++++++++++++ ...llocate-at-least-1-page-in-doc-pages.patch | 38 +++++++++++++++++++ .../libraries/libspectre/default.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch create 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 new file mode 100644 index 000000000000..3e232ee5ac50 --- /dev/null +++ b/pkgs/development/libraries/libspectre/0001-Fix-a-crash-with-documents-containing-an-invalid-Pag.patch @@ -0,0 +1,29 @@ +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 new file mode 100644 index 000000000000..09ab9e11c16f --- /dev/null +++ b/pkgs/development/libraries/libspectre/0002-Allocate-at-least-1-page-in-doc-pages.patch @@ -0,0 +1,38 @@ +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 0be6ac5f4efe..379727aec5c9 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { ghostscript ]; + 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 bee287597a31d330e7d9669a9aa6967beb8d642b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:42:41 +0400 Subject: [PATCH 0819/1120] Fix gnokii URL --- pkgs/tools/misc/gnokii/src-for-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix index 360f98de7584..3ea6f1a3b667 100644 --- a/pkgs/tools/misc/gnokii/src-for-default.nix +++ b/pkgs/tools/misc/gnokii/src-for-default.nix @@ -2,7 +2,7 @@ rec { version="0.6.30"; name="gnokii-0.6.30"; hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p"; - url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz"; + url="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${version}.tar.gz"; advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz"; From a4d13df801bd81f2dc86246dc4ef26ebc646c896 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:59:03 +0400 Subject: [PATCH 0820/1120] Add qoauth --- pkgs/development/libraries/qoauth/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/qoauth/default.nix diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix new file mode 100644 index 000000000000..f93e4479e71e --- /dev/null +++ b/pkgs/development/libraries/qoauth/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, qt4, qca2 }: + +stdenv.mkDerivation { + name = "qoauth-1.0.1"; + + src = fetchurl { + url = https://github.com/ayoy/qoauth/tarball/v1.0.1; + name = "qoauth-1.0.1.tar.gz"; + sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp"; + }; + + configurePhase = "qmake PREFIX=$prefix"; + patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro"; + + buildInputs = [ qt4 qca2 ]; + + NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; + NIX_LDFLAGS = "-lqca"; + + meta = { + description = "Qt library for OAuth authentication"; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36ec708e8ca6..0ed730b5a428 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4651,6 +4651,8 @@ let qjson = callPackage ../development/libraries/qjson { }; + qoauth = callPackage ../development/libraries/qoauth { }; + qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; }; From 497c364f7c4b31823d7450a7c54bd04860d7b6d0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:59:38 +0400 Subject: [PATCH 0821/1120] SDO-0.10.0 --- pkgs/data/misc/shared-desktop-ontologies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 39fcc6d1a68e..23a800f6ae0f 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.8.1"; + name = "shared-desktop-ontologies-0.10.0"; src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; - sha256 = "0w6rhhfjl5r6gv2jw3nc1sj5l4fxz4s1wv0iclcrak3wa5vyy6h3"; + sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di"; }; buildInputs = [ cmake ]; From ce5d5568a43c0aaaf517b1c09ee4cbe94810737e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:14:21 +0400 Subject: [PATCH 0822/1120] Soprano-2.8.0 --- pkgs/development/libraries/soprano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 54e40efe65e8..7705ee1893d9 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.7.6"; + name = "soprano-2.8.0"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "0cnprxc8wykl96aphsh2d3711h7cals7gnibbxpsmsqyqbnhbp98"; + sha256 = "1israssklrb4mhx2dgkfnabh21ll1jyis1c5c42rc9gi23mkb7ah"; }; patches = [ ./find-virtuoso.patch ]; From 40078e2f909232d72b0ba53b009497bf044262b0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 22:38:15 +0400 Subject: [PATCH 0823/1120] xf86-input-wacom-0.16.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 98446c708671..4bcf82a70527 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl -, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender +, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, libXinerama , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.11.1"; + name = "xf86-input-wacom-0.16.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1jmnrkf89a3jjbpn17gyndlv9lqc0n7qwyi22hraxypq213gjclx"; + sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii"; }; - buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender + buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender libXinerama ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' From 77da73a72b2da15269924f9bf390e6b195e538be Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 22:38:50 +0400 Subject: [PATCH 0824/1120] akonadi-1.7.2 --- pkgs/desktops/kde-4.8/support/akonadi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix index db0608ead3fc..b939eb19b5e4 100644 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: stdenv.mkDerivation rec { - name = "akonadi-1.7.0"; + name = "akonadi-1.7.2"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "105mjr6n1g6kl0djp2l8jr8b7j4s9gy2ls43g1wf3py1hf6j5fdz"; + sha256 = "07rbhc8aa3d896j2r64ljv3amd6s4xhlbgq7kx99m1f68yl1fwjb"; }; buildInputs = [ qt4 soprano libxslt boost ]; From 9a8b0b644b8b53c7790dd67991e52808dc3cd8ac Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 15:43:02 -0400 Subject: [PATCH 0825/1120] Add semver node package --- pkgs/top-level/node-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index c16c53d4a05f..b98f35fb2d7f 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -17,6 +17,19 @@ let self = { ]; }; + + "semver" = self."semver-1.0.14"; + + "semver-1.0.14" = self.buildNodePackage rec { + name = "semver-1.0.14"; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/${name}.tgz"; + sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; + }; + deps = [ + + ]; + }; }; in self From a94e8d275626d34435d10832a6184625144862fe Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:02:04 -0400 Subject: [PATCH 0826/1120] Add npm2nix as a nodePackage --- .../tools/node/npm2nix/default.nix | 26 ------------------- pkgs/top-level/all-packages.nix | 4 --- pkgs/top-level/node-packages.nix | 14 ++++++++++ 3 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/tools/node/npm2nix/default.nix diff --git a/pkgs/development/tools/node/npm2nix/default.nix b/pkgs/development/tools/node/npm2nix/default.nix deleted file mode 100644 index 8300a7e2bc33..000000000000 --- a/pkgs/development/tools/node/npm2nix/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, coffeescript }: - -let version = "0.1"; in - -stdenv.mkDerivation rec { - name = "npm2nix-${version}"; - - src = fetchurl { - url = "https://bitbucket.org/shlevy/npm2nix/get/${version}.tar.bz2"; - sha256 = "14rfs114k02yc9gx0bcjqy67f9cqgkrr1dccwlzl09q9b6qs1k3k"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/bin - sed 's|#!/usr/bin/env coffee|#!${coffeescript}/bin/coffee|' npm2nix.coffee \ - > $out/bin/npm2nix - chmod +x $out/bin/npm2nix - ''; - - meta = { - description = "A tool to generate nix expressions from npm packages"; - maintainer = stdenv.lib.maintainers.shlevy; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed730b5a428..ba29ea89a8ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -986,10 +986,6 @@ let inherit pkgs stdenv nodejs fetchurl; }); - npm2nix = callPackage ../development/tools/node/npm2nix { - coffeescript = nodePackages."coffee-script"; - }; - ldns = callPackage ../development/libraries/ldns { }; lftp = callPackage ../tools/networking/lftp { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index b98f35fb2d7f..99442b12c239 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -30,6 +30,20 @@ let self = { ]; }; + + "npm2nix" = self."npm2nix-0.1.1"; + + "npm2nix-0.1.1" = self.buildNodePackage rec { + name = "npm2nix-0.1.1"; + src = fetchurl { + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.1.tar.gz; + sha256 = "0rrvlavx6myl8792y2xfz79a3khww3yak81by1f5axm0g1mcwiw7"; + name = "${name}.tgz"; + }; + deps = [ + self."semver-1.0.14" + ]; + }; }; in self From ddb3f8c34e3e909b31a0ac62538e993bc7636ec1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:11:29 -0400 Subject: [PATCH 0827/1120] Add npm2nix 0.1.2 --- pkgs/top-level/node-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 99442b12c239..bddb3f3edb79 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -18,9 +18,9 @@ let self = { ]; }; - "semver" = self."semver-1.0.14"; + "semver" = self."semver-1"; - "semver-1.0.14" = self.buildNodePackage rec { + "semver-1" = self.buildNodePackage rec { name = "semver-1.0.14"; src = fetchurl { url = "http://registry.npmjs.org/semver/-/${name}.tgz"; @@ -31,17 +31,17 @@ let self = { ]; }; - "npm2nix" = self."npm2nix-0.1.1"; + "npm2nix" = self."npm2nix-0.1.2"; - "npm2nix-0.1.1" = self.buildNodePackage rec { - name = "npm2nix-0.1.1"; + "npm2nix-0.1.2" = self.buildNodePackage rec { + name = "npm2nix-0.1.2"; src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.1.tar.gz; - sha256 = "0rrvlavx6myl8792y2xfz79a3khww3yak81by1f5axm0g1mcwiw7"; + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; + sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; name = "${name}.tgz"; }; deps = [ - self."semver-1.0.14" + self."semver-1" ]; }; }; From 7e24bde3d9d90c5fbd3fe527e5643144d4285f61 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:18:03 -0400 Subject: [PATCH 0828/1120] Add node-gyp --- pkgs/top-level/node-packages.nix | 311 +++++++++++++++++++++++++++++++ 1 file changed, 311 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index bddb3f3edb79..0ab4306cca07 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -44,6 +44,317 @@ let self = { self."semver-1" ]; }; + + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "nopt" = self."nopt-2"; + + "nopt-2" = self.buildNodePackage rec { + name = "nopt-2.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; + sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + }; + deps = [ + self."abbrev-1" + ]; + }; + + "graceful-fs" = self."graceful-fs-1"; + + "graceful-fs-1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-~0.1.13"; + + "fstream-~0.1.13" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "npmlog" = self."npmlog-0"; + + "npmlog-0" = self.buildNodePackage rec { + name = "npmlog-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; + sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + }; + deps = [ + self."ansi-~0.1.2" + ]; + }; + + "osenv" = self."osenv-0"; + + "osenv-0" = self.buildNodePackage rec { + name = "osenv-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; + sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + }; + deps = [ + + ]; + }; + + "node-gyp" = self."node-gyp-*"; + + "node-gyp-*" = self.buildNodePackage rec { + name = "node-gyp-0.6.8"; + src = fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; + sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; + }; + deps = [ + self."glob-3" + self."graceful-fs-1" + self."fstream-~0.1.13" + self."minimatch-0.2" + self."mkdirp-0.3" + self."nopt-2" + self."npmlog-0" + self."osenv-0" + self."request-2.9" + self."rimraf-2" + self."semver-1" + self."tar-~0.1.12" + self."which-1" + ]; + }; + + "rimraf" = self."rimraf-2"; + + "rimraf-2" = self.buildNodePackage rec { + name = "rimraf-2.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; + sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; + }; + deps = [ + self."graceful-fs-~1.1" + ]; + }; + + "minimatch" = self."minimatch-0.2"; + + "minimatch-0.2" = self.buildNodePackage rec { + name = "minimatch-0.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; + sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; + }; + deps = [ + self."lru-cache-~2.0.0" + ]; + }; + + "glob" = self."glob-3"; + + "glob-3" = self.buildNodePackage rec { + name = "glob-3.1.12"; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/${name}.tgz"; + sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; + }; + deps = [ + self."minimatch-0.2" + self."graceful-fs-~1.1.2" + self."inherits-1" + ]; + }; + + "tar" = self."tar-~0.1.12"; + + "tar-~0.1.12" = self.buildNodePackage rec { + name = "tar-0.1.13"; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/${name}.tgz"; + sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; + }; + deps = [ + self."inherits-1.x" + self."block-stream" + self."fstream-~0.1.8" + ]; + }; + + "which" = self."which-1"; + + "which-1" = self.buildNodePackage rec { + name = "which-1.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/which/-/${name}.tgz"; + sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + }; + deps = [ + + ]; + }; + + "abbrev" = self."abbrev-1"; + + "abbrev-1" = self.buildNodePackage rec { + name = "abbrev-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; + sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2"; + }; + deps = [ + + ]; + }; + + "graceful-fs-~1.1.2" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + + "request" = self."request-2.9"; + + "request-2.9" = self.buildNodePackage rec { + name = "request-2.9.203"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + }; + deps = [ + + ]; + }; + + "inherits-~1.0.0" = self.buildNodePackage rec { + name = "inherits-1.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + }; + deps = [ + + ]; + }; + + "ansi" = self."ansi-~0.1.2"; + + "ansi-~0.1.2" = self.buildNodePackage rec { + name = "ansi-0.1.2"; + src = fetchurl { + url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; + sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; + }; + deps = [ + + ]; + }; + + "block-stream" = self."block-stream-*"; + + "block-stream-*" = self.buildNodePackage rec { + name = "block-stream-0.0.6"; + src = fetchurl { + url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; + sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; + }; + deps = [ + self."inherits-~1.0.0" + ]; + }; + + "lru-cache" = self."lru-cache-~2.0.0"; + + "lru-cache-~2.0.0" = self.buildNodePackage rec { + name = "lru-cache-2.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; + sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + }; + deps = [ + + ]; + }; + + "graceful-fs-~1.1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + + "inherits" = self."inherits-1"; + + "inherits-1" = self.buildNodePackage rec { + name = "inherits-1.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + }; + deps = [ + + ]; + }; + + "inherits-1.x" = self.buildNodePackage rec { + name = "inherits-1.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + }; + deps = [ + + ]; + }; + + "fstream-~0.1.8" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; }; in self From bf007753d1333ed82a578038cc9cfc501ba91625 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 16:00:18 +0200 Subject: [PATCH 0829/1120] go: make it accept armv5tel It doesn't build though, due to some problems fixed in go trunk. But I failed to port them over to 1.0.2. --- pkgs/development/compilers/go/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 459ce6310bf0..041544404ca2 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -3,6 +3,7 @@ let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; in stdenv.mkDerivation { @@ -28,6 +29,7 @@ stdenv.mkDerivation { # !!! substituteInPlace does not seems to be effective. sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ @@ -49,7 +51,9 @@ stdenv.mkDerivation { GOOS = "linux"; GOARCH = if (stdenv.system == "i686-linux") then "386" else if (stdenv.system == "x86_64-linux") then "amd64" + else if (stdenv.system == "armv5tel-linux") then "arm" else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; installPhase = '' mkdir -p "$out/bin" From df35189985bcd1e53513d48ac0956ec525b4f24e Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 16:38:21 +0200 Subject: [PATCH 0830/1120] go: Removing an out of date comment --- pkgs/development/compilers/go/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 041544404ca2..0ced1da95d4c 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -9,7 +9,6 @@ in stdenv.mkDerivation { name = "go-1.0.2"; - # No tarball yet. src = fetchurl { url = http://go.googlecode.com/files/go1.0.2.src.tar.gz; sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h"; From ba47bf725813e205ce1e28bf20cecdfdd425d48c Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 17:10:23 +0200 Subject: [PATCH 0831/1120] fetchhg: removing the nix dependency I don't think it's required for anything. I tried once without it, and it worked equally fine. --- pkgs/build-support/fetchhg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index bc27516f46d5..537867f215ba 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "hg-archive" + (if (name != null) then "-${name}" else ""); builder = ./builder.sh; - buildInputs = [mercurial nix]; + buildInputs = [mercurial]; # Nix <= 0.7 compatibility. id = md5; From e5bf4de6b650a3a3a39a6a646391a223aec7da9f Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 26 Aug 2012 23:15:02 +0200 Subject: [PATCH 0832/1120] go: improving the expression so it works if overriden by hg src Users might want to override the 'src' and 'name' of go from 'hg'. I make the expression compatible with that. Aside, I also set GOARM in the wrapper for it to build programs fine on armv5tel by default. --- pkgs/development/compilers/go/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 0ced1da95d4c..1d9765539bfc 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation { ''; prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash # !!! substituteInPlace does not seems to be effective. sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c @@ -67,7 +73,8 @@ stdenv.mkDerivation { # libraries. for a in go gofmt godoc; do wrapProgram "$out/bin/$a" \ - --set "GOROOT" "$out/share/go/" + --set "GOROOT" $out/share/go \ + ${if (stdenv.system == "armv5tel-linux") then "--set GOARM $GOARM" else ""} done # Copy the emacs configuration for Go files. From d5c2b35b82b7c2c22bcc7d85c4d2f1fe0b810b3c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 Aug 2012 06:45:32 +0200 Subject: [PATCH 0833/1120] chromium: Re-enable legacy sandbox for version 22. This enables legacy seccomp sandbox by default even on chromium 22, because the BPF sandbox is still work in progress, please see: http://crbug.com/139872 http://crbug.com/130662 Because the BPF seccomp sandbox is used in case the legacy seccomp mode initialization fails, we might need to patch this again, as soon as the BPF sandbox is fully implemented to fall back to legacy seccomp and use BPF by default. We now have two patches for "default to seccomp" - one for Chromium 21 and one for 22 or higher. --- .../networking/browsers/chromium/default.nix | 8 ++++---- .../browsers/chromium/enable_seccomp22.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f9424f4d614a..e9e9961d1cd0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -77,9 +77,9 @@ let xdg_utils yasm zlib ]; - needSeccompPatch = - stdenv.lib.versionOlder sourceInfo.version "22.0.0.0" - && !config.selinux; + seccompPatch = let + pre22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; + in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = stdenv.lib.optional needSeccompPatch ./enable_seccomp.patch + patches = stdenv.lib.optional (!config.selinux) seccompPatch ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch; diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch new file mode 100644 index 000000000000..f947d796f186 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch @@ -0,0 +1,20 @@ +diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc +index d4618e5..108f846 100644 +--- a/content/common/sandbox_linux.cc ++++ b/content/common/sandbox_linux.cc +@@ -38,15 +38,9 @@ void LogSandboxStarted(const std::string& sandbox_name) { + // Implement the command line enabling logic for seccomp-legacy. + bool IsSeccompLegacyDesired() { + #if defined(SECCOMP_SANDBOX) +-#if defined(NDEBUG) +- // Off by default; allow turning on with a switch. +- return CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kEnableSeccompSandbox); +-#else + // On by default; allow turning off with a switch. + return !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableSeccompSandbox); +-#endif // NDEBUG + #endif // SECCOMP_SANDBOX + return false; + } From 48c5ad011de914036c184d1ec0bd502482981e1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:29:11 +0200 Subject: [PATCH 0834/1120] haskell-test-framework: update to version 0.6.1 --- .../libraries/haskell/test-framework/0.6.nix | 22 ------------------- .../test-framework/{0.5.nix => default.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/test-framework/0.6.nix rename pkgs/development/libraries/haskell/test-framework/{0.5.nix => default.nix} (88%) diff --git a/pkgs/development/libraries/haskell/test-framework/0.6.nix b/pkgs/development/libraries/haskell/test-framework/0.6.nix deleted file mode 100644 index 940548945687..000000000000 --- a/pkgs/development/libraries/haskell/test-framework/0.6.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, ansiTerminal, ansiWlPprint, extensibleExceptions, hostname -, random, regexPosix, time, xml -}: - -cabal.mkDerivation (self: { - pname = "test-framework"; - version = "0.6"; - sha256 = "1ah5q3fwd5dmh2zb4rphdpz7hs39m4g1khvxjjwfzwyd9pxiz723"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - ansiTerminal ansiWlPprint extensibleExceptions hostname random - regexPosix time xml - ]; - meta = { - homepage = "http://batterseapower.github.com/test-framework/"; - description = "Framework for running and organising tests, with HUnit and QuickCheck support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/test-framework/0.5.nix b/pkgs/development/libraries/haskell/test-framework/default.nix similarity index 88% rename from pkgs/development/libraries/haskell/test-framework/0.5.nix rename to pkgs/development/libraries/haskell/test-framework/default.nix index d69bd131774a..14fb53a5a09e 100644 --- a/pkgs/development/libraries/haskell/test-framework/0.5.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.5"; - sha256 = "19zm9xdhyjhqi2ryd2gkwi7m92s88mmiw1b6b91hjfhfw3c1qlzz"; + version = "0.6.1"; + sha256 = "1rx2c3yckw50vrydswb61ngvp27yxcimm5q6jcyqpn16fpkvxijw"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f2d6e28de4b5..f9f942d6a18e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1456,9 +1456,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminfo = callPackage ../development/libraries/haskell/terminfo {}; - testFramework_0_6 = callPackage ../development/libraries/haskell/test-framework/0.6.nix {}; - testFramework_0_5 = callPackage ../development/libraries/haskell/test-framework/0.5.nix {}; - testFramework = self.testFramework_0_6; + testFramework = callPackage ../development/libraries/haskell/test-framework {}; testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {}; From 430e7454e9e89d0d1ff231309808b380ba35c50f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:29:36 +0200 Subject: [PATCH 0835/1120] haskell-mathblog: drop obsolete package; it doesn't build with current versions of GHC --- pkgs/applications/misc/mathblog/default.nix | 21 --------------------- pkgs/top-level/haskell-packages.nix | 7 ------- 2 files changed, 28 deletions(-) delete mode 100644 pkgs/applications/misc/mathblog/default.nix diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix deleted file mode 100644 index e5ed53a56a03..000000000000 --- a/pkgs/applications/misc/mathblog/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc -, pandocTypes, SHA, testFramework, testFrameworkHunit, time -}: - -cabal.mkDerivation (self: { - pname = "mathblog"; - version = "0.5"; - sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA - testFramework testFrameworkHunit time - ]; - meta = { - description = "A program for creating and managing a static weblog with LaTeX math and function graphs"; - 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 f9f942d6a18e..c2e457bfe456 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1758,13 +1758,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck = self.QuickCheck2; }; - mathblog = callPackage ../applications/misc/mathblog { - testFramework = self.testFramework_0_5; - testFrameworkHunit = self.testFrameworkHunit.override { - testFramework = self.testFramework_0_5; - }; - }; - xmobar = callPackage ../applications/misc/xmobar { stm = self.stm_2_3; }; From 8ff755c5f395ee3f69bcbf72dd56566d3ee95847 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0836/1120] haskell-CouchDB: update to version 1.2 --- pkgs/development/libraries/haskell/CouchDB/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 3642d402615c..705a0a5fdea4 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,10 +1,10 @@ -{ cabal, HTTP, json, mtl, network }: +{ cabal, HTTP, json, mtl, network, utf8String }: cabal.mkDerivation (self: { pname = "CouchDB"; - version = "0.10.1"; - sha256 = "1ny62ab0sjrkh7mpxj0ahqrv7c8dh0n5s1g8xl0mq3yiwlrjdsim"; - buildDepends = [ HTTP json mtl network ]; + version = "1.2"; + sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; + buildDepends = [ HTTP json mtl network utf8String ]; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; From 322b47e7209d7136e4c23b99db7da8e54bf11cd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0837/1120] haskell-MonadRandom: update to version 0.1.8 --- pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index da343a527ce6..d8c492f23b61 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.7"; - sha256 = "0y4fsb3j0babq388rw3y1kbxbjz6plfgbg4g1y27hdf7jf5c8x33"; + version = "0.1.8"; + sha256 = "1zin7qyv86gza60q6a6r8az2dwxm80wh23idvmjapgbjn2kfvfim"; buildDepends = [ mtl random ]; meta = { description = "Random-number generation monad"; From e40f7b88e9444a7a186599d4c161aea13586a8ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0838/1120] haskell-blaze-textual: update to version 0.2.0.8 --- pkgs/development/libraries/haskell/blaze-textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index f673f708707d..65f39c8cc081 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-textual"; - version = "0.2.0.6"; - sha256 = "1699fj9zig6ids9bdjn5v0gqhnyx5dkzi542gkx1gs8943c94737"; + version = "0.2.0.8"; + sha256 = "0zzqh53ywzz8ss58glp3i8is8gry5yqzvdjw4xh95fbbzcz4cgc7"; buildDepends = [ blazeBuilder text time vector ]; meta = { homepage = "http://github.com/bos/blaze-textual"; From 6596fdf4d7434c485fe7de4aa2ea51c521e123f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0839/1120] haskell-derive: update to version 2.5.11 --- pkgs/development/libraries/haskell/derive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index ff65518e7f9b..906c51fc0722 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.10"; - sha256 = "0r5qcchs6kw080pw95r442yk1ld48lk2imn7apk0ibkx53i4mqls"; + version = "2.5.11"; + sha256 = "0934k49kpp32wffpvpk2sia7frd9ik56k6ghy6d6j31cabxf9m8r"; isLibrary = true; isExecutable = true; buildDepends = [ From d2b775d31c8651bb93841cf491f108cc3333f937 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0840/1120] haskell-double-conversion: update to version 0.2.0.5 --- .../libraries/haskell/double-conversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 82a1e4d4c39b..5d92b8178c18 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "double-conversion"; - version = "0.2.0.4"; - sha256 = "00rb8n2ky20ah9ry398jagi9gb0gz40yjfalh35cpckmg30z199x"; + version = "0.2.0.5"; + sha256 = "1z23a8sfnq5lady8n2kcina9a7df8lmsliscf85x84dxkd3a1ahf"; buildDepends = [ text ]; meta = { homepage = "https://github.com/bos/double-conversion"; From bba0b43d0ff712a34b542ecb4f69ac2c04a9bb65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0841/1120] haskell-fclabels: update to version 1.1.4.2 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 82a96856ab80..85fe25f7d188 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.4.1"; - sha256 = "09k601kijdflazmrxygwwd8lmxr9vx2bzc25qiwcc9id2rp43asm"; + version = "1.1.4.2"; + sha256 = "0abw6vfl5ff8d4cv5s3mfvzhylba5ajnvd5pgmx540i38lcq9wi6"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 3445b2cb0f97fead2ddfcc42130b94ca60ecca3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0842/1120] haskell-graphviz: update to version 2999.14.0.0 --- pkgs/development/libraries/haskell/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 77867472d661..4e6c7298b86f 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.13.0.3"; - sha256 = "0rwjlwfa3s1vgh5mwzwmzq4s153iq338zy7jqi0qyxcs52illqq8"; + version = "2999.14.0.0"; + sha256 = "1dnjw7r2zg2qhjxnmdryi0839ggrb3l3bpx8asfpr0bza70kjdf3"; buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; From 38dda82cc1035ab16737a2922ca624fae7509747 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0843/1120] haskell-largeword: update to version 1.0.3 --- pkgs/development/libraries/haskell/largeword/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 7f01336f281d..67159c2bcbf7 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "largeword"; - version = "1.0.2"; - sha256 = "0ylbl9rffhqw9ahasn23n00h7v5yqmghmqkrq446zdr72bq23hk2"; + version = "1.0.3"; + sha256 = "18b6nhq1cww4wdbrfq0cb828kncxzcsibgs5dbgxa66y6iw93vkg"; meta = { homepage = "http://trac.haskell.org/largeword/wiki"; description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required"; From 8782724875213c00ae6847500844eb2d9b8e2886 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0844/1120] haskell-reactive-banana-wx: update to version 0.7.0.0 --- .../libraries/haskell/reactive-banana-wx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index 702e3383d340..2d46992ddab4 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana-wx"; - version = "0.6.0.1"; - sha256 = "1i674jy8fwirq267vwwdyqa4whxfx3r689rxjbrh9hyicqwcrl24"; + version = "0.7.0.0"; + sha256 = "06qln09d57l084nvh1js3k6074vl8yzih5kwfpp43gsy8in2dspx"; isLibrary = true; isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; From 30637369188cd774f558fd8c57d5c71fa9e860f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0845/1120] haskell-reactive-banana: update to version 0.7.0.0 --- .../development/libraries/haskell/reactive-banana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 1c5cb92d47bd..98438bbb3d2d 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.6.0.0"; - sha256 = "1s0ymkqrjnzylxdwqfslf87g7sjqk135hnvgdkzy4dbvvpplq113"; + version = "0.7.0.0"; + sha256 = "0f25zr4l2v73yr3mww0ri9n0kq97sakd0mifvll0kmsh0cz124xz"; buildDepends = [ fclabels hashable QuickCheck transformers unorderedContainers vault ]; From 527dd9db069ce49233fe8e63b654f9ebbb7edc65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0846/1120] haskell-resource-pool: update to version 0.2.1.1 --- pkgs/development/libraries/haskell/resource-pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 7ed81b8d9867..77bc91051937 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resource-pool"; - version = "0.2.1.0"; - sha256 = "12akfi906l1nm7h3wvjkzl9bxn74dbv17xw2c1mqgl6sg470d587"; + version = "0.2.1.1"; + sha256 = "1ypyzy7mkmpab6rghsizrx6raam3l2acwxm56x7jmcv8s2algi1g"; buildDepends = [ hashable monadControl stm time transformers transformersBase vector ]; From da852fee50a105be6fafee787387ddc8001725a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:50 +0200 Subject: [PATCH 0847/1120] haskell-statistics: update to version 0.10.2.0 --- pkgs/development/libraries/haskell/statistics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index d977fabb92c8..de1fd4533ef4 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.1.0"; - sha256 = "0fnpwnhcwxjcm81b9daqdy07cw5qgqa7m2bj6fxxwicpvawcyabc"; + version = "0.10.2.0"; + sha256 = "1sv0fhbi52maq9c4ni109m0051a1nndi3ncz9v29mkxqzyckrp9x"; buildDepends = [ deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms From 8cb967fb9582ca7be20fda8e05c90e25e53fe6d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:50 +0200 Subject: [PATCH 0848/1120] haskell-unix-compat: update to version 0.3.0.2 --- pkgs/development/libraries/haskell/unix-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 85e6bb815337..df329ba1d902 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.3.0.1"; - sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; + version = "0.3.0.2"; + sha256 = "0rikix2l8d0n948pzri2rdis9k5q0m73h7vxsxjz1vh24ryjj59f"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; From 2001983746b0552fa8905288d685eb448a07695a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 27 Aug 2012 15:17:02 +0400 Subject: [PATCH 0849/1120] dxflib: add the DXF format support library --- pkgs/development/libraries/dxflib/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/dxflib/default.nix diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix new file mode 100644 index 000000000000..f9c58857731c --- /dev/null +++ b/pkgs/development/libraries/dxflib/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "2.5.0.0-1"; + name = "dxflib-${version}"; + src = fetchurl { + url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; + sha256 = "20ad9991eec6b0f7a3cc7c500c044481a32110cdc01b65efa7b20d5ff9caefa9"; + }; + + meta = { + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = stdenv.lib.platforms.linux; + description = ''DXF file format library''; + }; +} + From 098b0c6a1d163c129d7850ae61e72fc84ddf4de1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 27 Aug 2012 15:41:49 +0400 Subject: [PATCH 0850/1120] Rapcad: add Rapcad is a tool similar to OpenSCAD but with a richer language. --- pkgs/applications/graphics/rapcad/default.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/applications/graphics/rapcad/default.nix diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix new file mode 100644 index 000000000000..e83824bd685a --- /dev/null +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, qt4, cgal, boost, gmp, mpfr, flex, bison, dxflib}: + +stdenv.mkDerivation rec { + version = "0.8.0"; + name = "rapcad-${version}"; + + src = fetchgit { + url = "git://git.rapcad.org/rapcad"; + rev = "refs/tags/v${version}"; + sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7"; + }; + + buildInputs = [qt4 cgal boost gmp mpfr flex bison dxflib]; + + configurePhase = '' + qmake; + sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile) + ''; + + meta = { + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [raskin]; + platforms = stdenv.lib.platforms.linux; + description = ''Constructive solid geometry package''; + }; +} From 289d7a5cfa7518a730260e7a92a0507398acd432 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 27 Aug 2012 15:49:33 +0400 Subject: [PATCH 0851/1120] Fix typo --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba29ea89a8ce..31cbe85624da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3434,6 +3434,8 @@ let dragonegg = callPackage ../development/compilers/llvm/dragonegg.nix { }; + dxflib = callPackage ../development/libraries/dxflib {}; + eigen = callPackage ../development/libraries/eigen {}; enchant = callPackage ../development/libraries/enchant { }; @@ -7489,6 +7491,8 @@ let fltk = fltk13; }; + rapcad = callPackage ../applications/graphics/rapcad {}; + rapidsvn = callPackage ../applications/version-management/rapidsvn { }; ratpoison = callPackage ../applications/window-managers/ratpoison { }; From dc4cfe89ff69cd243ef2d8e83e78c3b0a297317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 27 Aug 2012 18:16:06 +0200 Subject: [PATCH 0852/1120] emacs: Update to 24.2. --- pkgs/applications/editors/emacs-24/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 388972abd018..82238a55d1cc 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.1"; + name = "emacs-24.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c"; + sha256 = "13wbjfjmz13qpjwssy44nw2230lllmkkgjsy0rqfm6am2cf87n3k"; }; buildInputs = From f4bc57febac5150a385165c6a9df054482f669ba Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Aug 2012 12:41:13 -0400 Subject: [PATCH 0853/1120] openjdk: passthru the architecture attribute like oracle jdk6 does. --- pkgs/development/compilers/openjdk/default.nix | 17 +++++++++++++++++ .../compilers/openjdk/make-bootstrap.nix | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 5f5148911ec2..f243baab5919 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -21,6 +21,21 @@ , jreOnly ? false }: +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "openjdk requires i686-linux or x86_64 linux"; + +in + stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7b127"; @@ -137,5 +152,7 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; + + passthru = { inherit architecture; }; } diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index aa5b8ad39f56..090a1479741a 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -1,6 +1,6 @@ { runCommand, openjdk, nukeReferences }: -let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in +let arch = openjdk.architecture; in runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' mkdir -p openjdk-bootstrap/bin From faf6ad8428e093e7a45877f4ec73217b7f39cd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Aug 2012 19:09:41 +0200 Subject: [PATCH 0854/1120] espeak: update to 1.46.02 --- pkgs/applications/audio/espeak/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e86177bb53c8..e1cf5fee1cc7 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip, portaudio }: stdenv.mkDerivation { - name = "espeak-1.44.03"; + name = "espeak-1.46.02"; src = fetchurl { - url = mirror://sourceforge/espeak/espeak-1.44.03-source.zip; - sha256 = "0lnv89xmsq3bax0qpabd0z2adaag7mdl973bkw3gdszidafmfyx4"; + url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip; + sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg"; }; buildInputs = [ unzip portaudio ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { configurePhase = '' cd src - makeFlags="PREFIX=$out" + makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" ''; meta = { From 395718e927029cf18f77e4a63970890eb8a6931b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 12:22:41 -0400 Subject: [PATCH 0855/1120] Create /dev/random and /dev/urandom in VMs WWW::Curl needs this to prevent "Fatal: no entropy gathering module detected". --- pkgs/build-support/vm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 777cc72aa0b2..9b1c36a788d7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -73,9 +73,11 @@ rec { createDeviceNodes = dev: '' - mknod ${dev}/null c 1 3 - mknod ${dev}/zero c 1 5 - mknod ${dev}/tty c 5 0 + mknod ${dev}/null c 1 3 + mknod ${dev}/zero c 1 5 + mknod ${dev}/random c 1 8 + mknod ${dev}/urandom c 1 9 + mknod ${dev}/tty c 5 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR ''; From bacc6ab790cd05c7fa1360b87be321602e87a69d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:39:13 -0400 Subject: [PATCH 0856/1120] Remove trailing whitespace --- pkgs/build-support/vm/deb/deb-closure.pl | 11 +- pkgs/build-support/vm/default.nix | 138 +++++++++++------------ 2 files changed, 74 insertions(+), 75 deletions(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index 5e4ea54c43f8..f5b764783b43 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -67,7 +67,7 @@ sub closePackage { my $pkgName = shift; print STDERR ">>> $pkgName\n"; my $cdata = $packages{$pkgName}; - + if (!defined $cdata) { die "unknown (virtual) package $pkgName" unless defined $provides{$pkgName}; @@ -75,7 +75,7 @@ sub closePackage { $pkgName = $provides{$pkgName}; $cdata = $packages{$pkgName}; } - + die "unknown package $pkgName" unless defined $cdata; return if defined $donePkgs{$pkgName}; $donePkgs{$pkgName} = 1; @@ -85,9 +85,9 @@ sub closePackage { $provides{$name} = $cdata->{Package}; } } - + my @depNames = (); - + if (defined $cdata->{Depends}) { print STDERR " $pkgName: $cdata->{Depends}\n"; my $deps = Dpkg::Deps::parse($cdata->{Depends}); @@ -141,7 +141,7 @@ foreach my $pkgName (@order) { my $origName = basename $cdata->{Filename}; my $cleanedName = $origName; $cleanedName =~ s/~//g; - + print " (fetchurl {\n"; print " url = $urlPrefix/$cdata->{Filename};\n"; print " sha256 = \"$cdata->{SHA256}\";\n"; @@ -165,4 +165,3 @@ if ($newComponent != 1) { print STDERR "argh: ", keys %forward, "\n"; exit 1; } - diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9b1c36a788d7..5ec551fc718d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -34,7 +34,7 @@ rec { '' mkdir -p $out/bin mkdir -p $out/lib - + # Copy what we need from Glibc. cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib @@ -60,7 +60,7 @@ rec { cp ${module_init_tools}/sbin/insmod $out/bin/insmod cp ${nettools}/sbin/ifconfig $out/bin cp ${sysvinit}/sbin/halt $out/bin - + # Run patchelf to make the programs refer to the copied libraries. for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done @@ -70,7 +70,7 @@ rec { done ''; # */ - + createDeviceNodes = dev: '' mknod ${dev}/null c 1 3 @@ -82,7 +82,7 @@ rec { mknod ${dev}/${hd} b $MAJOR $MINOR ''; - + stage1Init = writeScript "vm-run-stage1" '' #! ${initrdUtils}/bin/bash -e echo START @@ -124,7 +124,7 @@ rec { mount -t tmpfs none /dev ${createDeviceNodes "/dev"} - + ifconfig eth0 up 10.0.2.15 mkdir /fs @@ -157,7 +157,7 @@ rec { mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab - + echo "Now running: $command" test -n "$command" @@ -171,7 +171,7 @@ rec { halt -d -p -f ''; - + initrd = makeInitrd { contents = [ { object = stage1Init; @@ -180,11 +180,11 @@ rec { ]; }; - + stage2Init = writeScript "vm-run-stage2" '' #! ${bash}/bin/sh source /tmp/xchg/saved-env - + export NIX_STORE=/nix/store export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp @@ -288,12 +288,12 @@ rec { chmod +x ./run-vm source ./run-vm - + if ! test -e xchg/in-vm-exit; then echo "Virtual machine didn't produce an exit code." exit 1 fi - + eval "$postVM" exit $(cat xchg/in-vm-exit) @@ -345,7 +345,7 @@ rec { If the build fails and Nix is run with the `-K' option, a script `run-vm' will be left behind in the temporary build directory that allows you to boot into the VM and debug it interactively. */ - + runInLinuxVM = drv: lib.overrideDerivation drv (attrs: { requiredSystemFeatures = [ "kvm" ]; builder = "${bash}/bin/sh"; @@ -355,7 +355,7 @@ rec { QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; }); - + extractFs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -381,7 +381,7 @@ rec { ''; }); - + extractMTDfs = {file, fs ? null} : with pkgs; runInLinuxVM ( stdenv.mkDerivation { @@ -408,7 +408,7 @@ rec { ''; }); - + qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ ${kvm}/bin/qemu-kvm \ @@ -417,7 +417,7 @@ rec { $QEMU_OPTS ''; - + /* Run a command in an x86 virtual machine image containing an arbitrary OS. The VM should be configured to do the following: @@ -462,7 +462,7 @@ rec { the Nix store, but using the tools provided by /bin, /usr/bin etc. from the specified filesystem image, which typically is a filesystem containing a non-NixOS Linux distribution. */ - + runInLinuxImage = attrs: runInLinuxVM (attrs // { mountDisk = true; @@ -493,12 +493,12 @@ rec { /* Create a filesystem image of the specified size and fill it with a set of RPM packages. */ - + fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" , runScripts ? true, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name preInstall postInstall rpms; memSize = 512; @@ -508,7 +508,7 @@ rec { ${createRootFS} chroot=$(type -tP chroot) - + echo "unpacking RPMs..." for i in $rpms; do echo "$i..." @@ -527,19 +527,19 @@ rec { mkdir -p /mnt/nix/store ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store ${utillinux}/bin/mount -o bind /tmp /mnt/tmp - + echo "installing RPMs..." PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ rpm -iv ${if runScripts then "" else "--noscripts"} $rpms echo "running post-install script..." eval "$postInstall" - + rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store - ${utillinux}/bin/umount /mnt/tmp - ${utillinux}/bin/umount /mnt + ${utillinux}/bin/umount /mnt/nix/store + ${utillinux}/bin/umount /mnt/tmp + ${utillinux}/bin/umount /mnt ''; passthru = { inherit fullName; }; @@ -548,7 +548,7 @@ rec { /* Generate a script that can be used to run an interactive session in the given image. */ - + makeImageTestScript = image: writeScript "image-test" '' #! ${bash}/bin/sh if test -z "$1"; then @@ -573,7 +573,7 @@ rec { /* Build RPM packages from the tarball `src' in the Linux distribution installed in the filesystem `diskImage'. The tarball must contain an RPM specfile. */ - + buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; @@ -586,7 +586,7 @@ rec { done fi ''; - + sysInfoPhase = '' echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi @@ -595,7 +595,7 @@ rec { rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" stopNest ''; - + buildPhase = '' eval "$preBuild" @@ -612,7 +612,7 @@ rec { mkdir $rpmout $rpmout/SPECS $rpmout/BUILD $rpmout/RPMS $rpmout/SRPMS echo "%_topdir $rpmout" >> $HOME/.rpmmacros - + rpmbuild -vv -ta "$srcName" eval "$postBuild" @@ -642,7 +642,7 @@ rec { fillDiskWithDebs = { size ? 4096, debs, name, fullName, postInstall ? null, createRootFS ? defaultCreateRootFS }: - + runInLinuxVM (stdenv.mkDerivation { inherit name postInstall; @@ -658,7 +658,7 @@ rec { # Unpack the .debs. We do this to prevent pre-install scripts # (which have lots of circular dependencies) from barfing. echo "unpacking Debs..." - + for deb in $debs; do if test "$deb" != "|"; then echo "$deb..." @@ -671,7 +671,7 @@ rec { ${utillinux}/bin/mount -o bind /nix/store /mnt/inst/nix/store ${utillinux}/bin/mount -o bind /proc /mnt/proc ${utillinux}/bin/mount -o bind /dev /mnt/dev - + # Misc. files/directories assumed by various packages. echo "initialising Dpkg DB..." touch /mnt/etc/shells @@ -685,7 +685,7 @@ rec { echo "installing Debs..." export DEBIAN_FRONTEND=noninteractive - + oldIFS="$IFS" IFS="|" for component in $debs; do @@ -700,13 +700,13 @@ rec { PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ /usr/bin/dpkg --install --force-all $debs < /dev/null || true done - + echo "running post-install script..." eval "$postInstall" ln -sf dash /mnt/bin/sh rm /mnt/.debug - + ${utillinux}/bin/umount /mnt/inst/nix/store ${utillinux}/bin/umount /mnt/proc ${utillinux}/bin/umount /mnt/dev @@ -720,7 +720,7 @@ rec { /* Generate a Nix expression containing fetchurl calls for the closure of a set of top-level RPM packages from the `primary.xml.gz' file of a Fedora or openSUSE distribution. */ - + rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; @@ -737,7 +737,7 @@ rec { /* Helper function that combines rpmClosureGenerator and fillDiskWithRPMs to generate a disk image from a set of package names. */ - + makeImageFromRPMDist = { name, fullName, size ? 4096 , urlPrefix ? "", urlPrefixes ? [urlPrefix] @@ -760,7 +760,7 @@ rec { debClosureGenerator = {name, packagesList, urlPrefix, packages}: - + runCommand "${name}.nix" {} '' bunzip2 < ${packagesList} > ./Packages @@ -770,12 +770,12 @@ rec { ${perl}/bin/perl -I${dpkg} -w ${deb/deb-closure.pl} \ ./Packages ${urlPrefix} ${toString packages} > $out ''; - + /* Helper function that combines debClosureGenerator and fillDiskWithDebs to generate a disk image from a set of package names. */ - + makeImageFromDebDist = { name, fullName, size ? 4096, urlPrefix, packagesList , packages, extraPackages ? [], postInstall ? "" }: @@ -793,7 +793,7 @@ rec { /* The set of supported RPM-based distributions. */ - + rpmDistros = { fedora2i386 = { @@ -820,7 +820,7 @@ rec { runScripts = false; packages = commonFedoraPackages; }; - + fedora5i386 = { name = "fedora-core-5-i386"; fullName = "Fedora Core 5 (i386)"; @@ -831,7 +831,7 @@ rec { urlPrefix = mirror://fedora/linux/core/5/i386/os; packages = commonFedoraPackages ++ [ "util-linux" ]; }; - + fedora7i386 = { name = "fedora-7-i386"; fullName = "Fedora 7 (i386)"; @@ -842,7 +842,7 @@ rec { urlPrefix = mirror://fedora/linux/releases/7/Everything/i386/os; packages = commonFedoraPackages; }; - + fedora8i386 = { name = "fedora-8-i386"; fullName = "Fedora 8 (i386)"; @@ -1060,9 +1060,9 @@ rec { /* The set of supported Dpkg-based distributions. */ - + debDistros = { - + # Interestingly, the SHA-256 hashes provided by Ubuntu in # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are # wrong, but the SHA-1 and MD5 hashes are correct. Intrepid is fine. @@ -1077,7 +1077,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804i386 = { name = "ubuntu-8.04-hardy-i386"; fullName = "Ubuntu 8.04 Hardy (i386)"; @@ -1088,7 +1088,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu804x86_64 = { name = "ubuntu-8.04-hardy-amd64"; fullName = "Ubuntu 8.04 Hardy (amd64)"; @@ -1099,7 +1099,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810i386 = { name = "ubuntu-8.10-intrepid-i386"; fullName = "Ubuntu 8.10 Intrepid (i386)"; @@ -1110,7 +1110,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu810x86_64 = { name = "ubuntu-8.10-intrepid-amd64"; fullName = "Ubuntu 8.10 Intrepid (amd64)"; @@ -1132,7 +1132,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebianPackages; }; - + ubuntu904x86_64 = { name = "ubuntu-9.04-jaunty-amd64"; fullName = "Ubuntu 9.04 Jaunty (amd64)"; @@ -1154,7 +1154,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diff" "mktemp" ]; }; - + ubuntu910x86_64 = { name = "ubuntu-9.10-karmic-amd64"; fullName = "Ubuntu 9.10 Karmic (amd64)"; @@ -1176,7 +1176,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; - + ubuntu1004x86_64 = { name = "ubuntu-10.04-lucid-amd64"; fullName = "Ubuntu 10.04 Lucid (amd64)"; @@ -1198,7 +1198,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1010x86_64 = { name = "ubuntu-10.04-maverick-amd64"; fullName = "Ubuntu 10.04 Maverick (amd64)"; @@ -1220,7 +1220,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1110x86_64 = { name = "ubuntu-11.10-oneiric-amd64"; fullName = "Ubuntu 11.10 Oneiric (amd64)"; @@ -1242,7 +1242,7 @@ rec { urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; - + ubuntu1204x86_64 = { name = "ubuntu-12.04-oneiric-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; @@ -1264,7 +1264,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian40x86_64 = { name = "debian-4.0r9-etch-amd64"; fullName = "Debian 4.0r9 Etch (amd64)"; @@ -1308,7 +1308,7 @@ rec { urlPrefix = mirror://debian; packages = commonDebianPackages; }; - + debian60x86_64 = { name = "debian-6.0.4-squeeze-amd64"; fullName = "Debian 6.0.4 Squeeze (amd64)"; @@ -1346,7 +1346,7 @@ rec { "unzip" ]; - + /* Common packages for openSUSE images. */ commonOpenSUSEPackages = [ "aaa_base" @@ -1390,7 +1390,7 @@ rec { "patch" "locales" # Needed by checkinstall: - "util-linux" + "util-linux" "file" "dpkg-dev" "pkg-config" @@ -1400,7 +1400,7 @@ rec { ]; commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" "mktemp" ]; - + /* A set of functions that build the Linux distributions specified in `rpmDistros' and `debDistros'. For instance, @@ -1414,29 +1414,29 @@ rec { `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"]; size = 8192; }' builds an 8 GiB image containing Firefox in addition to the default packages. */ - diskImageFuns = + diskImageFuns = (lib.mapAttrs (name: as: as2: makeImageFromRPMDist (as // as2)) rpmDistros) // (lib.mapAttrs (name: as: as2: makeImageFromDebDist (as // as2)) debDistros); - + /* Shorthand for `diskImageFuns. { extraPackages = ... }'. */ diskImageExtraFuns = lib.mapAttrs (name: f: extraPackages: f { inherit extraPackages; }) diskImageFuns; - + /* Default disk images generated from the `rpmDistros' and `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns // - + { redhat9i386 = fillDiskWithRPMs { name = "redhat-9-i386"; fullName = "Red Hat Linux 9 (i386)"; size = 1024; rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;}; }; - + suse90i386 = fillDiskWithRPMs { name = "suse-9.0-i386"; fullName = "SUSE Linux 9.0 (i386)"; @@ -1456,7 +1456,7 @@ rec { echo 'video:x:33:' >> /mnt/etc/group ''; }; - + }; - + } From 20de8c808658154a838d6519ecfa32f260b25fd7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:46:51 -0400 Subject: [PATCH 0857/1120] Make the "universe" repository available to the Ubuntu image generator Also fix Ubuntu 12.04 name from "oneiric" to "precise". --- pkgs/build-support/vm/deb/deb-closure.pl | 2 + pkgs/build-support/vm/default.nix | 48 ++++++++++++++++-------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index f5b764783b43..1d41f89218bd 100644 --- a/pkgs/build-support/vm/deb/deb-closure.pl +++ b/pkgs/build-support/vm/deb/deb-closure.pl @@ -53,6 +53,8 @@ foreach my $cdata (values %packages) { my @provides = getDeps(Dpkg::Deps::parse($cdata->{Provides})); foreach my $name (@provides) { #die "conflicting provide: $name\n" if defined $provides{$name}; + #warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n"; + next if defined $packages{$name}; $provides{$name} = $cdata->{Package}; } } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5ec551fc718d..8781fbf2d108 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -723,7 +723,7 @@ rec { rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: - assert (builtins.length packagesLists) == (builtins.length urlPrefixes) ; + assert (builtins.length packagesLists) == (builtins.length urlPrefixes); runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' ${lib.concatImapStrings (i: pl: '' gunzip < ${pl} > ./packages_${toString i}.xml @@ -759,10 +759,13 @@ rec { (i.e. generate a closure from a Packages.bz2 file). */ debClosureGenerator = - {name, packagesList, urlPrefix, packages}: + {name, packagesLists, urlPrefix, packages}: runCommand "${name}.nix" {} '' - bunzip2 < ${packagesList} > ./Packages + for i in ${toString packagesLists}; do + echo "adding $i..." + bunzip2 < $i >> ./Packages + done # Work around this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452279 sed -i ./Packages -e s/x86_64-linux-gnu/x86-64-linux-gnu/g @@ -777,12 +780,13 @@ rec { names. */ makeImageFromDebDist = - { name, fullName, size ? 4096, urlPrefix, packagesList + { name, fullName, size ? 4096, urlPrefix + , packagesList ? "", packagesLists ? [packagesList] , packages, extraPackages ? [], postInstall ? "" }: let expr = debClosureGenerator { - inherit name packagesList urlPrefix; + inherit name packagesLists urlPrefix; packages = packages ++ extraPackages; }; in @@ -1158,7 +1162,7 @@ rec { ubuntu910x86_64 = { name = "ubuntu-9.10-karmic-amd64"; fullName = "Ubuntu 9.10 Karmic (amd64)"; - packagesList = fetchurl { + packagesList = fetchurl { url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2; sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40"; }; @@ -1233,23 +1237,35 @@ rec { }; ubuntu1204i386 = { - name = "ubuntu-12.04-oneiric-i386"; + name = "ubuntu-12.04-precise-i386"; fullName = "Ubuntu 12.04 Precise (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; - sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; - }; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; + sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2; + sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; ubuntu1204x86_64 = { - name = "ubuntu-12.04-oneiric-amd64"; + name = "ubuntu-12.04-precise-amd64"; fullName = "Ubuntu 12.04 Precise (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; - sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; + sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; + }) + (fetchurl { + url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2; + sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; From bc8b1376dae0f751a15f56e10cc8a4ef5bec124c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 14:02:39 -0400 Subject: [PATCH 0858/1120] postgresql-jdbc: Update to 9.1-902 --- pkgs/servers/sql/postgresql/jdbc/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index e173a270e882..e490a14bea61 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -1,13 +1,19 @@ -{stdenv, fetchurl, ant}: +{ stdenv, fetchurl, ant }: -stdenv.mkDerivation { - name = "postgresql-jdbc-8.2"; +stdenv.mkDerivation rec { + name = "postgresql-jdbc-9.1-902"; builder = ./builder.sh; src = fetchurl { - url = http://jdbc.postgresql.org/download/postgresql-jdbc-8.2-504.src.tar.gz; - sha256 = "1fkza5j4b9pzm69cw1zv35bqk062d92l4l0zhz3qn0g64r08ccm4"; + url = "http://jdbc.postgresql.org/download/${name}.src.tar.gz"; + sha256 = "0sgwbiw5vfxcl0g1yzsndgxdha74cr8ag6y65i0jhgg5g8qc56bz"; }; buildInputs = [ant]; + + meta = { + homepage = http://jdbc.postgresql.org/; + description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; + license = "bsd"; + }; } From 8c128db32e473115669a9955f16093f7ff605558 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Aug 2012 14:15:57 -0400 Subject: [PATCH 0859/1120] Add oraclejdk and oraclejre attributes for packages that want to use them --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01ae4a9c0ba..02a8565a83d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2366,6 +2366,10 @@ let then openjre else jdkdistro false false; + oraclejdk = jdkdistro true false; + + oraclejre = jdkdistro false false; + jrePlugin = lowPrio (jdkdistro false true); supportsJDK = From 602fde4ad48d3ed21c245a804b4f64477d4126f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Aug 2012 19:42:05 +0200 Subject: [PATCH 0860/1120] Adding espeakedit, phoneme editor for espeak. I've no idea how to use it still. --- pkgs/applications/audio/espeak/edit.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/espeak/edit.nix diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix new file mode 100644 index 000000000000..eb34335721f0 --- /dev/null +++ b/pkgs/applications/audio/espeak/edit.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, unzip, portaudio, wxGTK}: + +stdenv.mkDerivation { + name = "espeakedit-1.46.02"; + src = fetchurl { + url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip; + sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl"; + }; + + buildInputs = [ unzip portaudio wxGTK ]; + + patchPhase = if portaudio.api_version == 19 then '' + cp src/portaudio19.h src/portaudio.h + '' else ""; + + buildPhase = '' + cd src + gcc -o espeakedit *.cpp `wx-config --cxxflags --libs` + ''; + + installPhase = '' + ensureDir $out/bin + cp espeakedit $out/bin + ''; + + meta = { + description = "Phoneme editor for espeak"; + homepage = http://espeak.sourceforge.net/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a8565a83d4..7cd66bbe7cbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6791,6 +6791,8 @@ let espeak = callPackage ../applications/audio/espeak { }; + espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; + esniper = callPackage ../applications/networking/esniper { }; etherape = callPackage ../applications/networking/sniffers/etherape { From 0f1326cde9cc8cae509a4d225f37f072b0314601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 27 Aug 2012 20:25:54 +0200 Subject: [PATCH 0861/1120] Adding praat. --- pkgs/applications/audio/praat/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/praat/default.nix diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix new file mode 100644 index 000000000000..f2f196acdd85 --- /dev/null +++ b/pkgs/applications/audio/praat/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, alsaLib, gtk, pkgconfig }: + +stdenv.mkDerivation { + name = "praat-5323"; + src = fetchurl { + url = http://www.fon.hum.uva.nl/praat/praat5323_sources.tar.gz; + sha256 = "1m0m5165h74mw5xhmnnyzh5ans3cn78w5rs9572sa1512cams203"; + }; + + configurePhase = '' + cp makefiles/makefile.defs.linux makefile.defs + ''; + + installPhase = '' + ensureDir $out/bin + cp praat $out/bin + ''; + + buildInputs = [ alsaLib gtk pkgconfig ]; + + meta = { + description = "Doing phonetics by computer"; + homepage = http://www.fon.hum.uva.nl/praat/; + license = "GPLv2+"; # Has some 3rd-party code in it though + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cd66bbe7cbd..3922e569a3a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6960,6 +6960,8 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; + praat = callPackage ../applications/audio/praat { }; + quvi = callPackage ../applications/video/quvi/tool.nix { }; quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; From 0a6c7e432b44375dc1d1b6ad60b2ca8435fd7a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 27 Aug 2012 23:48:44 +0200 Subject: [PATCH 0862/1120] Patch linuxsampler so that it can load SFZ state when used as an LV2 plugin: http://tracker.ardour.org/view.php?id=4462 --- .../audio/linuxsampler/default.nix | 10 ++-- .../linuxsampler_lv2_sfz_fix.diff | 50 +++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 1ef081c84d07..c74cd2b0d7d4 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7"; }; - patchPhase = "sed -e 's/which/type -P/g' -i scripts/generate_parser.sh"; + patches = ./linuxsampler_lv2_sfz_fix.diff; - preConfigure = "make -f Makefile.cvs"; + preConfigure = '' + sed -e 's/which/type -P/g' -i scripts/generate_parser.sh + make -f Makefile.cvs + ''; buildInputs = [ alsaLib asio autoconf automake bison jackaudio libgig libsndfile @@ -34,7 +37,8 @@ stdenv.mkDerivation rec { have questions on the subject, that are not yet covered by the FAQ, please contact us. ''; - license = licenses.gpl2; + license = licenses.proprietary; maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff new file mode 100644 index 000000000000..114726db19d6 --- /dev/null +++ b/pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff @@ -0,0 +1,50 @@ +Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp +=================================================================== +--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359) ++++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy) +@@ -18,6 +18,8 @@ + * MA 02110-1301 USA * + ***************************************************************************/ + ++#define _BSD_SOURCE 1 /* for realpath() */ ++ + #include + #include + #include +@@ -118,6 +120,23 @@ + dmsg(2, ("linuxsampler: Deactivate\n")); + } + ++ static String RealPath(const String& path) ++ { ++ String out = path; ++ char* cpath = NULL; ++#ifdef _WIN32 ++ cpath = (char*)malloc(MAX_PATH); ++ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL); ++#else ++ cpath = realpath(path.c_str(), NULL); ++#endif ++ if (cpath) { ++ out = cpath; ++ free(cpath); ++ } ++ return out; ++ } ++ + String PluginLv2::PathToState(const String& path) { + if (MapPath) { + char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str()); +@@ -131,9 +150,10 @@ + String PluginLv2::PathFromState(const String& path) { + if (MapPath) { + char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str()); +- const String abstract_path(cstr); ++ // Resolve symbolic links so SFZ sample paths load correctly ++ const String absolute_path(RealPath(cstr)); + free(cstr); +- return abstract_path; ++ return absolute_path; + } + return path; + } From 824b62a61a79a08fea6f31de6ceca67d2091faa4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:18:10 +0200 Subject: [PATCH 0863/1120] haskell-cipher-aes: add version 0.1.1 --- .../libraries/haskell/cipher-aes/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/cipher-aes/default.nix diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix new file mode 100644 index 000000000000..e89fc1d6faff --- /dev/null +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -0,0 +1,15 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "cipher-aes"; + version = "0.1.1"; + sha256 = "0pyiqsdvvq0qhlin17rijqjq0sc0i9nl9rdwbql01fr4pw46cwwg"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "http://github.com/vincenthz/hs-cipher-aes"; + description = "Fast AES cipher implementation with advanced mode of operations"; + 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 c2e457bfe456..87a6b8a20497 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -522,6 +522,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); citeprocHs = callPackage ../development/libraries/haskell/citeproc-hs {}; + cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; From bf188b3fd290f56c3c87ae7126eda90eb881f6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:28:51 +0200 Subject: [PATCH 0864/1120] haskell-http-conduit: patch to support recent versions of base64-bytestring and asn1-data --- pkgs/development/libraries/haskell/http-conduit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 9c0efe3f05c3..ee9d43966afe 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -17,6 +17,9 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; + patchPhase = '' + sed -i http-conduit.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' -e 's|, asn1-data.*|, asn1-data|' + ''; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 7d889c6dfaefbb7631757773d04e0471b4a40ca4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:31:19 +0200 Subject: [PATCH 0865/1120] haskell-yesod-static: patch to support recent versions of base64-bytestring --- pkgs/development/libraries/haskell/yesod-static/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index d7e9498c968f..8fffccd649ab 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; + patchPhase = '' + sed -i yesod-static.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' + ''; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; From 9bce51f6ec0730eb1160edcc51c4901061f8f0dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:34:15 +0200 Subject: [PATCH 0866/1120] haskell-gitit: patch to support recent versions of base64-bytestring --- pkgs/development/libraries/haskell/gitit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 148750e9ddcd..41d521805ce7 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -19,7 +19,7 @@ cabal.mkDerivation (self: { zlib ]; patchPhase = '' - sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal + sed -i -e 's|hslogger.*,|hslogger,|' -e 's|base64-bytestring.*,|base64-bytestring,|' gitit.cabal ''; meta = { homepage = "http://gitit.net"; From dbe1ee0921832c000c81d5e22ca36d2ba9e92d88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0867/1120] haskell-HsOpenSSL: update to version 0.10.3.3 --- pkgs/development/libraries/haskell/HsOpenSSL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index 3a4c94e33a25..9eefaaef84a0 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.2"; - sha256 = "15mlllzw8ahvrx259bz5vwisdig7bvkany1qjhmz6y8v2rcplr7f"; + version = "0.10.3.3"; + sha256 = "04d2nd2hcbglw8blwhi3d32vazdxnvs9s52788qyllgm7gmay6a5"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { From b61ed4a580adc1e26ff91cbeaccc925a00dc6c1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0868/1120] haskell-abstract-deque: update to version 0.1.6 --- .../libraries/haskell/abstract-deque/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 90d6f4c274ef..a6219a4b2a0d 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,11 +1,12 @@ -{ cabal, HUnit, IORefCAS }: +{ cabal, HUnit }: cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.1.5"; - sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q"; - buildDepends = [ HUnit IORefCAS ]; + version = "0.1.6"; + sha256 = "13s8xbr31sqj8n3bh4xp82fqw5d5g1a27fpfqw69jfmr5xc9s1za"; + buildDepends = [ HUnit ]; meta = { + homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 77cd02f766695843b2b703489e667ad824228192 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0869/1120] haskell-asn1-data: update to version 0.7.1 --- .../libraries/haskell/asn1-data/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 60e795f6e2ef..a90e8e769e23 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,17 +1,15 @@ -{ cabal, attoparsec, attoparsecEnumerator, enumerator, mtl, text }: +{ cabal, cereal, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-data"; - version = "0.6.1.3"; - sha256 = "0vly55dpqrm9vb8ayp72na1nf2rr5ini3d81qqvxflmjgpksrgwq"; + version = "0.7.1"; + sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; isLibrary = true; isExecutable = true; - buildDepends = [ - attoparsec attoparsecEnumerator enumerator mtl text - ]; + buildDepends = [ cereal mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-data"; - description = "ASN1 data reader and writer in RAW, BER, DER and CER forms"; + description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From c7a7caf7ab21660ae936d23f27a8955b40f12508 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0870/1120] haskell-base64-bytestring: update to version 1.0.0.0 --- .../libraries/haskell/base64-bytestring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 5fd552d6272b..bc3eca3050df 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-bytestring"; - version = "0.1.2.0"; - sha256 = "039naasb3z8q42zl067paylxb9i1m1pkp4w6b5yqsc38sbmikv1z"; + version = "1.0.0.0"; + sha256 = "0z0r0lrpka3qrq45ajzyxsjc2as7zp6bq7z7sd56rwiziw7vp7vm"; meta = { homepage = "https://github.com/bos/base64-bytestring"; description = "Fast base64 encoding and deconding for ByteStrings"; From cf4076daba72e39781dbc8ae2a316729b7427c38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0871/1120] haskell-certificate: update to version 1.2.6 --- pkgs/development/libraries/haskell/certificate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 6581ddf0e1ab..d79f6faa3efe 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.5"; - sha256 = "1zxi1hflq973m7a1c9wvxdx8aqapx1kqy8j7nn7k67l9gpjb1jbc"; + version = "1.2.6"; + sha256 = "1li65r4zbff7r7p533p5xw2z3rd0xnlb2bbwqdldrnswy4mvlakx"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; From e01aa340f6896ab5553397eb4b290b4069bd4f2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0872/1120] haskell-configurator: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 0c4c610106ef..3618f5980554 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "configurator"; - version = "0.2.0.0"; - sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la"; + version = "0.2.0.1"; + sha256 = "02w6f5q2xkpc3kgqz6a58g7yr0q4xd8ck1b6lr64ahvqwsjbxy6p"; buildDepends = [ attoparsec hashable text unixCompat unorderedContainers ]; From 5bddcc2f21513b48e5a6f7a7b679798de284d61d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0873/1120] haskell-cprng-aes: update to version 0.2.4 --- .../libraries/haskell/cprng-aes/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 881d4519a532..1feb21a8b638 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,10 +1,14 @@ -{ cabal, cereal, cryptoApi, cryptocipher, entropy, random }: +{ cabal, cereal, cipherAes, cryptoApi, cryptocipher, entropy +, random +}: cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.2.3"; - sha256 = "1xyphzb3afvw7kpgq3b0c86b45rp5a8s870gag1lp7h686lhfnn3"; - buildDepends = [ cereal cryptoApi cryptocipher entropy random ]; + version = "0.2.4"; + sha256 = "0rk14yj76p5a1h6jlz4q2fgijjid430lwcr57zkkda8mdibqqs5j"; + buildDepends = [ + cereal cipherAes cryptoApi cryptocipher entropy random + ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; description = "Crypto Pseudo Random Number Generator using AES in counter mode"; From 49a3481f5d6af2147ec500ee9ac0057cd12d9f1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0874/1120] haskell-http-types: update to version 0.7.3.0.1 --- 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 14d347f39f50..242f73e9b21a 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"; - sha256 = "1s2y2fl9l75xd6fls9ajasn37i7cqxfw772rkw50d3vxvk2fdxjh"; + version = "0.7.3.0.1"; + sha256 = "1s2dh75jpf2yllw503hjw0x2anhc4c71vz5yylri8nxzx1zs18rq"; buildDepends = [ blazeBuilder caseInsensitive text ]; meta = { homepage = "https://github.com/aristidb/http-types"; From fda535b52defe398a182806dd7b90cfe1b31fed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0875/1120] haskell-reactive-banana: update to version 0.7.0.1 --- .../libraries/haskell/reactive-banana/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 98438bbb3d2d..a80e911eefa7 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,13 +1,13 @@ -{ cabal, fclabels, hashable, QuickCheck, transformers -, unorderedContainers, vault +{ cabal, hashable, QuickCheck, transformers, unorderedContainers +, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.0.0"; - sha256 = "0f25zr4l2v73yr3mww0ri9n0kq97sakd0mifvll0kmsh0cz124xz"; + version = "0.7.0.1"; + sha256 = "0nd6j2782x7i12xw480qgk42jkya9qi0xdas15ik6cmg4c9z1dyk"; buildDepends = [ - fclabels hashable QuickCheck transformers unorderedContainers vault + hashable QuickCheck transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; From da00b344cf16b76c8d55cf62826917cd15933cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0876/1120] haskell-yesod-core: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 219a83e1e96d..66432d02f592 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.1"; - sha256 = "1rq0zdn9d6f34s7wnnr32hnbz23z8bvz3j2ylv8sz5h3nwmbfz99"; + version = "1.1.1.1"; + sha256 = "1sx8bn48r8l9qkqlg2rab6b2xz5dkvw8whm3df7rviw9lymgcrdk"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From def452861da8470fd7cd268bda67be1870301cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:59:20 +0200 Subject: [PATCH 0877/1120] Delete obsolete Haskell packages: * comonad 1.1.1.6 * comonad-transformers 2.1.2 * semigroupoids 1.3.4 * split 0.1 * tagsoup 0.10.1 * texmath 0.4 --- .../haskell/comonad-transformers/2.1.2.nix | 19 -------------- .../{3.0.nix => default.nix} | 0 .../libraries/haskell/comonad/1.1.1.6.nix | 14 ---------- .../comonad/{3.0.0.2.nix => default.nix} | 0 .../libraries/haskell/semigroupoids/1.3.4.nix | 14 ---------- .../semigroupoids/{3.0.nix => default.nix} | 0 .../libraries/haskell/split/0.1.nix | 13 ---------- .../libraries/haskell/tagsoup/0.10.1nix | 16 ------------ .../libraries/haskell/texmath/0.4.nix | 17 ------------ pkgs/top-level/haskell-packages.nix | 26 +++---------------- 10 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix rename pkgs/development/libraries/haskell/comonad-transformers/{3.0.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/comonad/1.1.1.6.nix rename pkgs/development/libraries/haskell/comonad/{3.0.0.2.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix rename pkgs/development/libraries/haskell/semigroupoids/{3.0.nix => default.nix} (100%) delete mode 100644 pkgs/development/libraries/haskell/split/0.1.nix delete mode 100644 pkgs/development/libraries/haskell/tagsoup/0.10.1nix delete mode 100644 pkgs/development/libraries/haskell/texmath/0.4.nix diff --git a/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix b/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix deleted file mode 100644 index 1dd7c212c714..000000000000 --- a/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, comonad, contravariant, distributive, semigroupoids -, semigroups, transformers -}: - -cabal.mkDerivation (self: { - pname = "comonad-transformers"; - version = "2.1.2"; - sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis"; - buildDepends = [ - comonad contravariant distributive semigroupoids semigroups - transformers - ]; - meta = { - homepage = "http://github.com/ekmett/comonad-transformers/"; - description = "Comonad transformers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/3.0.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad-transformers/3.0.nix rename to pkgs/development/libraries/haskell/comonad-transformers/default.nix diff --git a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix deleted file mode 100644 index 53e014fb8ac9..000000000000 --- a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, semigroups, transformers }: - -cabal.mkDerivation (self: { - pname = "comonad"; - version = "1.1.1.6"; - sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; - buildDepends = [ semigroups transformers ]; - meta = { - homepage = "http://github.com/ekmett/comonad/"; - description = "Haskell 98 compatible comonads"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/comonad/3.0.0.2.nix b/pkgs/development/libraries/haskell/comonad/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad/3.0.0.2.nix rename to pkgs/development/libraries/haskell/comonad/default.nix diff --git a/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix b/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix deleted file mode 100644 index 776e452eafe7..000000000000 --- a/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal, comonad, contravariant, semigroups, transformers }: - -cabal.mkDerivation (self: { - pname = "semigroupoids"; - version = "1.3.4"; - sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph"; - buildDepends = [ comonad contravariant semigroups transformers ]; - meta = { - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Haskell 98 semigroupoids: Category sans id"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/semigroupoids/3.0.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/semigroupoids/3.0.nix rename to pkgs/development/libraries/haskell/semigroupoids/default.nix diff --git a/pkgs/development/libraries/haskell/split/0.1.nix b/pkgs/development/libraries/haskell/split/0.1.nix deleted file mode 100644 index ad0df5c2cb02..000000000000 --- a/pkgs/development/libraries/haskell/split/0.1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.1.4.3"; - sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; - meta = { - homepage = "http://code.haskell.org/~byorgey/code/split"; - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix b/pkgs/development/libraries/haskell/tagsoup/0.10.1nix deleted file mode 100644 index 462ee658fd25..000000000000 --- a/pkgs/development/libraries/haskell/tagsoup/0.10.1nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, mtl, network }: - -cabal.mkDerivation (self: { - pname = "tagsoup"; - version = "0.10.1"; - sha256 = "0bssfj5r790yj33q23i0lbj83xahzd9rf4jhqs21vgrpn9fqsynl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ mtl network ]; - meta = { - homepage = "http://community.haskell.org/~ndm/tagsoup/"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/texmath/0.4.nix b/pkgs/development/libraries/haskell/texmath/0.4.nix deleted file mode 100644 index 9d9a4f07586c..000000000000 --- a/pkgs/development/libraries/haskell/texmath/0.4.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, parsec, syb, xml }: - -cabal.mkDerivation (self: { - pname = "texmath"; - version = "0.4"; - sha256 = "1rvnhqljxkljy8ncpaj8p7b14nvvm6zmiixv13m1zxlcr457j2ai"; - isLibrary = true; - isExecutable = true; - buildDepends = [ parsec syb xml ]; - meta = { - homepage = "http://github.com/jgm/texmath"; - description = "Conversion of LaTeX math formulas to MathML"; - license = "GPL"; - 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 87a6b8a20497..1f06a00b64f8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -534,16 +534,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; - comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonad_3_0_0_2 = callPackage ../development/libraries/haskell/comonad/3.0.0.2.nix {}; - comonad = self.comonad_3_0_0_2; + comonad = callPackage ../development/libraries/haskell/comonad {}; - comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { - comonad = self.comonad_1_1_1_6; - semigroupoids = self.semigroupoids_1_3_4; - }; - comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {}; - comonadTransformers = self.comonadTransformers_3_0; + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; @@ -605,10 +598,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; - dataLens = callPackage ../development/libraries/haskell/data-lens { - comonadTransformers = self.comonadTransformers_2_1_2; - semigroupoids = self.semigroupoids_1_3_4; - }; + dataLens = callPackage ../development/libraries/haskell/data-lens {}; dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; @@ -1329,11 +1319,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; - semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix { - comonad = self.comonad_1_1_1_6; - }; - semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {}; - semigroupoids = self.semigroupoids_3_0; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; shelly = callPackage ../development/libraries/haskell/shelly {}; @@ -1412,7 +1398,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; - split_0_1 = callPackage ../development/libraries/haskell/split/0.1.nix {}; split = callPackage ../development/libraries/haskell/split {}; stbImage = callPackage ../development/libraries/haskell/stb-image {}; @@ -1450,8 +1435,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; - tagsoup_0_10_1 = callPackage ../development/libraries/haskell/tagsoup/0.10.1nix {}; - temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; @@ -1775,7 +1758,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmonadExtras = callPackage ../applications/window-managers/xmonad/xmonad-extras.nix { X11 = self.X11_1_5_0_1; - split = self.split_0_1; }; # Tools. From aa583c8cf4702f8c071b89bb514d4caf453122f8 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 28 Aug 2012 14:40:24 +0200 Subject: [PATCH 0878/1120] experimental/lib-fold-attr adding useful function foldAttr which behave like fold on attr values grouped by name (without assertions now) Signed-off-by: Marc Weber --- pkgs/lib/attrsets.nix | 13 ++++++++++++- pkgs/lib/tests.nix | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index de6eccbec1f8..63448847a150 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -5,7 +5,8 @@ with { inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; - inherit (import ./lists.nix) concatMap concatLists; + inherit (import ./lists.nix) concatMap concatLists all; + inherit (import ./misc.nix) maybeAttr; }; rec { @@ -78,6 +79,16 @@ rec { filterAttrs = pred: set: listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set)); + /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list: + foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }] + => { a = [ 2 3 ]; } + */ + foldAttrs = op: nul: list_of_attrs: + fold (n: a: + fold (name: o: + o // (listToAttrs [{inherit name; value = op (getAttr name n) (maybeAttr name nul a); }]) + ) a (attrNames n) + ) {} list_of_attrs; /* Recursively collect sets that verify a given predicate named `pred' from the set `attrs'. The recursion is stopped when the predicate is diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix index 835298ddb9ea..04acb7632eab 100644 --- a/pkgs/lib/tests.nix +++ b/pkgs/lib/tests.nix @@ -58,6 +58,13 @@ runTests { ([ 1 2 3 ] == (take 4 [ 1 2 3 ])) ]; + testFoldAttrs = { + expr = foldAttrs (n: a: [n] ++ a) [] [ + { a = 2; b = 7; } + { a = 3; c = 8; } + ]; + expected = { a = [ 2 3 ]; b = [7]; c = [8];}; + }; testOverridableDelayableArgsTest = { expr = From b920bd538ae381f01ffe5baecac6c3dbdbe9bfa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:21 +0200 Subject: [PATCH 0879/1120] postfix: strip trailing whitespace --- pkgs/servers/mail/postfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 16d9127e5561..6319a60cedba 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -6,7 +6,7 @@ assert stdenv.isLinux; stdenv.mkDerivation { name = "postfix-2.8.6"; - + src = fetchurl { url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; @@ -47,7 +47,7 @@ stdenv.mkDerivation { ''; buildInputs = [db4 openssl cyrus_sasl bison perl]; - + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; postPatch = '' @@ -55,6 +55,6 @@ stdenv.mkDerivation { -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ -e s,:/sbin,, src/util/sys_defs.h ''; - + inherit glibc; } From 919b35725521789e8f8606f4e711559453354b03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:34 +0200 Subject: [PATCH 0880/1120] postfix: add meta section --- pkgs/servers/mail/postfix/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 6319a60cedba..155d534c7475 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation { sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ -e s,:/sbin,, src/util/sys_defs.h + + meta = { + homepage = "http://www.postfix.org/"; + description = "a fast, easy to administer, and secure mail server"; + license = stdenv.lib.licenses.bsdOriginal; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; ''; inherit glibc; From 40fe2d03b5e294ba5456f34d55e1efd427ef942c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:14:03 +0200 Subject: [PATCH 0881/1120] postfix: re-use $name in src URL --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 155d534c7475..37a3869a733f 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -4,11 +4,11 @@ assert stdenv.isLinux; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "postfix-2.8.6"; src = fetchurl { - url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz; + url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; }; From 85350ca2d44fc272d893e566be3044920524d4e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:17:06 +0200 Subject: [PATCH 0882/1120] postfix: clean-up install phase Passing install_root=$out isn't a good idea because the install script is going to pre-pend that prefix to all other paths even though these have the $out prefix already. The resulting installation is a mess. Instead, we use the "fake" install prefix "out" and then move all files and directories into the right place afterward. --- pkgs/servers/mail/postfix/default.nix | 47 +++++++++++++-------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 37a3869a733f..d505f459b9e6 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -12,23 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; }; - installTargets = ["non-interactive-package"]; - - installFlags = [" install_root=$out "]; - - preInstall = '' - sed -e '/^PATH=/d' -i postfix-install - ''; - - postInstall = '' - mkdir -p $out - mv ut/$out/* $out/ + buildInputs = [db4 openssl cyrus_sasl bison perl]; - mkdir $out/share/postfix/conf - cp conf/* $out/share/postfix/conf - sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install - sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script - chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + + postPatch = '' + sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ + -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ + -e s,:/sbin,, src/util/sys_defs.h ''; preBuild = '' @@ -46,14 +37,23 @@ stdenv.mkDerivation rec { make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' ''; - buildInputs = [db4 openssl cyrus_sasl bison perl]; + installPhase = '' + sed -e '/^PATH=/d' -i postfix-install + $SHELL postfix-install install_root=out -non-interactive -package - patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ]; + mkdir -p $out + mv -v "out$out/"* $out/ - postPatch = '' - sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/sbin, \ - -e s,:/sbin,, src/util/sys_defs.h + mkdir -p $out/share/postfix + mv conf $out/share/postfix/ + mv LICENSE TLS_LICENSE $out/share/postfix/ + + sed -e 's@^PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install + sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script + chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + ''; + + inherit glibc; meta = { homepage = "http://www.postfix.org/"; @@ -62,7 +62,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; - ''; - - inherit glibc; } From d7470b6c689b7384c30e20c87d0e81c857943c6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:18:17 +0200 Subject: [PATCH 0883/1120] postfix: update to version 2.8.12 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index d505f459b9e6..a435eea86639 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "postfix-2.8.6"; + name = "postfix-2.8.12"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb"; + sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl"; }; buildInputs = [db4 openssl cyrus_sasl bison perl]; From 58e282b907778ec9f244f4b0de1cd6d6e817b098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 29 Aug 2012 00:48:44 +0200 Subject: [PATCH 0884/1120] Update the download URL for ncmpcpp The old URL for ncmpcpp was broken (reported by nobdraisentone on IRC) --- pkgs/applications/audio/ncmpcpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index b9d304097111..3af9bc7690ff 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; src = fetchurl { - url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2"; + url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; }; From aed5c366944b98624411c5551f2d43becafdf44d Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 29 Aug 2012 15:16:03 +0200 Subject: [PATCH 0885/1120] Use makeWrapper --- pkgs/tools/misc/plowshare/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 0e7d688670fc..b29d4300e71f 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash }: +{ stdenv, fetchurl, makeWrapper, curl }: let @@ -13,13 +13,16 @@ in stdenv.mkDerivation { sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; }; - phases = [ "unpackPhase" "installPhase" "postInstallPhase" ]; + buildInputs = [ makeWrapper curl ]; - installPhase = ''make PREFIX="$out" install''; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - postInstallPhase = '' - find "$out" -name "*.sh" -exec \ - sed -i "s@#!/bin/bash@#!${bash}/bin/bash@" '{}' \; + installPhase = '' + make PREFIX="$out" install + + for fn in plow{del,down,list,up}; do + wrapProgram "$out/bin/$fn" --prefix PATH + done ''; meta = { From af6265e66dd24e12587157c01e9c9e1bad953f09 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:35:29 +0200 Subject: [PATCH 0886/1120] add celt-0.5.1 --- pkgs/development/libraries/celt/0.5.1.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/celt/0.5.1.nix diff --git a/pkgs/development/libraries/celt/0.5.1.nix b/pkgs/development/libraries/celt/0.5.1.nix new file mode 100644 index 000000000000..0f42e7cd0407 --- /dev/null +++ b/pkgs/development/libraries/celt/0.5.1.nix @@ -0,0 +1,46 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="celt"; + version="0.5.1.3"; + name="${baseName}-${version}"; + url="http://downloads.xiph.org/releases/${baseName}/${name}.tar.gz"; + hash="0bkam9z5vnrxpbxkkh9kw6yzjka9di56h11iijikdd1f71l5nbpw"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "CELT - low-delay audio codec"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + license = "free"; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.celt-codec.org/downloads/"; + }; + }; +}) x diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3922e569a3a1..fda096dc4877 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,6 +3331,7 @@ let celt = callPackage ../development/libraries/celt {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; + celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; cgal = callPackage ../development/libraries/CGAL {}; From 30514a53469c206677cff3313c2edf352bd5b2c4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:36:16 +0200 Subject: [PATCH 0887/1120] add spice-protocol-0.10.1 --- .../libraries/spice-protocol/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/spice-protocol/default.nix diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix new file mode 100644 index 000000000000..a7541932c6c4 --- /dev/null +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "spice-protocol-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "0drmy2ws7qwmvjxfynhssbvh1y954rfik99hnl789g7yg6vcpxp5"; + }; + + meta = { + description = "Protocol headers for the SPICE protocol."; + homepage = http://www.spice-space.org; + license = stdenv.lib.licenses.bsd3; + + maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fda096dc4877..e94767297d5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,6 +4795,8 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + spiceProtocol = callPackage ../development/libraries/spice-protocol { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srtp = callPackage ../development/libraries/srtp {}; From cb4443ef260926290184f8952070fab45b55a6dc Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:47:00 +0200 Subject: [PATCH 0888/1120] add spice-0.10.1 spice is a next-generation remote desktop protocol, aimed at virtual machines. focus is not just on display/input devices, but clipboard, audio, video, opengl, smartcards, usb devices as well, no matter if the virtual machine runs locally or on a remote host. not everything is implemented yet, and I didn't enable all available features yet. Currently, spice is able to make qemu-kvm virtual machines very usable for workstation guests, with good 2d video support, clipboard sharing, full resolutions, auto-mouse-grab/ungrab, xinerama / multiple guest monitors. Good drivers for windows 7 guests are available, as well as linux Xorg drivers / agents. Basically, kvm was already the best-performing VM solution (using virtio drivers), but virtualbox, while slower, had better desktop-integration support (still wins if you want opengl). Spice fixes this, making the choice very easy. --- pkgs/development/libraries/spice/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/libraries/spice/default.nix diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix new file mode 100644 index 000000000000..f14214f5a882 --- /dev/null +++ b/pkgs/development/libraries/spice/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl +, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib +, spiceProtocol }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "spice-0.10.1"; + + src = fetchurl { + url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + sha256 = "105p5fh6hhhzvz0fh1x52lzi41rpvajf390xbbw3da4417lf5pqk"; + }; + + buildInputs = [ pixman celt alsaLib openssl libjpeg zlib + libXrandr libXfixes libXrender libXext libXinerama + ]; + + buildNativeInputs = [ pkgconfig spiceProtocol ]; + + # NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + configureFlags = [ + "--with-sasl=no" + ]; + + postInstall = '' + ln -s spice-server $out/include/spice + ''; + + meta = { + description = "Complete open source solution for interaction with virtualized desktop devices"; + longDescription = '' + The Spice project aims to provide a complete open source solution for interaction + with virtualized desktop devices.The Spice project deals with both the virtualized + devices and the front-end. Interaction between front-end and back-end is done using + VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily + utilized by a third-party component. + ''; + homepage = http://www.spice-space.org/; + license = licenses.lgpl21; + + maintainers = [ maintainers.bluescreen303 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e94767297d5b..9c7f687e5279 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,6 +4795,11 @@ let sphinxbase = callPackage ../development/libraries/sphinxbase { }; + spice = callPackage ../development/libraries/spice { + celt = celt_0_5_1; + inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; + }; + spiceProtocol = callPackage ../development/libraries/spice-protocol { }; sratom = callPackage ../development/libraries/audio/sratom { }; From fadaad6f89cf7448088930473ac00ee53949dc63 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:55:43 +0200 Subject: [PATCH 0889/1120] qemu-kvm: add (optional) spice support --- pkgs/os-specific/linux/qemu-kvm/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index f6709bb439f4..39b7074e2996 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib, libaio, mesa }: +, libjpeg, libpng, ncurses, python, glib, libaio, mesa +, spice, spiceProtocol, spiceSupport ? false }: assert stdenv.isLinux; @@ -23,19 +24,24 @@ stdenv.mkDerivation rec { s|/usr/bin/python|${python}/bin/python|g ; s|/bin/rm|rm|g' done + '' + stdenv.lib.optionalString spiceSupport '' + for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h + do + substituteInPlace $i --replace '#include ' '#include ' + done ''; configureFlags = [ "--audio-drv-list=alsa" "--smbd=smbd" # use `smbd' from $PATH - ]; + ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; enableParallelBuilding = true; buildInputs = [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng ncurses python glib libaio mesa - ]; + ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ]; postInstall = '' From 23f20dcdfeca29cf4d1a1b226d2ddc42fcf2975e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 22:57:57 +0200 Subject: [PATCH 0890/1120] emacs/sunrise-commander: change to github source previous source replaces itself every now and then and doesn't do versioning --- .../emacs-modes/sunrise-commander/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index c15ff6afcb20..a253e25cad45 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,25 +1,23 @@ -{stdenv, fetchurl, emacs}: +{stdenv, fetchgit, emacs}: stdenv.mkDerivation rec { - name = "sunrise-commander-6"; + name = "sunrise-commander-6r435"; - src = fetchurl { - url = "http://www.emacswiki.org/emacs/download/sunrise-commander.el"; - sha256 = "1bbpm00nc7ry0f2k4zaqbvp6w9py31asfcr9hddggc138pnfajvq"; + src = fetchgit { + url = https://github.com/escherdragon/sunrise-commander.git; + rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; + sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; }; - phases = [ "buildPhase" "installPhase"]; - buildInputs = [ emacs ]; buildPhase = '' - cp $src sunrise-commander.el - emacs --batch -f batch-byte-compile sunrise-commander.el + emacs -L . --batch -f batch-byte-compile *.el ''; installPhase = '' - install -d $out/share/emacs/site-lisp - install sunrise-commander.el* $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp ''; meta = { From 280fb5585d783f30c03049f5e01fee8c4e7d7e5b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 23:35:39 +0200 Subject: [PATCH 0891/1120] spice seems really just for linux at the moment --- pkgs/development/libraries/spice-protocol/default.nix | 2 +- pkgs/development/libraries/spice/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index a7541932c6c4..bc7a8c893f84 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index f14214f5a882..cba5d9107837 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = [ maintainers.bluescreen303 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 3f887534becf017261e19b5110090f312ef32d0b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 30 Aug 2012 10:18:24 +0400 Subject: [PATCH 0892/1120] Meshlib: update to 1.3.2, it now builds and runs --- pkgs/applications/graphics/meshlab/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9b39d8e8f1f7..a811d759f7eb 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { - name = "meshlab-1.2.3a"; + name = "meshlab-1.3.2"; src = fetchurl { - url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz; - sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v"; + url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.2/MeshLabSrc_AllInc_v132.tgz"; + sha256 = "d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1"; }; # I don't know why I need this; without this, the rpath set at the beginning of the @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildPhase = '' + mkdir -p "$out/include" + cp -r vcglib "$out/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" cd meshlab/src pushd external qmake -recursive external.pro make popd - qmake -recursive meshlabv12.pro + qmake -recursive meshlab_full.pro make ''; @@ -31,6 +34,8 @@ stdenv.mkDerivation rec { ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ''; + sourceRoot = "."; + buildInputs = [ qt unzip ]; meta = { From b54e608807b25e0c388f07276a9a7a7a0e24bd7a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 08:33:10 +0200 Subject: [PATCH 0893/1120] spice-protocol: fix maintainer --- pkgs/development/libraries/spice-protocol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index bc7a8c893f84..c1b6d0e67e7f 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { homepage = http://www.spice-space.org; license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bluescreen303.nl ]; + maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; }; } From 7e8240d71ba9087033773da09fa6077ff144bdb3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 10:11:23 +0200 Subject: [PATCH 0894/1120] haskell: add stylish-haskell --- .../haskell/stylish-haskell/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stylish-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix new file mode 100644 index 000000000000..eca99a8c4405 --- /dev/null +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -0,0 +1,20 @@ +{ cabal, aeson, cmdargs, filepath, haskellSrcExts, mtl, strict, syb +, yaml +}: + +cabal.mkDerivation (self: { + pname = "stylish-haskell"; + version = "0.4.0.0"; + sha256 = "1d5a7a5f1lbyf7if0sb9vhmnbi5ry28wakhsgh75hvgzd999vbhx"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson cmdargs filepath haskellSrcExts mtl strict syb yaml + ]; + meta = { + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + 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 1f06a00b64f8..204660903243 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1357,6 +1357,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; + syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; From 59180564d58d8c0cc9c019b9f51ad153878f2f9f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 Aug 2012 11:07:45 +0200 Subject: [PATCH 0895/1120] dev86: Update to 0.16.19 (old sources disappeared) --- pkgs/development/compilers/dev86/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 0dfb0be96f93..539588ac3add 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "dev86-0.16.18"; + name = "dev86-0.16.19"; src = fetchurl { - url = http://www.debath.co.uk/dev86/Dev86src-0.16.18.tar.gz; - sha256 = "1wcg2x8i2fq7kqgazx2il3qfmikyi4kfb23vm45yxlwq72l55604"; + url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz; + sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e"; }; makeFlags = "PREFIX=$(out)"; From 69e307a2e3df07e82d60d695798929d090323517 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 30 Aug 2012 11:56:33 +0200 Subject: [PATCH 0896/1120] Change default version of parallel for GHC 7.5 and above. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 204660903243..908d68577941 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_1_0; # 7.5 ok OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail - parallel = self.parallel_3_2_0_2; # 7.5 fail + parallel = self.parallel_3_2_0_3; # 7.5 ok parsec = self.parsec_3_1_3; # 7.5 ok QuickCheck = self.QuickCheck_2_5; # 7.5 fail random = self.random_1_0_1_1; # 7.5 ok From 70acc59794a2b59d1e4f5c992f7b1490846dbd0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0897/1120] haskell-Graphalyze: update to version 0.13.0.1 --- pkgs/development/libraries/haskell/Graphalyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index d0258fd26988..90bcb9f8605d 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.13.0.0"; - sha256 = "1xh6xg2rw43cbi83rmpb0c2yib9cfj0pwg66nx5x5a0al2c9pdsr"; + version = "0.13.0.1"; + sha256 = "1yk7iglsspbj0kxh5rhjkc6q65vz07vpygiig07w86g2s6gad8am"; buildDepends = [ bktrees fgl filepath graphviz pandoc random text time ]; From 60ae16e0aa26350bef58754744ad589635e9a6fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0898/1120] haskell-graphviz: update to version 2999.14.1.0 --- pkgs/development/libraries/haskell/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 4e6c7298b86f..7986ef07c1ee 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.14.0.0"; - sha256 = "1dnjw7r2zg2qhjxnmdryi0839ggrb3l3bpx8asfpr0bza70kjdf3"; + version = "2999.14.1.0"; + sha256 = "13fni5sf6cdfvgyh7kqjjdhmjxkhbgl3gbi0cbq90n8blzg4q1ql"; buildDepends = [ colour dlist fgl filepath polyparse text transformers wlPprintText ]; From 45485db6239440ebefdfabb9ec8a0697df0e26e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0899/1120] haskell-hoauth: update to version 0.3.5 --- pkgs/development/libraries/haskell/hoauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix index e118f7650979..c568b292c3c1 100644 --- a/pkgs/development/libraries/haskell/hoauth/default.nix +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hoauth"; - version = "0.3.4"; - sha256 = "0a8a77smzhxmynfi0ayvsgibpw9aav2f7pi9j3dxjas14zg9qv2k"; + version = "0.3.5"; + sha256 = "06vk3dv2dby7wadxg4qq2bzy10hl8ix2x4vpxggwd13xy3kpzjqp"; buildDepends = [ binary cryptoPubkeyTypes curl dataenc entropy mtl random RSA SHA time utf8String From d11f3d5551b613b4e6c87749c69a8bcd15c2c1e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0900/1120] haskell-http-conduit: update to version 1.6.0.1 --- .../development/libraries/haskell/http-conduit/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index ee9d43966afe..eef0a2b52594 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.6.0"; - sha256 = "1vr4kglmlqn6s31ks231qx4b8034p6yi0501h3zswpqyf5cimhl7"; + version = "1.6.0.1"; + sha256 = "0v6r57pliaam3i69826bf07iqmkm2s2x6f19mk0amh7fvdfjhgyb"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; - patchPhase = '' - sed -i http-conduit.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' -e 's|, asn1-data.*|, asn1-data|' - ''; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; From 9ffc9076dcf2a4f486989a62227855bf3f4b0cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0901/1120] haskell-postgresql-simple: update to version 0.2.4.1 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 28b5c0dec850..3e3a1b7dbfd6 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.2.4.0"; - sha256 = "1n1s650j4z82cz34rq9qgj805yc9x852snnqjaa1iwrg9i3r150f"; + version = "0.2.4.1"; + sha256 = "09yszkiahfyidaq9yfk4mda5sf1m8bcqqag51vasybln9k9hhws3"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From 7638637b68c58dbbec1434711dd7b1d809a0a351 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0902/1120] haskell-test-framework-quickcheck2: update to version 0.2.12.3 --- .../libraries/haskell/test-framework-quickcheck2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 1f1a45d42450..e0615469ab75 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "test-framework-quickcheck2"; - version = "0.2.12.2"; - sha256 = "08m8y78qy23imcwyqdqla7syxdf91iqrb0j8g6g7gwsg5asjq6ip"; + version = "0.2.12.3"; + sha256 = "17pj6b1cclihy203zpb75rkx2djldc9kcj10wqkf5fjmf9vvi0ks"; buildDepends = [ extensibleExceptions QuickCheck random testFramework ]; From 410ba4ee200ae7e3aafafe6a02f0bbd779f920d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0903/1120] haskell-SourceGraph: update to version 0.7.0.3 --- pkgs/development/tools/haskell/SourceGraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index 731722126ca1..382a940408f4 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SourceGraph"; - version = "0.7.0.2"; - sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl"; + version = "0.7.0.3"; + sha256 = "04bx7przxha38n9vckcxz3mbcxcws5ifbc1xfm0rg6bn8rym78yb"; isLibrary = false; isExecutable = true; buildDepends = [ From 50400e345c130d223c1671483f7838445f2c72db Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:07:47 +0200 Subject: [PATCH 0904/1120] Give correct PATH to wrapProgram --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index b29d4300e71f..83f7c62c4267 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH + wrapProgram "$out/bin/$fn" --prefix PATH : ${curl}/bin done ''; From a23f6dc4c47d1427f307b1d7459c724b2d675eec Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:27:03 +0200 Subject: [PATCH 0905/1120] Add quotes to wrapProgram's arguments --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 83f7c62c4267..e3463c6a1d40 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { make PREFIX="$out" install for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : ${curl}/bin + wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin" done ''; From 96f76db3960445fcbf99484304e22b2b7810d95c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 30 Aug 2012 18:07:11 +0200 Subject: [PATCH 0906/1120] gnutls: Pass `--with-libnettle-prefix' on OpenIndiana. Suggested by Mats Erik Andersson . --- pkgs/development/libraries/gnutls/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index b8f88c6f5b85..961387012c67 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation (rec { sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; }; + # FIXME: Turn into a Nix list. configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ @@ -19,6 +20,8 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" + else ""}${if stdenv.isSunOS # TODO: this for all platforms + then " --with-libnettle-prefix=${nettle}" else ""} ''; From 8f1a34e2282cf4fe69c7bd5f111fdc2ac34c0440 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:01 +0200 Subject: [PATCH 0907/1120] linux-3.5: upgrade to 3.5.3 --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 8e347595f220..62cf4998536d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.5.2"; + version = "3.5.3"; testing = false; preConfigure = '' @@ -249,7 +249,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "13dzx7gqm0n7s73bq87ibhmydrfsngyps9sczkcy1sh56rrkv0x6"; + sha256 = "1p8imlvka3mjm74k09535lyqgdrl1jxrldzd7c8k4qlh5s8fz13w"; }; config = configWithPlatform stdenv.platform; From 6fabe047c6acdfbfad50808970d72850a47b8724 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:18 +0200 Subject: [PATCH 0908/1120] linux-3.4: upgrade to 3.4.10 --- 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 7d421af4917a..c57a409810e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.9"; + version = "3.4.10"; testing = false; preConfigure = '' @@ -248,7 +248,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "02rnzpnfs7hfsglrgwr1450ssj47da1w079rmvzh1k0apy7qdpzm"; + sha256 = "03xfiyhv6zl3wn78bgm7a30w4hs2p328s447slilp0z2w09jqn4q"; }; config = configWithPlatform stdenv.platform; From 50dca38b26b00a0e88cbaa2929c9f7c0db04d389 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:50 +0200 Subject: [PATCH 0909/1120] cifs-utils: upgrade to 5.6 --- pkgs/os-specific/linux/cifs-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 63eafb93e304..9e761b90a05c 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: - + stdenv.mkDerivation rec { - name = "cifs-utils-5.3"; - + name = "cifs-utils-5.6"; + src = fetchurl { url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; - sha256 = "68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32"; + sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i"; }; makeFlags = "root_sbindir=$(out)/sbin"; @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.samba.org/linux-cifs/cifs-utils/; description = "Tools for managing Linux CIFS client filesystems"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } From d37b642769023232787f217f64d6c594ed49618d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 18:04:55 +0200 Subject: [PATCH 0910/1120] newer kernels need cifs-utils to mount CIFS filesystems the kernel itself (and busybox's cifs mount code) are no longer able to do this in some/most cases and will error out saying: "CIFS VFS: connecting to DFS root not implemented yet"" Nixos' qemu-vm target is hurt by this, as it wants to mount /nix/store via cifs very early in the boot process. this commit just marks the problematic kernels. An associated commit in nixos will use this info to fix the problem. --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index c57a409810e2..8b0e3e0d8a25 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -256,6 +256,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.needsCifsUtils = true; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 62cf4998536d..61d6b0aeba50 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -257,6 +257,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.needsCifsUtils = true; } // removeAttrs args ["extraConfig"] From 953eadbfc3e5b720a811855e867338ffea8a7b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 30 Aug 2012 22:54:18 +0200 Subject: [PATCH 0911/1120] gnutls: Pass CPPFLAGS to help find GMP on OpenIndiana. Suggested by Mats Erik Andersson . --- pkgs/development/libraries/gnutls/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 961387012c67..93f5dab537e9 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, zlib, lzo, libtasn1, nettle -, guileBindings, guile, perl }: +, guileBindings, guile, perl, gmp }: assert guileBindings -> guile != null; @@ -20,8 +20,11 @@ stdenv.mkDerivation (rec { --with-lzo --with-libtasn1-prefix="${libtasn1}" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - else ""}${if stdenv.isSunOS # TODO: this for all platforms - then " --with-libnettle-prefix=${nettle}" + else ""}${if stdenv.isSunOS + # TODO: Use `--with-libnettle-prefix' on all platforms + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + then " --with-libnettle-prefix=${nettle} CPPFLAGS=-I${gmp}/include" else ""} ''; From 702854cb5dd1d4a6ee3c3a2251a59b6c481e15f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Aug 2012 09:10:18 +0200 Subject: [PATCH 0912/1120] haskell-Ebnf2ps: update to version 1.0.11 --- pkgs/development/tools/parsing/Ebnf2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 81815500c618..f1964e815f67 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Ebnf2ps"; - version = "1.0.10"; - sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs"; + version = "1.0.11"; + sha256 = "0n0maihalnrks3l7ay1i16p6i7f69xv33jxhlsyshzck0v64qivb"; isLibrary = false; isExecutable = true; buildTools = [ happy ]; From 30ba367d5a9450f57c71085061651abeac1dd191 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:21:13 +0400 Subject: [PATCH 0913/1120] Add libvisio (libreoffice dependency) --- .../libraries/libvisio/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libvisio/default.nix diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix new file mode 100644 index 000000000000..99146cd02cc4 --- /dev/null +++ b/pkgs/development/libraries/libvisio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libvisio-0.0.19"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1"; + }; + + buildNativeInputs = [ pkgconfig ]; + buildInputs = [ boost libwpd libwpg ]; + + configureFlags = "--disable-werror"; + + meta = { + description = "A library providing ability to interpret and import visio diagrams into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libvisio; + platforms = stdenv.lib.platforms.gnu; # random choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c7f687e5279..4b28b19053f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4335,6 +4335,8 @@ let libvirt = callPackage ../development/libraries/libvirt { }; + libvisio = callPackage ../development/libraries/libvisio { }; + libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) { inherit libtool libjpeg openssl zlib; inherit (xlibs) xproto libX11 damageproto libXdamage From d41c08ee5410f0e7435c85c4fb24113ac41c02cf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:25:30 +0400 Subject: [PATCH 0914/1120] Add mdds (libreoffice dependency) --- pkgs/development/libraries/mdds/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/mdds/default.nix diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix new file mode 100644 index 000000000000..484f878a55ef --- /dev/null +++ b/pkgs/development/libraries/mdds/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mdds-0.6.0"; + + src = fetchurl { + url = http://multidimalgorithm.googlecode.com/files/mdds_0.6.0.tar.bz2; + sha256 = "0yx6cx2cxk9wpmfpv6k3agkr1sjzxdgxrm3zfj34zwyxr3sh0ql4"; + }; + + meta = { + homepage = https://code.google.com/p/multidimalgorithm/; + description = "A collection of multi-dimensional data structure and indexing algorithm"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b28b19053f5..74f7b0a12363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4423,6 +4423,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + mdds = callPackage ../development/libraries/mdds { }; + # failed to build mediastreamer = callPackage ../development/libraries/mediastreamer { }; From 34bafa4893df4aaf18538155711b24ce191400a6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:30:15 +0400 Subject: [PATCH 0915/1120] Add libcdr (libreoffice dependency) --- pkgs/development/libraries/libcdr/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/libcdr/default.nix diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix new file mode 100644 index 000000000000..823a4839e80d --- /dev/null +++ b/pkgs/development/libraries/libcdr/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libcdr-0.0.8"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; + }; + + buildInputs = [ libwpg libwpd lcms2 ]; + + buildNativeInputs = [ pkgconfig ]; + + CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h + + meta = { + description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; + homepage = http://www.freedesktop.org/wiki/Software/libcdr; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74f7b0a12363..099261ab5b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3990,6 +3990,8 @@ let libcdio = callPackage ../development/libraries/libcdio { }; + libcdr = callPackage ../development/libraries/libcdr { }; + libchamplain = callPackage ../development/libraries/libchamplain { inherit (gnome) libsoup; }; From 28f0597bd60378b9b323d0b31799bf07f64d0a4e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:31:26 +0400 Subject: [PATCH 0916/1120] Add clucene-core.2.x --- .../libraries/clucene-core/2.x.nix | 27 ++++++++++ ...ile-by-adding-clucene-shared-library.patch | 19 +++++++ ...B_configuration_in_shared_CMakeLists.patch | 20 ++++++++ .../clucene-core/Install-contribs-lib.patch | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 117 insertions(+) create mode 100644 pkgs/development/libraries/clucene-core/2.x.nix create mode 100644 pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch create mode 100644 pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch create mode 100644 pkgs/development/libraries/clucene-core/Install-contribs-lib.patch diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix new file mode 100644 index 000000000000..72460184df21 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, cmake, boost, zlib}: + +stdenv.mkDerivation rec { + name = "clucene-core-2.3.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/clucene/${name}.tar.gz"; + sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"; + }; + + buildNativeInputs = [ cmake ]; + + buildInputs = [ boost zlib ]; + + cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ]; + + patches = # From debian + [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch + ./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch + ./Install-contribs-lib.patch + ]; + + meta = { + description = "CLucene is a port of the very popular Java Lucene text search engine API. Core package, 2.x branch."; + homepage = http://clucene.sourceforge.net; + }; +} diff --git a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch new file mode 100644 index 000000000000..80e49a8e712e --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -0,0 +1,19 @@ +From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 +From: Valentin Rusu +Date: Sat, 17 Dec 2011 13:47:58 +0100 +Subject: [PATCH] Fix .pc file by adding clucene-shared library + +--- + src/core/libclucene-core.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i + Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared + Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext + ~ diff --git a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch new file mode 100644 index 000000000000..f5f44a7fa2c4 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch @@ -0,0 +1,20 @@ +From 772481ca94071ddfe65102a451926e4f9aeb4d2c Mon Sep 17 00:00:00 2001 +From: Veit Jahns +Date: Thu, 26 May 2011 13:35:28 +0200 +Subject: [PATCH] Fixing ZLIB configuration in shared's CMakeLists + +--- + src/shared/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/shared/CMakeLists.txt ++++ b/src/shared/CMakeLists.txt +@@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) + find_package(ZLIB) + IF ( ZLIB_FOUND ) + SET ( EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARY} ) +-ELSEIF ( ZLIB_FOUND ) ++ELSE ( ZLIB_FOUND ) + MESSAGE( "ZLIB not found, using local: ${clucene-ext_SOURCE_DIR}/zlib" ) + SET(ZLIB_INCLUDE_DIR ${clucene-ext_SOURCE_DIR}/zlib ) + SET(ZLIB_LIBRARY ${clucene-ext_BINARY_DIR}) diff --git a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch new file mode 100644 index 000000000000..899411fe02b4 --- /dev/null +++ b/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch @@ -0,0 +1,49 @@ +Description: contribs-lib is not built and installed even with config +Author: Vitaliy Filippov +Bug: https://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446 + +--- + CMakeLists.txt | 2 +- + src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) + SET(BUILD_CONTRIBS_LIB 1) + ENDIF ( BUILD_CONTRIBS ) + IF ( BUILD_CONTRIBS_LIB ) +- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL) ++ ADD_SUBDIRECTORY (src/contribs-lib) + ENDIF ( BUILD_CONTRIBS_LIB ) + + +--- a/src/contribs-lib/CMakeLists.txt ++++ b/src/contribs-lib/CMakeLists.txt +@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED + ) + TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) + ++#install public headers. ++FOREACH(file ${HEADERS}) ++ get_filename_component(apath ${file} PATH) ++ get_filename_component(aname ${file} NAME) ++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath}) ++ IF ( NOT aname MATCHES "^_.*" ) ++ install(FILES ${file} ++ DESTINATION include/${relpath} ++ COMPONENT development) ++ ENDIF ( NOT aname MATCHES "^_.*" ) ++ENDFOREACH(file) ++ + #set properties on the libraries + SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES + VERSION ${CLUCENE_VERSION} + SOVERSION ${CLUCENE_SOVERSION} + COMPILE_DEFINITIONS_DEBUG _DEBUG + ) ++ ++#and install library ++install(TARGETS clucene-contribs-lib ++ DESTINATION ${LIB_DESTINATION} ++ COMPONENT runtime ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 099261ab5b49..75c286b965bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3368,6 +3368,8 @@ let clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { }; + clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; + clucene_core = callPackage ../development/libraries/clucene-core { }; cluceneCore = clucene_core; # !!! remove this From 38d07f50183afbe49d1fcb953413c252807fd1b5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:35:30 +0400 Subject: [PATCH 0917/1120] Add MyThes --- pkgs/development/libraries/mythes/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/mythes/default.nix diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix new file mode 100644 index 000000000000..ff06f2a00506 --- /dev/null +++ b/pkgs/development/libraries/mythes/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, hunspell, pkgconfig, perl }: + +stdenv.mkDerivation rec { + name = "mythes-1.2.3"; + + src = fetchurl { + url = "mirror://sourceforge/hunspell/${name}.tar.gz"; + sha256 = "0f5q7yiwg9bw4a5zxg0dapqdfc2grfb4ss34ifir3mhhy4q3jf4j"; + }; + + buildInputs = [ hunspell ]; + buildNativeInputs = [ pkgconfig perl ]; + + meta = { + homepage = http://hunspell.sourceforge.net/; + description = "Thesaurus library from Hunspell project"; + inherit (hunspell.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75c286b965bd..7a0b578eb58e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4485,6 +4485,8 @@ let mysocketw = callPackage ../development/libraries/mysocketw { }; + mythes = callPackage ../development/libraries/mythes { }; + ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl; unicode = system != "i686-cygwin"; From c5f9ee33259fd94ef81c672e50a2f69999cb9a29 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:01:57 +0400 Subject: [PATCH 0918/1120] Add libexttextcat (part of LibreOffice) --- .../libraries/libexttextcat/default.nix | 18 +++++++++ .../libexttextcat/memory-leaks.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libexttextcat/default.nix create mode 100644 pkgs/development/libraries/libexttextcat/memory-leaks.patch diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix new file mode 100644 index 000000000000..a75fada7484a --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libexttextcat-3.3.1"; + + src = fetchurl { + url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4"; + }; + + patches = [ ./memory-leaks.patch ]; + + meta = { + description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; + homepage = http://www.freedesktop.org/wiki/Software/libexttextcat; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch new file mode 100644 index 000000000000..0be4ffdc93a7 --- /dev/null +++ b/pkgs/development/libraries/libexttextcat/memory-leaks.patch @@ -0,0 +1,37 @@ +Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and +5ef4ad86ec934282cba891922ec2d13784da3354. +diff -u b/src/textcat.c b/src/textcat.c +--- b/src/textcat.c ++++ b/src/textcat.c +@@ -212,8 +212,6 @@ + sizeof(char) * (tmp_size + 1)); + if (tmp == NULL) + { +- free(finger_print_file_name); +- finger_print_file_name_size = 0; + goto BAILOUT; + } + else +@@ -226,10 +224,7 @@ + strcat(finger_print_file_name, segment[0]); + + if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0) +- { +- textcat_Done(h); + goto BAILOUT; +- } + h->fprint_disable[h->size] = 0xF0; /* 0xF0 is the code for enabled + languages, 0x0F is for disabled + */ +@@ -242,9 +237,10 @@ + return h; + + BAILOUT: ++ free(finger_print_file_name); + fclose(fp); ++ textcat_Done(h); + return NULL; +- + } + + extern candidate_t *textcat_GetClassifyFullOutput(void *handle) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a0b578eb58e..9bc56479723c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4097,6 +4097,8 @@ let libmpeg2 = mpeg2dec; }; + libexttextcat = callPackage ../development/libraries/libexttextcat {}; + libf2c = callPackage ../development/libraries/libf2c {}; libfixposix = callPackage ../development/libraries/libfixposix {}; From f15e95a8913ee4b57dad2d2c65fe5e16ea593aae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 23:05:40 +0400 Subject: [PATCH 0919/1120] libjpeg-8d It fixes some crashes (e.g., KDE workspace crashed when I tried to configure webcam in Skype). --- pkgs/development/libraries/libjpeg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index f598482f8304..63d698dda18f 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "libjpeg-8c"; + name = "libjpeg-8d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz; - sha256 = "16kwrjhziv81gl9fq9b7qir8khm3wfb9zj7fzs7yabsb00z0pz7d"; + url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz; + sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; meta = { From dd45319df1a6a9699b20aeed587b51a96c39558e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:05:47 +0400 Subject: [PATCH 0920/1120] amarok-2.6.0 --- pkgs/applications/audio/amarok/default.nix | 10 ++-- .../audio/amarok/find-mysql.patch | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/audio/amarok/find-mysql.patch diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index ad553c9db346..a60ecdcb866f 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl , libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod, pkgconfig, automoc4, phonon -, strigi, soprano }: +, strigi, soprano, qjson, ffmpeg, libofa }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y"; + sha256 = "1h6jzl0jnn8g05pz4mw01kz20wjjxwwz6iki7lvgj70qi3jq04m9"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; + patches = ./find-mysql.patch; buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi - soprano qca2 libmtp liblastfm libgpod pkgconfig ]; + soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ]; postInstall = '' mkdir -p $out/nix-support echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages ''; + meta = { description = "Popular music player for KDE"; license = "GPL"; diff --git a/pkgs/applications/audio/amarok/find-mysql.patch b/pkgs/applications/audio/amarok/find-mysql.patch new file mode 100644 index 000000000000..57a5ec46b84f --- /dev/null +++ b/pkgs/applications/audio/amarok/find-mysql.patch @@ -0,0 +1,46 @@ +commit 9979970f05f25329100168d85a5c4cdc8c084b7a +Author: Yury G. Kudryashov +Date: Thu Aug 30 12:32:53 2012 +0400 + + FindMySQLAmarok.cmake: use PATH_SUFFIXES + +diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake +index 910b434..4c8b8e8 100644 +--- a/cmake/modules/FindMySQLAmarok.cmake ++++ b/cmake/modules/FindMySQLAmarok.cmake +@@ -13,18 +13,17 @@ + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if(NOT WIN32) +- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin) ++ find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR}) + endif(NOT WIN32) + + find_path(MYSQL_INCLUDE_DIR mysql.h +- /opt/local/include/mysql5/mysql ++ PATHS ++ /opt/local/include + /opt/mysql/mysql/include +- /opt/mysqle/include/mysql +- /opt/ports/include/mysql5/mysql +- /usr/include/mysql +- /usr/local/include/mysql +- /usr/mysql/include/mysql +- ~/usr/include/mysql ++ /opt/mysqle/include ++ /opt/ports/include ++ /usr/mysql/include ++ PATH_SUFFIXES mysql mysql5/mysql + ) + + if(MYSQLCONFIG_EXECUTABLE) +@@ -40,8 +39,7 @@ if(MYSQLCONFIG_EXECUTABLE) + + find_library(MYSQLD_PIC_SEPARATE + mysqld_pic +- PATHS +- /usr/lib/mysql ++ PATH_SUFFIXES mysql + ) + + if(MYSQLD_PIC_SEPARATE) From 7d8aa35a0703e493dc7f1bc0ff71730248c463e2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:06:48 +0400 Subject: [PATCH 0921/1120] rekonq-1.1 --- .../networking/browsers/rekonq/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 791b73c9c78c..4a46de14f9bc 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, kdelibs, gettext, pkgconfig }: +{ stdenv, fetchurl, kdelibs, gettext, pkgconfig, shared_desktop_ontologies, qca2, qoauth }: stdenv.mkDerivation rec { - name = "rekonq-0.9.0-1"; + name = "rekonq-1.1"; src = fetchurl { - url = "mirror://sf/rekonq/${name}.tar.bz2"; - sha256 = "0vri6wdxxi7qkcjpgvscwa7m3ysy62jns924d07arvy8bmg5whc5"; + url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; + sha256 = "1bs733mwyfb7bxnial8n49b82ip04sark2mxwlq7ixxsbgq7972l"; }; - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs qca2 qoauth ]; - buildNativeInputs = [ gettext pkgconfig ]; + buildNativeInputs = [ gettext pkgconfig shared_desktop_ontologies ]; meta = with stdenv.lib; { platforms = platforms.linux; From f1a2d031e56c03d746736454c4df9a86d3ba9922 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:09 +0400 Subject: [PATCH 0922/1120] konversation-1.4 --- pkgs/applications/networking/irc/konversation/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 938a26fd785b..c4d2f4b3782b 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -3,15 +3,15 @@ let pn = "konversation"; - v = "1.3.1"; + v = "1.4"; in stdenv.mkDerivation rec { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2"; - sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl"; + url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; + sha256 = "030vsbb18dlzsnjl3fzyd1m9wvvksiyc1lm45abi4q6x4xd60knv"; }; buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs From c2ad9f873d6ac0d59dd826166185fa1f096a15b2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:22 +0400 Subject: [PATCH 0923/1120] mr-1.13, more verbose install --- .../version-management/mr/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index ca272504517a..9e8024d7b191 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, fetchgitrevision, perl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "1.12"; + version = "1.13"; name = "mr-" + version; - src = fetchgit { - url = "git://git.kitenet.net/mr.git"; - rev = "353f63c968368edea9b14261f510c34ce4e0c97f"; + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/mr/mr_${version}.tar.gz"; + sha256 = "1q3qxk8dwbv30v2xxh852wnwl1msgkvk5cgxyicpqj8kh5b96zlz"; }; buildInputs = [perl]; @@ -17,12 +17,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 - cp mr $out/bin - cp webcheckout $out/bin - cp mr.1 $out/share/man/man1 - cp webcheckout.1 $out/share/man/man1 + mkdir -pv $out/bin $out/share/man/man1 + cp -v mr $out/bin + cp -v webcheckout $out/bin + cp -v mr.1 $out/share/man/man1 + cp -v webcheckout.1 $out/share/man/man1 ''; meta = { From 97c6a2fd4ff73f9ab33ae748bdbd98a5e692ff6d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:04 +0400 Subject: [PATCH 0924/1120] skrooge-1.3.2 --- pkgs/applications/office/skrooge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 9b27a3e23797..44ffdf57db58 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }: stdenv.mkDerivation rec { - name = "skrooge-1.3.0"; + name = "skrooge-1.3.2"; src = fetchurl { url = "http://skrooge.org/files/${name}.tar.bz2"; - sha256 = "1sfzzn9xz01c0095w4scckiiwv2gfbaxx05h7ds5n02a113w53kz"; + sha256 = "18j36yamxzfwpnnnjiach22q9088c2nlcilzh2p24gjhgnnd0v6r"; }; buildInputs = [ kdelibs grantlee qca2 libofx ]; From ebf190e793e17d8b9ee81bba1cadd10adbc39312 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:31 +0400 Subject: [PATCH 0925/1120] calligra-2.5.0 --- pkgs/applications/office/calligra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index b64338adaf18..152246ee58f2 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies }: +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: stdenv.mkDerivation rec { - name = "calligra-2.4.2"; + name = "calligra-2.5.0"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "14wi8mr87aas12f75qi6p8x0pij365sbz4c737qhh4302fh8fsqg"; + sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21"; }; buildNativeInputs = [ cmake perl pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies ]; + shared_desktop_ontologies okular ]; meta = { description = "A Qt/KDE office suite, formely known as koffice"; From 834884ae7b50e0d753ee009c27227fbf5f43f6ca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:11 +0400 Subject: [PATCH 0926/1120] Explicitly pass SDO --- pkgs/applications/video/kdenlive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index d8620eb33cdd..b518e9c7456a 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano -, pkgconfig }: +, pkgconfig, shared_desktop_ontologies }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz - qjson shared_mime_info soprano pkgconfig + qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies ]; meta = { From db81ec42420ce143719ee96ee988d7dc34919fc8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:38 +0400 Subject: [PATCH 0927/1120] bangarang-2.1 --- pkgs/applications/video/bangarang/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 2fe4b4d0bdc2..0bc7476dc820 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }: stdenv.mkDerivation rec { - name = "bangarang-2.0"; + name = "bangarang-2.1"; src = fetchurl { url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; - sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz"; + sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; }; - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ]; + buildInputs = [ kdelibs phonon soprano shared_desktop_ontologies kdemultimedia taglib gettext ]; + buildNativeInputs = [ cmake ]; meta = with stdenv.lib; { description = "A media player for KDE based on Nepomuk and Phonon"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://bangarangkde.wordpress.com/; license = "GPLv3"; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; } From 7a9def28299abcbeb03161abfba53f71ca486944 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:11:41 +0400 Subject: [PATCH 0928/1120] LibreOffice-3.6.0.4 * Use more system libraries * Enable KDE4 desktop integration * Split preparation between postUnpack, patchPhase and preConfigure Viric, feel free to revert (parts of) this commit. --- .../openoffice/generate-libreoffice-srcs.sh | 22 +- .../office/openoffice/libreoffice-srcs.nix | 588 +++++++++--------- .../office/openoffice/libreoffice.nix | 154 ++--- 3 files changed, 390 insertions(+), 374 deletions(-) diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh index 1d751ec7049e..fb8cc8161145 100644 --- a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh +++ b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh @@ -2,17 +2,19 @@ # Take the list of files from the main package, ooo.lst.in -echo '{fetchurl} : [' +cat < Date: Wed, 8 Aug 2012 13:45:40 +0400 Subject: [PATCH 0929/1120] KDevelop-4.3.1 --- pkgs/applications/editors/kdevelop/default.nix | 12 ++++++++++-- pkgs/development/libraries/kdevplatform/default.nix | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index 92b4da5280ac..249ede5ebd0e 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -3,18 +3,26 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.3.0"; + version = "4.3.1"; pname = "kdevelop"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0vb2f5922r1da4va8sx2qn2i1lf2gqg7nfg594kncy98a9b1avnr"; + sha256 = "0015hv39rqhyq1w6jw65lx7ls4l5pc3a2asvd5zsd65831vrfxxs"; }; buildInputs = [ kdevplatform kdebase_workspace okteta ]; buildNativeInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; + patches = + [ ( fetchurl { + url = https://git.reviewboard.kde.org/r/105211/diff/raw/; + name = "okteta-0.9.patch"; # fixes build with KDE-4.9.x + sha256 = "1mvqhw7jr1vi66l3jgam3slyfafcvwy4g3iapfi69dpfnzhmcxl0"; + } ) + ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 10aa4c02028b..367987d5dee4 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -2,11 +2,11 @@ gettext, pkgconfig, apr, aprutil, boost, qjson }: stdenv.mkDerivation rec { - name = "kdevplatform-1.3.0"; + name = "kdevplatform-1.3.1"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.3.0/src/${name}.tar.bz2"; - sha256 = "0afka8999csyj8hbgmcsbn8h2by04v7n8k4mrwkl0b79crdvwbcd"; + url = "mirror://kde/stable/kdevelop/4.3.1/src/${name}.tar.bz2"; + sha256 = "1fiqwabw5ilhw1jwvvr743dym12y3kxrs3zlqahz57yncdsglcl6"; }; propagatedBuildInputs = [ kdelibs qt4 phonon ]; From 1de042802022f15c6a359ad5fff9411022f4854f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:47:10 +0400 Subject: [PATCH 0930/1120] KTorrent-4.2.1 --- .../networking/p2p/ktorrent/default.nix | 6 +- .../drop-taskmanager-dependency.patch | 175 ------------------ .../libraries/libktorrent/default.nix | 6 +- 3 files changed, 6 insertions(+), 181 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 5f15cbc495f0..b408f20b7110 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g"; + sha256 = "1b6w7i1vvq8mlw9yrlxvb51hvaj6rpl8lv9b9zagyl3wcanz73zd"; }; - patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ]; + patches = [ ./find-workspace.diff ]; KDEDIRS = libktorrent; diff --git a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch b/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch deleted file mode 100644 index 2998b3926798..000000000000 --- a/pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch +++ /dev/null @@ -1,175 +0,0 @@ -commit 6d4a6ae51692966862ccb20d17cb217717519d40 -Author: Joris Guisson -Date: Wed Nov 23 20:17:08 2011 +0100 - - Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager. - - BUG: 287309 -Changelog removed by Yury G. Kudryashov - -diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt -index 3a72241..4307cf2 100644 ---- a/plasma/applet/CMakeLists.txt -+++ b/plasma/applet/CMakeLists.txt -@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK) - - else(NOT QT_VERSION_OK) - -- set(TASKMANAGER_FOUND FALSE) -- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h) -- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- -- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- set(TASKMANAGER_FOUND TRUE) -- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ") -- include_directories(${TASKMANAGER_INCLUDE_DIR}) -- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -- -- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -- -- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore) -- -- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY) -- -- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid") -+ -+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp) -+ -+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui) -+ -+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS}) -+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore) -+ -+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR}) -+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - endif(NOT QT_VERSION_OK) -diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp -index 59e7191..bf09479 100644 ---- a/plasma/applet/applet.cpp -+++ b/plasma/applet/applet.cpp -@@ -21,6 +21,9 @@ - #include "applet.h" - #include - #include -+#include -+#include -+#include - #include - #include - #include -@@ -31,12 +34,11 @@ - #include - #endif - #include --#include --#include - #include - #include "chunkbar.h" - #include "fadingnavigationwidget.h" - -+ - using namespace bt; - - namespace ktplasma -@@ -174,7 +176,8 @@ namespace ktplasma - } - } - -- void Applet::updateNavigation() { -+ void Applet::updateNavigation() -+ { - navigation->setEnabled(connected_to_app && !sources.empty() - && (sources.count() > 1 || !sources.contains(current_source))); - } -@@ -193,12 +196,14 @@ namespace ktplasma - } - } - -- void Applet::updateSources() { -+ void Applet::updateSources() -+ { - sources = engine->sources(); - sources.removeOne("core"); - } - -- void Applet::setSource(QString source) { -+ void Applet::setSource(QString source) -+ { - if (!current_source.isEmpty()) - engine->disconnectSource(current_source,this); - clearData(); -@@ -340,20 +345,39 @@ namespace ktplasma - - void Applet::iconClicked() - { -- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks(); -- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++) -+ QDBusConnection session_bus = QDBusConnection::sessionBus(); -+ QDBusConnectionInterface* dbus_service = session_bus.interface(); -+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent")) - { -- if (i.value()->className() == "ktorrent") -- { -- KWindowSystem::activateWindow(i.key()); -- return; -- } -+ // can't find the window, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId"); -+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000); -+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this); -+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*))); - } -- -- // can't find the window, try launching it -- KUrl::List empty; -- KRun::run("ktorrent", empty, 0); - } -+ -+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self) -+ { -+ if (self->isError()) -+ { -+ // call failed, try launching it -+ KUrl::List empty; -+ KRun::run("ktorrent", empty, 0); -+ } -+ else -+ { -+ QDBusPendingReply reply = *self; -+ KWindowSystem::activateWindow(reply.value()); -+ } -+ self->deleteLater(); -+ } -+ - - void Applet::clearData() - { -diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h -index 29b3265..d396118 100644 ---- a/plasma/applet/applet.h -+++ b/plasma/applet/applet.h -@@ -27,6 +27,7 @@ - #include "fadingnavigationwidget.h" - - class QGraphicsLinearLayout; -+class QDBusPendingCallWatcher; - - namespace Plasma - { -@@ -68,6 +69,7 @@ namespace ktplasma - void iconClicked(); - void selectPrev(); - void selectNext(); -+ void dbusCallFinished(QDBusPendingCallWatcher* self); - - private: - void updateTorrentCombo(); diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 1f50f1b976bf..083fbf13c817 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -2,8 +2,8 @@ , phonon, libgcrypt }: let - mp_ = "1.3"; - version = "1.${mp_}"; + mp_ = "2.1"; + version = "1.${mp_}-2"; version4 = "4.${mp_}"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2"; - sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n"; + sha256 = "1b4ibkba27ivvjsh5s93xwlcgzvvwsgl6mcd8g96d1al05n2ccw9"; }; buildNativeInputs = [ cmake automoc4 gettext ]; From abf6366f87efa94138c034a4e138a78ed01127e0 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 31 Aug 2012 10:55:23 +0200 Subject: [PATCH 0931/1120] Add surfraw 2.2.8 --- pkgs/tools/networking/surfraw/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/surfraw/default.nix diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix new file mode 100644 index 000000000000..6fcc031aab4b --- /dev/null +++ b/pkgs/tools/networking/surfraw/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, perl}: + +stdenv.mkDerivation rec { + name = "surfraw-2.2.8"; + + src = fetchurl { + url = "http://surfraw.alioth.debian.org/dist/surfraw-2.2.8.tar.gz"; + sha256 = "925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec"; + }; + + configureFlags = [ + "--disable-opensearch" + ]; + + buildNativeInputs = [ perl ]; + + meta = { + description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; + homepage = "http://surfraw.alioth.debian.org"; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc56479723c..90d526a929dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1493,6 +1493,8 @@ let su = shadow; + surfraw = callPackage ../tools/networking/surfraw { }; + swec = callPackage ../tools/networking/swec { inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; }; From 04f242e2812f4af24630806084b154ea329ce187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 31 Aug 2012 11:50:04 +0200 Subject: [PATCH 0932/1120] Set `noSysDirs' to `false' on non-GNU/Linux platforms. --- pkgs/top-level/all-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d526a929dd..473c6a003934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21,10 +21,12 @@ # null, the default standard environment is used. bootStdenv ? null -, # Darwin is an "impure" platform, with its libc outside of the store. - # Thus, GCC, GFortran, & co. must always look for files in standard system - # directories (/usr/include, etc.) - noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin") +, # Non-GNU/Linux OSes are currently "impure" platforms, with their libc + # outside of the store. Thus, GCC, GFortran, & co. must always look for + # files in standard system directories (/usr/include, etc.) + noSysDirs ? (system != "x86_64-darwin" && system != "i686-darwin" + && system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. , gccWithCC ? true From 66bb38cce3c8498ff9135a46566f7b645953e53d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 12:25:53 +0200 Subject: [PATCH 0933/1120] Add area53 --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 637d53b06f76..d76215961f2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -138,6 +138,20 @@ let pythonPackages = python.modules // rec { }; + area53 = buildPythonPackage (rec { + name = "area53-b2c9cdcabd"; + + src = fetchgit { + url = git://github.com/mariusv/Area53.git; + rev = "b2c9cdcabd"; + sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc"; + }; + installCommand = "python setup.py install --prefix=$out"; + doCheck = false; + propagatedBuildInputs = [ boto ]; + }); + + argparse = buildPythonPackage (rec { name = "argparse-1.1"; @@ -169,6 +183,7 @@ let pythonPackages = python.modules // rec { }; }); + astng = buildPythonPackage rec { name = "logilab-astng-0.21.1"; From addbf658e5d793e23da7935c6e8a7ed448a3bfa4 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:01:19 +0200 Subject: [PATCH 0934/1120] Add maintainer --- pkgs/tools/misc/plowshare/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index e3463c6a1d40..4ee6a84548b0 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -30,5 +30,6 @@ in stdenv.mkDerivation { A command-line download/upload tool for popular file sharing websites ''; license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.aforemny ]; }; } From c98559a6fc7012cc556c0bca32f23ec01f16dd1f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:02:10 +0200 Subject: [PATCH 0935/1120] Remove curl from buildInputs --- pkgs/tools/misc/plowshare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 4ee6a84548b0..5e684cfa377f 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; }; - buildInputs = [ makeWrapper curl ]; + buildInputs = [ makeWrapper ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; From fbbaf6759d869216d7c1eccf7dffd93378734e16 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 23:22:04 +0200 Subject: [PATCH 0936/1120] Update google talk plugin --- .../google-talk-plugin/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index ff199791bba8..5e9724b939cb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo , libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl -, dbus_glib, alsaLib, pulseaudio, udev +, dbus_glib, alsaLib, pulseaudio, udev, pango }: with stdenv.lib; let - baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; + baseURL = "http://dl.google.com/linux/direct/"; rpathPlugin = makeLibraryPath [ mesa @@ -37,24 +37,26 @@ let dbus_glib udev curl + pango + cairo ]; in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.2.4.0"; + version = "3.5.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0hd8iyv092fr4bz760xjawiad581hphddv608d0dvzy2bhnl17g1"; + url = "${baseURL}/google-talkplugin_current_amd64.deb"; + sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "13vqs4k16a6bzc5i4zpnakh31nkdqp7m9cv7p16r1sq5smv1331i"; + url = "${baseURL}/google-talkplugin_current_i386.deb"; + sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; } else throw "Google Talk does not support your platform."; From fcfa8908ca768113728b137ccaccaba9e0ff8ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 Sep 2012 00:10:43 +0200 Subject: [PATCH 0937/1120] miniupnpc: update to 1.7. --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 34ec8eed90ea..3cd35073be6e 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "miniupnpc-1.6"; + name = "miniupnpc-1.7"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv"; + sha256 = "0dv3mz4yikngmlnrnmh747mlgbbpijryw03wcs8g4jwvprb29p8n"; }; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; From 4add07db0c7feb62c76c071a7c5260e19137b90f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Sep 2012 09:55:59 +0400 Subject: [PATCH 0938/1120] Firefox: add 15.0 version --- .../networking/browsers/firefox/15.0.nix | 179 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 186 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/15.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix new file mode 100644 index 000000000000..549034963914 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -0,0 +1,179 @@ +{ 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 = "15.0"; + + xulVersion = "15.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--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 = true; + + preConfigure = + '' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" + + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; # */ + + #installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + rm xulrunner + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + echo -e '#! /bin/sh\n"'"$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 + for j in $out/bin/*; do + i="$(readlink "$j")"; + file $i; + if file $i | grep executable &>/dev/null; then + rm "$out/bin/$(basename "$i")" + echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" + chmod a+x "$out/bin/$(basename "$i")" + fi; + done; + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${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 5a027d3dffe8..7994649cfe4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6909,6 +6909,13 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = flashplayer11; From fdf82b66e76e87e074c9a70b5efcff2a477797c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 1 Sep 2012 10:27:41 +0400 Subject: [PATCH 0939/1120] Falling Sand Game: use a mirror --- pkgs/games/fsg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index ba6b65d602b4..b2210141f574 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation { name = "fsg-4.4"; src = fetchurl { - url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; + #url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; + url = http://www.sourcefiles.org/Games/Simulation/Other/fsg-src-4.4.tar.gz; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; }; From 36619822a1545d4eff59b8de9670ba7821d64069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 Sep 2012 16:39:13 +0200 Subject: [PATCH 0940/1120] firefox15: Telling hydra to build it --- pkgs/applications/networking/browsers/firefox/15.0.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 549034963914..186f9602f0a0 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -169,6 +169,7 @@ rec { description = "Mozilla Firefox - the browser, reloaded"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = with stdenv.lib.platforms; linux; }; passthru = { From ac8dd727d077120099db60a40d768c32de74a6f7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 1 Sep 2012 21:36:46 +0200 Subject: [PATCH 0941/1120] Restore google talk plugin versioned url, now it seems to work again. --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 5e9724b939cb..a3f255b5d3e5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let - baseURL = "http://dl.google.com/linux/direct/"; + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath [ mesa @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_current_amd64.deb"; + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "${baseURL}/google-talkplugin_current_i386.deb"; + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; } else throw "Google Talk does not support your platform."; From 6bff8651552a1155645e452b6392e6e129360e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Sep 2012 09:06:14 +0200 Subject: [PATCH 0942/1120] mono: fixing build it looks like it doesn't like parallel builds. --- pkgs/development/compilers/mono/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 2f257fccc52d..f59bb2cac403 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation { # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; - enableParallelBuilding = true; + # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 + enableParallelBuilding = false; preBuild = " makeFlagsArray=(INSTALL=`type -tp install`) From 724451668c33530cce944bfb336566b6ab59979d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 2 Sep 2012 10:45:16 +0200 Subject: [PATCH 0943/1120] firefox15: trying another way of telling hydra to build it --- pkgs/applications/networking/browsers/firefox/15.0.nix | 1 - pkgs/top-level/release.nix | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 186f9602f0a0..549034963914 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -169,7 +169,6 @@ rec { description = "Mozilla Firefox - the browser, reloaded"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = with stdenv.lib.platforms; linux; }; passthru = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d8e192a6e550..68c387d2a55c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -361,6 +361,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; firefox13Pkgs.firefox = linux; + firefox15Pkgs.firefox = linux; gnome = { gnome_panel = linux; From 7672f20121383656e1950c49af8960f8e4fd72d8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:23:38 +0200 Subject: [PATCH 0944/1120] gogoclient: fix url and lower default metric this allows other routes to take precedence over gogonet --- pkgs/os-specific/linux/gogoclient/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index d1a4bf9feb65..4328eb36b6dc 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --replace "/sbin/route" "${nettools}/sbin/route" \ --replace "/sbin/ip" "${iproute}/sbin/ip" \ --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh ''; meta = { From 8277c18b5395a0a3329230d63a67746a96665917 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:53:58 +0200 Subject: [PATCH 0945/1120] vnstat: upgrade to 1.11 --- pkgs/applications/networking/vnstat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 69a0a7efde83..57afefd7dcdd 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "vnstat-1.9"; - + name = "vnstat-1.11"; + src = fetchurl { - url = http://humdi.net/vnstat/vnstat-1.9.tar.gz; - sha256 = "1migym0wig1s3b7d22ipxkd1p78sqc89dwx82qbf5hsb5q2fk4q1"; + url = "http://humdi.net/vnstat/${name}.tar.gz"; + sha256 = "09p0mlf49zzmh6jzwyvzd9k3jv7bl8i6w8xl65ns3dmv2zc7c65p"; }; installPhase = '' From 14c808baa782aac052ebf62dc35ca6e7250af19a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:18:13 +0200 Subject: [PATCH 0946/1120] haskell-haskeline: add version 0.7.0.2 --- .../haskeline/{default.nix => 0.6.4.7.nix} | 0 .../libraries/haskell/haskeline/0.7.0.2.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 ++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) rename pkgs/development/libraries/haskell/haskeline/{default.nix => 0.6.4.7.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskeline/default.nix rename to pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix new file mode 100644 index 000000000000..b58152f7c24d --- /dev/null +++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix @@ -0,0 +1,16 @@ +{ cabal, filepath, terminfo, transformers }: + +cabal.mkDerivation (self: { + pname = "haskeline"; + version = "0.7.0.2"; + sha256 = "0mmflw8mslvif8w1app4zwrlpynpfvzqdb9srs6bgicawwgkb2r0"; + buildDepends = [ filepath terminfo transformers ]; + configureFlags = "-fterminfo"; + meta = { + homepage = "http://trac.haskell.org/haskeline"; + description = "A command-line interface for user input, written in Haskell"; + 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 908d68577941..eea0ea7adb01 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -386,6 +386,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Agda = callPackage ../development/libraries/haskell/Agda { haskellSrcExts = self.haskellSrcExts_1_11_1; + haskeline = self.haskeline_0_6_4_7; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -811,7 +812,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hashtables = callPackage ../development/libraries/haskell/hashtables {}; - haskeline = callPackage ../development/libraries/haskell/haskeline {}; + haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {}; + haskeline_0_7_0_2 = callPackage ../development/libraries/haskell/haskeline/0.7.0.2.nix {}; + haskeline = self.haskeline_0_7_0_2; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -879,7 +882,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; - hledger = callPackage ../development/libraries/haskell/hledger {}; + hledger = callPackage ../development/libraries/haskell/hledger { + haskeline = self.haskeline_0_6_4_7; + }; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; @@ -1739,6 +1744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); darcs = callPackage ../applications/version-management/darcs { tar = self.tar_0_3_2_0; + haskeline = self.haskeline_0_6_4_7; }; leksah = callPackage ../applications/editors/leksah { From 267e268a31afae7d23dd93579374fa8f28eaf719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:16 +0200 Subject: [PATCH 0947/1120] haskell-HTTP: add version 4000.2.4 --- .../libraries/haskell/HTTP/4000.2.4.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.4.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix new file mode 100644 index 000000000000..6f7b57ba64c1 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.4"; + sha256 = "1riqz69mnzl2xnbkk8s798xkizvcly3hcpigshbhpa57q016labi"; + buildDepends = [ mtl network parsec ]; + meta = { + homepage = "https://github.com/haskell/HTTP"; + description = "A library for client-side HTTP"; + 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 eea0ea7adb01..cce03161d4eb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -125,7 +125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_1_2_1; # 7.5 fail haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok html = self.html_1_0_1_2; # 7.5 ok - HTTP = self.HTTP_4000_2_3; # 7.5 ok + HTTP = self.HTTP_4000_2_4; # 7.5 ok HUnit = self.HUnit_1_2_5_1; # 7.5 ok mtl = self.mtl_2_1_2; # 7.5 ok network = self.network_2_3_1_0; # 7.5 ok @@ -844,7 +844,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {}; 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 = self.HTTP_4000_2_3; + HTTP_4000_2_4 = callPackage ../development/libraries/haskell/HTTP/4000.2.4.nix {}; + HTTP = self.HTTP_4000_2_4; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From 1637d95fffc6411cefdc9ed1faba088cce09a7ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:35 +0200 Subject: [PATCH 0948/1120] haskell-date-cache: add version 0.3.0 --- .../libraries/haskell/date-cache/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/date-cache/default.nix diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix new file mode 100644 index 000000000000..a460dcbdafc5 --- /dev/null +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "date-cache"; + version = "0.3.0"; + sha256 = "0grhcbd0rhdn0cf1fz82x8pv8cmxfhndlcwyrax4mnnr3pql9kmb"; + meta = { + description = "Date cacher"; + 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 cce03161d4eb..f90e16abe02d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -607,6 +607,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataReify = callPackage ../development/libraries/haskell/data-reify {}; + dateCache = callPackage ../development/libraries/haskell/date-cache {}; + datetime = callPackage ../development/libraries/haskell/datetime {}; deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; From e9abf1899a70b3c9420b57edf1779a29cbc2bc37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:10 +0200 Subject: [PATCH 0949/1120] haskell-hledger: patch to support recent versions of cmdargs --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 2 +- pkgs/development/libraries/haskell/hledger/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 644406ae1ec0..de2e40a03d52 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -11,7 +11,7 @@ cabal.mkDerivation (self: { split time transformers utf8String ]; patchPhase = '' - sed -i -e 's|,split.*|,split|' hledger-lib.cabal + sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger-lib.cabal ''; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index efc2936f4063..a02697be7c23 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { regexpr safe shakespeareText split text time utf8String ]; patchPhase = '' - sed -i -e 's|,split.*|,split|' hledger.cabal + sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger.cabal ''; meta = { homepage = "http://hledger.org"; From f11475eaa8c33068139e73e62f6d3e0bf4753e08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0950/1120] haskell-cmdargs: update to version 0.10 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 38b0bf24bcb0..0719bf5a03cc 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.9.7"; - sha256 = "0w3y94hjq5w1i2vcj45jfdbi1iadib2nsv0pa3w9dmqvn9wxlvz4"; + version = "0.10"; + sha256 = "1xx4cks3hr2ldb0hd5hnc53dpns2zm4gc1dw25gs1vc977kga3hz"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 1505130da1cbe6a2a4088ead5ba784858bfebf12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0951/1120] haskell-fingertree: update to version 0.0.1.1 --- pkgs/development/libraries/haskell/fingertree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 71afad2cdbc9..299b2e926dbd 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fingertree"; - version = "0.0.1.0"; - sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; + version = "0.0.1.1"; + sha256 = "00llr24b2r539250fangl0jj39gf26gjwvhjpy5qg8l920hrjn78"; meta = { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; From 02d27b8a026b86a9bf2fcf5432830f27dc180696 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0952/1120] haskell-iteratee: update to version 0.8.9.3 --- pkgs/development/libraries/haskell/iteratee/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 14c125121bde..bc99a88895b3 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -4,10 +4,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.1"; - sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax"; - isLibrary = true; - isExecutable = true; + version = "0.8.9.3"; + sha256 = "1abm7f7ymzw9sa625f40sj4510sbpyplybpgb5a229sq8118dbh0"; buildDepends = [ ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase From 40431dfcd4631a2d9ab364a98af4118fec215ff3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0953/1120] haskell-tls: update to version 0.9.10 --- 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 d440d9422773..2154aa347d22 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 = "0.9.9"; - sha256 = "0l29ja7mcyykj4dh7awjbrb9aswgarxls71vk68pdfaz047jsvx6"; + version = "0.9.10"; + sha256 = "1kiwb5skirdla32gjicgmjyk09p8f701jgs6krxbi38gmmfj1dxf"; isLibrary = true; isExecutable = true; buildDepends = [ From a683b2f6b4a8e3a13e9edc3257472339c81afc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Sep 2012 15:10:11 +0200 Subject: [PATCH 0954/1120] libreoffice: update to 3.6.1.2 I've not tried if it works; I'll revert it if it fails. --- .../office/openoffice/libreoffice-srcs.nix | 4 ++++ pkgs/applications/office/openoffice/libreoffice.nix | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice-srcs.nix b/pkgs/applications/office/openoffice/libreoffice-srcs.nix index 8cbaa37553e4..47630e5cfdf3 100644 --- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix @@ -367,4 +367,8 @@ name = "lcms2-2.3.tar.gz"; md5 = "327348d67c979c88c2dec59a23a17d85"; } +{ + name = "libvisio-0.0.19.tar.bz2"; + md5 = "94e7f271e38c976462558b4278590178"; +} ] diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index 6df0c3a7d254..b45ac5dd309f 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -16,8 +16,8 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "3"; minor = "6"; - patch = "0"; - tweak = "4"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}.${tweak}"; fetchThirdParty = {name, md5}: fetchurl { @@ -36,17 +36,17 @@ let }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "e1603dbaa90ef027ea73e81a9ffa1ec86d311a40fd7aee6b08edd3fa86a19edb"; + sha256 = "0id4ad8h3fl4s2ax6r4w4af74xvagkv0qwy50f483lqq3a3pl7fl"; }; help = fetchSrc { name = "help"; - sha256 = "30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8"; + sha256 = "0jd3l3rkhmdvrvgklkmrh9zsg9hlv3vhy6s97fnzhpzr90sjqrs1"; }; core = fetchSrc { name = "core"; - sha256 = "b301eac605830ed6423cbab49d99ff5ca3999ed8ad53f51766c715d49d09cd4d"; + sha256 = "12zc0zviy1p3gk1v5nm4ks4rzscn68lpnl3kis4q693zhsk8jyh3"; }; }; in From 510b86f38786569119a9cd8388fcb5126a22718e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 Sep 2012 15:53:07 +0200 Subject: [PATCH 0955/1120] libreoffice: trying to enable parallel building I use the nix approach about the number of cores, as enableParallelBuilding. --- pkgs/applications/office/openoffice/libreoffice.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index b45ac5dd309f..d336266ccaf1 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { QT4DIR = qt4; KDE4DIR = kde4.kdelibs; + # I set --with-num-cpus=$NIX_BUILD_CORES, as it's the equivalent of + # enableParallelBuilding=true in this build system. preConfigure = '' # Needed to find genccode PATH=$PATH:${icu}/sbin - configureFlagsArray=("--with-lang=${langsSpaces}") + configureFlagsArray=("--with-lang=${langsSpaces}" "--with-num-cpus=$NIX_BUILD_CORES") ''; makeFlags = "SHELL=${bash}/bin/bash"; @@ -117,7 +119,6 @@ stdenv.mkDerivation rec { configureFlags = [ #"--enable-verbose" - "--with-max-jobs=1" "--with-num-cpus=1" # Without these, configure does not finish "--without-junit" From da01cdaa8270e0f788faed6d41bebc659eb2c6b4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Sep 2012 09:32:59 +0400 Subject: [PATCH 0956/1120] Update Julia to latest revision, include zlib in dependencies --- pkgs/development/compilers/julia/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 2484be9ae1f7..c1b607b725b8 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack } : @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120818"; + date = "20120904"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,17 +54,17 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "4f692899688f500c77d768f67748f4b7335c90eb"; - sha256 = "a60e684a5283e80619f28ec8ff16fdc76c549e8463059507b0819db09dae6688"; + rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9"; + sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828"; }; - buildInputs = [ gfortran perl m4 gmp pcre llvm readline + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf openblas liblapack ]; configurePhase = '' - for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD; + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB; do sed -e "s@USE_SYSTEM_$i=0@USE_SYSTEM_$i=1@" -i Make.inc; done @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { copy_kill_hash "${dsfmt_src}" deps/random ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring "''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz "''} sed -e 's@ cpp @ gcc -E @g' -i base/Makefile From 449230335dff460184887b784ee3e751194fc6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 4 Sep 2012 09:59:26 +0200 Subject: [PATCH 0957/1120] sipwitch: update to 1.2.4 --- pkgs/servers/sip/sipwitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 7fa9a62e5e3f..097dde325f19 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.2.3"; + name = "sipwitch-1.2.4"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d"; + sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; From 264c528154364841730d9ab29128effb0da674e8 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 4 Sep 2012 12:02:18 +0200 Subject: [PATCH 0958/1120] Upgrade PolyML to version 5.4.1 --- pkgs/development/compilers/polyml/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 9a3d0a7deb4d..2654fd513e54 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -1,16 +1,15 @@ {stdenv, fetchurl}: let - pname = "polyml"; - version = "5.4"; + version = "5.4.1"; in stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "polyml-${version}"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}.${version}.tar.gz"; - sha256 = "1ykbm4zk260dkdr8jl7mjaqxy98h65fq0z82k44b1fp5q8zy5d34"; + url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; + sha256 = "514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac"; }; meta = { @@ -19,7 +18,7 @@ stdenv.mkDerivation { Poly/ML is a full implementation of Standard ML. ''; homepage = http://www.polyml.org/; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl; platforms = with stdenv.lib.platforms; linux; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z From 286d068b37be4f76d546328b7fedf4f3d82acbc5 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 4 Sep 2012 14:34:31 +0200 Subject: [PATCH 0959/1120] Upgrade Isabelle proof assistant to version 2012 --- pkgs/applications/science/logic/isabelle/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 4a268cac6455..bbc868910f57 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -2,9 +2,7 @@ # nettools needed for hostname let - pname = "Isabelle"; - version = "2011"; - name = "${pname}${version}"; + name = "Isabelle2012"; theories = ["HOL" "FOL" "ZF"]; in @@ -12,8 +10,8 @@ stdenv.mkDerivation { inherit name theories; src = fetchurl { - url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz; - sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a"; + url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz; + sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq"; }; buildInputs = [ perl polyml nettools ]; From 6cdb98a140263e36cd1127fe524aa65b815023d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 4 Sep 2012 15:50:47 +0200 Subject: [PATCH 0960/1120] valgrind: update to 3.8.0 --- pkgs/development/tools/analysis/valgrind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a625de6ffdce..a5042ffc7d46 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation (rec { - name = "valgrind-3.7.0"; + name = "valgrind-3.8.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx"; + sha256 = "1310lxmzidrbv0l3hrf45ampkf61gv2vb8msnqm684lp41gmh5px"; }; # Perl is needed for `cg_annotate'. From b3c63a98f079fbcad2fa44b57c8edc8916362ba4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 4 Sep 2012 16:14:01 +0200 Subject: [PATCH 0961/1120] Remove all svn references --- doc/language-support.xml | 8 ++++---- doc/meta.xml | 2 +- doc/package-notes.xml | 6 +++--- doc/quick-start.xml | 41 ++++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/doc/language-support.xml b/doc/language-support.xml index dc63dd685038..47729a1b4ba9 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter. Nixpkgs provides a function buildPerlPackage, a generic package builder function for any Perl package that has a standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic">pkgs/development/perl-modules/generic. Perl packages from CPAN are defined in pkgs/perl-packages.nix, +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/perl-packages.nix, rather than pkgs/all-packages.nix. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package @@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec { which many Python packages do nowadays, can be built very simply using the buildPythonPackage function. This function is implemented - in pkgs/development/python-modules/generic/default.nix + in pkgs/development/python-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) @@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec { Python packages that use buildPythonPackage are defined - in pkgs/top-level/python-packages.nix. + in pkgs/top-level/python-packages.nix. Most of them are simple. For example: diff --git a/doc/meta.xml b/doc/meta.xml index 8ed91d9a8c8c..30b5ad247d16 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -103,7 +103,7 @@ interpretation: <alice@example.org>" "Bob <bob@example.com>"]. If you are the maintainer of multiple packages, you may want to add yourself to pkgs/lib/maintainers.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/lib/maintainers.nix">pkgs/lib/maintainers.nix and write something like [stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob]. diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 9d2cd0ef16b7..6dae036b3382 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -16,7 +16,7 @@ Linux kernel or X.org. Linux kernel The Nix expressions to build the Linux kernel are in pkgs/os-specific/linux/kernel. +xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel">pkgs/os-specific/linux/kernel. The function that builds the kernel has an argument kernelPatches which should be a list of @@ -49,7 +49,7 @@ modulesTree = [kernel] - Copy (svn cp) the old Nix expression + Copy the old Nix expression (e.g. linux-2.6.21.nix) to the new one (e.g. linux-2.6.22.nix) and update it. @@ -69,7 +69,7 @@ modulesTree = [kernel] - Make an svn copy from the old + Make an copy from the old config (e.g. config-2.6.21-i686-smp) to the new one (e.g. config-2.6.22-i686-smp). diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 2651e2a1eee0..dddbbb4a19ec 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -12,7 +12,7 @@ Checkout the Nixpkgs source tree: -$ svn checkout https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs +$ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs @@ -29,7 +29,7 @@ $ cd nixpkgs organisation. Create a directory for your package, e.g. -$ svn mkdir pkgs/development/libraries/libfoo +$ mkdir pkgs/development/libraries/libfoo @@ -44,7 +44,7 @@ $ svn mkdir pkgs/development/libraries/libfoo $ emacs pkgs/development/libraries/libfoo/default.nix -$ svn add pkgs/development/libraries/libfoo/default.nix +$ git add pkgs/development/libraries/libfoo/default.nix @@ -56,7 +56,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU cpio: pkgs/tools/archivers/cpio/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix">pkgs/tools/archivers/cpio/default.nix. The simplest possible package. The generic builder in stdenv does everything for you. It has no dependencies beyond stdenv. @@ -64,21 +64,21 @@ $ svn add pkgs/development/libraries/libfoo/default.nix GNU Hello: pkgs/applications/misc/hello/ex-2/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/ex-2/default.nix">pkgs/applications/misc/hello/ex-2/default.nix. Also trivial, but it specifies some meta attributes which is good practice. GNU Multiple Precision arithmetic library (GMP): pkgs/development/libraries/gmp/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/default.nix">pkgs/development/libraries/gmp/default.nix. Also done by the generic builder, but has a dependency on m4. Pan, a GTK-based newsreader: pkgs/applications/networking/newsreaders/pan/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix">pkgs/applications/networking/newsreaders/pan/default.nix. Has an optional dependency on gtkspell, which is only built if spellCheck is true. @@ -86,7 +86,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Apache HTTPD: pkgs/servers/http/apache-httpd/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/default.nix">pkgs/servers/http/apache-httpd/default.nix. A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. @@ -94,9 +94,9 @@ $ svn add pkgs/development/libraries/libfoo/default.nix BitTorrent (wxPython-based): pkgs/tools/networking/p2p/bittorrent/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/default.nix">pkgs/tools/networking/p2p/bittorrent/default.nix. Uses an external build + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/networking/p2p/bittorrent/builder.sh">build script, which can be useful if you have lots of code that you don’t want cluttering up the Nix expression. But external builders are mostly obsolete. @@ -105,22 +105,22 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Thunderbird: pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix">pkgs/applications/networking/mailreaders/thunderbird/3.x.nix. Lots of dependencies. JDiskReport, a Java utility: pkgs/tools/misc/jdiskreport/default.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix">pkgs/tools/misc/jdiskreport/default.nix (and the builder). + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder). Nixpkgs doesn’t have a decent stdenv for Java yet so this is pretty ad-hoc. XML::Simple, a Perl module: pkgs/top-level/perl-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/top-level/perl-packages.nix (search for the XMLSimple attribute). Most Perl modules are so simple to build that they are defined directly in perl-packages.nix; @@ -129,10 +129,10 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Adobe Reader: pkgs/applications/misc/adobe-reader/default.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix">pkgs/applications/misc/adobe-reader/default.nix. Shows how binary-only packages can be supported. In particular the builder + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder uses patchelf to set the RUNPATH and ELF interpreter of the executables so that the right libraries are found at runtime. @@ -163,7 +163,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix A list of schemes for mirror:// URLs can be found in pkgs/build-support/fetchurl/mirrors.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix">pkgs/build-support/fetchurl/mirrors.nix. @@ -181,7 +181,7 @@ $ svn add pkgs/development/libraries/libfoo/default.nix Add a call to the function defined in the previous step to pkgs/top-level/all-packages.nix + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix">pkgs/top-level/all-packages.nix with some descriptive name for the variable, e.g. libfoo. @@ -220,8 +220,7 @@ $ nix-env -f . -iA libfoo - Optionally commit the new package (svn - ci) or send a patch to + Optionally commit the new package, or send a patch to nix-dev@cs.uu.nl. @@ -230,7 +229,7 @@ $ nix-env -f . -iA libfoo package and make them available in the nixpkgs channel, add it to pkgs/top-level/release.nix. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix">pkgs/top-level/release.nix. From 2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:40:05 +0200 Subject: [PATCH 0962/1120] org-mode: upgrade to 7.9.1 --- .../editors/emacs-modes/org/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index fb4de650ee01..d3829bc9d115 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -1,30 +1,24 @@ -{ fetchurl, stdenv, emacs, texinfo, which }: +{ fetchurl, stdenv, emacs, texinfo, which, texLive }: stdenv.mkDerivation rec { - name = "org-7.8.03"; + name = "org-7.9.1"; src = fetchurl { url = "http://orgmode.org/${name}.tar.gz"; - sha256 = "49357cca7d892e70cd2dfcc0b5d96d9fd164ef5a1f251ace3865ecb27dc1e958"; + sha256 = "0kz1dnzfpmmslwal150z9rxrnddjpaw2glx26qihpxzs0zzpw201"; }; - buildInputs = [ emacs texinfo ]; - - patchPhase = - '' sed -i "lisp/org-clock.el" -e's|"which"|"${which}/bin/which"|g' - ''; + buildInputs = [ emacs ]; + buildNativeInputs = [ texinfo texLive ]; configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g" + '' sed -i mk/default.mk \ + -e "s|^prefix\t=.*$|prefix=$out|g" ''; - #XXX: fails because of missing UTILITIES/manfull.pl, currently not - # included in the release tarball, but git. - - #postBuild = - # '' make doc - # ''; + postBuild = + '' make doc + ''; installPhase = '' make install install-info From 39760a2ad6cdb5a6ad9d657b6c64e3f349dc9fb5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:45:17 +0200 Subject: [PATCH 0963/1120] davfs2: upgrade to 1.4.7 - add option to disable the default user/group in the config file. If you only want to mount filesystems as root (don't use setuid root), the default is not very useful. This setting is not overridable from an external config file, so this needs to be done here. Perhaps it's possible to tell the package to look in system /etc, but that makes the install-phase try to put files there too. Would take quite some patching. --- pkgs/tools/filesystems/davfs2/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 8cc212deee47..ce4421f9ca7f 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, neon, zlib }: +{ stdenv, fetchurl, neon, zlib, noDavsUser ? false}: stdenv.mkDerivation rec { - name = "davfs2-1.4.5"; + name = "davfs2-1.4.7"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18"; + sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; }; + prePatch = stdenv.lib.optional noDavsUser '' + echo "dav_user root" >> etc/davfs2.conf + echo "dav_group root" >> etc/davfs2.conf + ''; + buildInputs = [ neon zlib ]; - - patches = [ ./davfs2-install.patch ./isdir.patch ]; + + patches = [ ./davfs2-install.patch ./isdir.patch ]; meta = { longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV."; From df82c942635c045658ea618438d8b433f79348c9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 13:46:54 +0200 Subject: [PATCH 0964/1120] node-packages: introduced alphabet --- pkgs/top-level/node-packages.nix | 524 +++++++++++++++---------------- 1 file changed, 262 insertions(+), 262 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 0ab4306cca07..ae468d95eace 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,221 +5,6 @@ let self = { inherit stdenv nodejs; }; - "coffee-script" = self."coffee-script-1.3.3"; - - "coffee-script-1.3.3" = self.buildNodePackage rec { - name = "coffee-script-1.3.3"; - src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; - }; - deps = [ - - ]; - }; - - "semver" = self."semver-1"; - - "semver-1" = self.buildNodePackage rec { - name = "semver-1.0.14"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/${name}.tgz"; - sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; - }; - deps = [ - - ]; - }; - - "npm2nix" = self."npm2nix-0.1.2"; - - "npm2nix-0.1.2" = self.buildNodePackage rec { - name = "npm2nix-0.1.2"; - src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; - sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; - name = "${name}.tgz"; - }; - deps = [ - self."semver-1" - ]; - }; - - "mkdirp" = self."mkdirp-0.3"; - - "mkdirp-0.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; - }; - deps = [ - - ]; - }; - - "nopt" = self."nopt-2"; - - "nopt-2" = self.buildNodePackage rec { - name = "nopt-2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; - sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; - }; - deps = [ - self."abbrev-1" - ]; - }; - - "graceful-fs" = self."graceful-fs-1"; - - "graceful-fs-1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "fstream" = self."fstream-~0.1.13"; - - "fstream-~0.1.13" = self.buildNodePackage rec { - name = "fstream-0.1.18"; - src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; - }; - deps = [ - self."rimraf-2" - self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" - ]; - }; - - "npmlog" = self."npmlog-0"; - - "npmlog-0" = self.buildNodePackage rec { - name = "npmlog-0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; - sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; - }; - deps = [ - self."ansi-~0.1.2" - ]; - }; - - "osenv" = self."osenv-0"; - - "osenv-0" = self.buildNodePackage rec { - name = "osenv-0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; - sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - }; - deps = [ - - ]; - }; - - "node-gyp" = self."node-gyp-*"; - - "node-gyp-*" = self.buildNodePackage rec { - name = "node-gyp-0.6.8"; - src = fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; - sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; - }; - deps = [ - self."glob-3" - self."graceful-fs-1" - self."fstream-~0.1.13" - self."minimatch-0.2" - self."mkdirp-0.3" - self."nopt-2" - self."npmlog-0" - self."osenv-0" - self."request-2.9" - self."rimraf-2" - self."semver-1" - self."tar-~0.1.12" - self."which-1" - ]; - }; - - "rimraf" = self."rimraf-2"; - - "rimraf-2" = self.buildNodePackage rec { - name = "rimraf-2.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; - sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; - }; - deps = [ - self."graceful-fs-~1.1" - ]; - }; - - "minimatch" = self."minimatch-0.2"; - - "minimatch-0.2" = self.buildNodePackage rec { - name = "minimatch-0.2.6"; - src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; - sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; - }; - deps = [ - self."lru-cache-~2.0.0" - ]; - }; - - "glob" = self."glob-3"; - - "glob-3" = self.buildNodePackage rec { - name = "glob-3.1.12"; - src = fetchurl { - url = "http://registry.npmjs.org/glob/-/${name}.tgz"; - sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; - }; - deps = [ - self."minimatch-0.2" - self."graceful-fs-~1.1.2" - self."inherits-1" - ]; - }; - - "tar" = self."tar-~0.1.12"; - - "tar-~0.1.12" = self.buildNodePackage rec { - name = "tar-0.1.13"; - src = fetchurl { - url = "http://registry.npmjs.org/tar/-/${name}.tgz"; - sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; - }; - deps = [ - self."inherits-1.x" - self."block-stream" - self."fstream-~0.1.8" - ]; - }; - - "which" = self."which-1"; - - "which-1" = self.buildNodePackage rec { - name = "which-1.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/which/-/${name}.tgz"; - sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; - }; - deps = [ - - ]; - }; - "abbrev" = self."abbrev-1"; "abbrev-1" = self.buildNodePackage rec { @@ -233,41 +18,6 @@ let self = { ]; }; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; - }; - deps = [ - - ]; - }; - - "request" = self."request-2.9"; - - "request-2.9" = self.buildNodePackage rec { - name = "request-2.9.203"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; - }; - deps = [ - - ]; - }; - - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ - - ]; - }; - "ansi" = self."ansi-~0.1.2"; "ansi-~0.1.2" = self.buildNodePackage rec { @@ -294,13 +44,71 @@ let self = { ]; }; - "lru-cache" = self."lru-cache-~2.0.0"; + "coffee-script" = self."coffee-script-1.3.3"; - "lru-cache-~2.0.0" = self.buildNodePackage rec { - name = "lru-cache-2.0.1"; + "coffee-script-1.3.3" = self.buildNodePackage rec { + name = "coffee-script-1.3.3"; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-~0.1.13"; + + "fstream-~0.1.8" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "fstream-~0.1.13" = self.buildNodePackage rec { + name = "fstream-0.1.18"; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; + sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + }; + deps = [ + self."rimraf-2" + self."mkdirp-0.3" + self."graceful-fs-~1.1.2" + self."inherits-~1.0.0" + ]; + }; + + "glob" = self."glob-3"; + + "glob-3" = self.buildNodePackage rec { + name = "glob-3.1.12"; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/${name}.tgz"; + sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; + }; + deps = [ + self."minimatch-0.2" + self."graceful-fs-~1.1.2" + self."inherits-1" + ]; + }; + + "graceful-fs" = self."graceful-fs-1"; + + "graceful-fs-1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; }; deps = [ @@ -318,6 +126,17 @@ let self = { ]; }; + "graceful-fs-~1.1.2" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + }; + deps = [ + + ]; + }; + "inherits" = self."inherits-1"; "inherits-1" = self.buildNodePackage rec { @@ -342,17 +161,198 @@ let self = { ]; }; - "fstream-~0.1.8" = self.buildNodePackage rec { - name = "fstream-0.1.18"; + "inherits-~1.0.0" = self.buildNodePackage rec { + name = "inherits-1.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; }; deps = [ - self."rimraf-2" + + ]; + }; + + "lru-cache" = self."lru-cache-~2.0.0"; + + "lru-cache-~2.0.0" = self.buildNodePackage rec { + name = "lru-cache-2.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; + sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + }; + deps = [ + + ]; + }; + + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "minimatch" = self."minimatch-0.2"; + + "minimatch-0.2" = self.buildNodePackage rec { + name = "minimatch-0.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; + sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; + }; + deps = [ + self."lru-cache-~2.0.0" + ]; + }; + + "node-gyp" = self."node-gyp-*"; + + "node-gyp-*" = self.buildNodePackage rec { + name = "node-gyp-0.6.8"; + src = fetchurl { + url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; + sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; + }; + deps = [ + self."glob-3" + self."graceful-fs-1" + self."fstream-~0.1.13" + self."minimatch-0.2" self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" + self."nopt-2" + self."npmlog-0" + self."osenv-0" + self."request-2.9" + self."rimraf-2" + self."semver-1" + self."tar-~0.1.12" + self."which-1" + ]; + }; + + "nopt" = self."nopt-2"; + + "nopt-2" = self.buildNodePackage rec { + name = "nopt-2.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; + sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; + }; + deps = [ + self."abbrev-1" + ]; + }; + + "npm2nix" = self."npm2nix-0.1.2"; + + "npm2nix-0.1.2" = self.buildNodePackage rec { + name = "npm2nix-0.1.2"; + src = fetchurl { + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; + sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; + name = "${name}.tgz"; + }; + deps = [ + self."semver-1" + ]; + }; + + "npmlog" = self."npmlog-0"; + + "npmlog-0" = self.buildNodePackage rec { + name = "npmlog-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; + sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + }; + deps = [ + self."ansi-~0.1.2" + ]; + }; + + "osenv" = self."osenv-0"; + + "osenv-0" = self.buildNodePackage rec { + name = "osenv-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; + sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + }; + deps = [ + + ]; + }; + + "request" = self."request-2.9"; + + "request-2.9" = self.buildNodePackage rec { + name = "request-2.9.203"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + }; + deps = [ + + ]; + }; + + "rimraf" = self."rimraf-2"; + + "rimraf-2" = self.buildNodePackage rec { + name = "rimraf-2.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; + sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; + }; + deps = [ + self."graceful-fs-~1.1" + ]; + }; + + "semver" = self."semver-1"; + + "semver-1" = self.buildNodePackage rec { + name = "semver-1.0.14"; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/${name}.tgz"; + sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; + }; + deps = [ + + ]; + }; + + "tar" = self."tar-~0.1.12"; + + "tar-~0.1.12" = self.buildNodePackage rec { + name = "tar-0.1.13"; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/${name}.tgz"; + sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; + }; + deps = [ + self."inherits-1.x" + self."block-stream" + self."fstream-~0.1.8" + ]; + }; + + "which" = self."which-1"; + + "which-1" = self.buildNodePackage rec { + name = "which-1.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/which/-/${name}.tgz"; + sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + }; + deps = [ + ]; }; }; From 278312a38cdf0735957eefb8354627fd5191f9b4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:46:32 +0200 Subject: [PATCH 0965/1120] node-packages: ability to fix sources that use the impure "latest" dependency --- pkgs/top-level/node-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ae468d95eace..ee05b92a255d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,6 +5,14 @@ let self = { inherit stdenv nodejs; }; + patchLatest = srcAttrs: + let src = fetchurl srcAttrs; in + pkgs.runCommand src.name {} '' + tar xf ${src} + sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json + tar cf $out package + ''; + "abbrev" = self."abbrev-1"; "abbrev-1" = self.buildNodePackage rec { From b78b5b3f3630856180fe2ba7c39eb364cc0ce602 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:47:42 +0200 Subject: [PATCH 0966/1120] node-packages: add a lot of packages --- pkgs/top-level/node-packages.nix | 658 +++++++++++++++++++++++++++++-- 1 file changed, 616 insertions(+), 42 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index ee05b92a255d..82d6b65ee48d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -26,6 +26,19 @@ let self = { ]; }; + "active-x-obfuscator" = self."active-x-obfuscator-0.0.1"; + + "active-x-obfuscator-0.0.1" = self.buildNodePackage rec { + name = "active-x-obfuscator-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/active-x-obfuscator/-/${name}.tgz"; + sha256 = "069cc18a0e7790ec106b267d28b47c691220f119a8daec925dd47f06866ce1c6"; + }; + deps = [ + self."zeparser-0.0.5" + ]; + }; + "ansi" = self."ansi-~0.1.2"; "ansi-~0.1.2" = self.buildNodePackage rec { @@ -39,6 +52,19 @@ let self = { ]; }; + "backbone" = self."backbone-0.9.2"; + + "backbone-0.9.2" = self.buildNodePackage rec { + name = "backbone-0.9.2"; + src = fetchurl { + url = "http://registry.npmjs.org/backbone/-/${name}.tgz"; + sha256 = "0a5ebc8d32949ea2870a684e8430a8b4dec75a163ecf2740eb5fb4865393bb32"; + }; + deps = [ + self."underscore->=1.3.1" + ]; + }; + "block-stream" = self."block-stream-*"; "block-stream-*" = self.buildNodePackage rec { @@ -52,7 +78,62 @@ let self = { ]; }; + "browserchannel" = self."browserchannel-0.4.1"; + + "browserchannel-0.4.1" = self.buildNodePackage rec { + name = "browserchannel-0.4.1"; + src = fetchurl { + url = "http://registry.npmjs.org/browserchannel/-/${name}.tgz"; + sha256 = "f5d038347cee6802bb6f30f53bcf2adf196d241505b77ffca3d5f8a76a109c5f"; + }; + deps = [ + self."coffee-script-~1" + self."hat" + self."connect-~1.7" + self."timerstub" + self."request-~2" + ]; + }; + + "bson" = self."bson-0.1.0"; + + "bson-0.1.0" = self.buildNodePackage rec { + name = "bson-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bson/-/${name}.tgz"; + sha256 = "32618266420f4d2688e957a6a145aab6a1402c950b7b7c7c1d0520cbd08251c9"; + }; + deps = [ + + ]; + }; + + "bytes" = self."bytes-0.1.0"; + + "bytes-0.1.0" = self.buildNodePackage rec { + name = "bytes-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bytes/-/${name}.tgz"; + sha256 = "32954618600f6566ecd95aec0ea0ae3318a1b4a29bf6a7970462c29a843bf701"; + }; + deps = [ + + ]; + }; + "coffee-script" = self."coffee-script-1.3.3"; + "coffee-script-~1" = self."coffee-script-1.3.3"; + + "coffee-script-~1.1.2" = self.buildNodePackage rec { + name = "coffee-script-1.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "3b431da901f753bde0ab26245c7111e1e4b8be1bba0086cf4a7470d739acae87"; + }; + deps = [ + + ]; + }; "coffee-script-1.3.3" = self.buildNodePackage rec { name = "coffee-script-1.3.3"; @@ -65,23 +146,174 @@ let self = { ]; }; - "fstream" = self."fstream-~0.1.13"; + "commander" = self."commander-~0.6.1"; - "fstream-~0.1.8" = self.buildNodePackage rec { - name = "fstream-0.1.18"; + "commander-~0.6.1" = self.buildNodePackage rec { + name = "commander-0.6.1"; src = fetchurl { - url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + url = "http://registry.npmjs.org/commander/-/${name}.tgz"; + sha256 = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; }; deps = [ - self."rimraf-2" - self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" + ]; }; - "fstream-~0.1.13" = self.buildNodePackage rec { + "connect" = self."connect-2.4.4"; + + "connect-~1.7" = self.buildNodePackage rec { + name = "connect-1.7.3"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "773fd6ca8c90e33cc28d012fb3d72d66eb99114b20d88228330458628f030d12"; + }; + deps = [ + self."qs->= 0.3.1" + self."mime->= 0.0.1" + ]; + }; + + "connect-2.4.4" = self.buildNodePackage rec { + name = "connect-2.4.4"; + src = fetchurl { + url = "http://registry.npmjs.org/connect/-/${name}.tgz"; + sha256 = "1f474ca9db05b9d58f3469ad4932722e49bec1f6ec35665ddea09155382914e9"; + }; + deps = [ + self."qs-0.4.2" + self."formidable-1.0.11" + self."crc-0.2.0" + self."cookie-0.0.4" + self."bytes-0.1.0" + self."send-0.0.4" + self."fresh-0.1.0" + self."pause-0.0.1" + self."debug" + ]; + }; + + "cookie" = self."cookie-0.0.4"; + + "cookie-0.0.4" = self.buildNodePackage rec { + name = "cookie-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/${name}.tgz"; + sha256 = "a917477c448a6a91ef73d550d8d8a6d4864e8fbd247b6f73baaca66c9bfc3b0b"; + }; + deps = [ + + ]; + }; + + "crc" = self."crc-0.2.0"; + + "crc-0.2.0" = self.buildNodePackage rec { + name = "crc-0.2.0"; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/${name}.tgz"; + sha256 = "027c180bbbddd0960e6000f7ef60623997dfa61b3c2ef141acf00c29a1763b5d"; + }; + deps = [ + + ]; + }; + + "cssmin" = self."cssmin-0.3.1"; + + "cssmin-0.3.1" = self.buildNodePackage rec { + name = "cssmin-0.3.1"; + src = fetchurl { + url = "http://registry.npmjs.org/cssmin/-/${name}.tgz"; + sha256 = "56f1854fd0c6cb4cf78cea861e7b617ccf1daf91b47fba5bc80abdf2529b3102"; + }; + deps = [ + + ]; + }; + + "datetime" = self."datetime-0.0.3"; + + "datetime-0.0.3" = self.buildNodePackage rec { + name = "datetime-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/datetime/-/${name}.tgz"; + sha256 = "d584a5b140ced7bd44199fc5e1b6cd55ec2d3c946dc990ced42f6ab2687747f0"; + }; + deps = [ + self."vows->=0.5.4" + ]; + }; + + "debug" = self."debug-*"; + + "debug-*" = self.buildNodePackage rec { + name = "debug-0.7.0"; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/${name}.tgz"; + sha256 = "113c041fb01fd8db2a1b83320529849ccbb23794a4c3799a0154312de2a5d618"; + }; + deps = [ + + ]; + }; + + "diff" = self."diff-~1.0.3"; + + "diff-~1.0.3" = self.buildNodePackage rec { + name = "diff-1.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/diff/-/${name}.tgz"; + sha256 = "88e1bb04e3707c5601ec0841e170f8892a3b929bf8c4030f826cd32c1fa21472"; + }; + deps = [ + + ]; + }; + + "eyes" = self."eyes->=0.1.6"; + + "eyes->=0.1.6" = self.buildNodePackage rec { + name = "eyes-0.1.8"; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/${name}.tgz"; + sha256 = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; + }; + deps = [ + + ]; + }; + + "formidable" = self."formidable-1.0.11"; + + "formidable-1.0.11" = self.buildNodePackage rec { + name = "formidable-1.0.11"; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/${name}.tgz"; + sha256 = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; + }; + deps = [ + + ]; + }; + + "fresh" = self."fresh-0.1.0"; + + "fresh-0.1.0" = self.buildNodePackage rec { + name = "fresh-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/${name}.tgz"; + sha256 = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; + }; + deps = [ + + ]; + }; + + "fstream" = self."fstream-0.1.18"; + "fstream-~0.1.8" = self."fstream-0.1.18"; + "fstream-~0.1.13" = self."fstream-0.1.18"; + + "fstream-0.1.18" = self.buildNodePackage rec { name = "fstream-0.1.18"; src = fetchurl { url = "http://registry.npmjs.org/fstream/-/${name}.tgz"; @@ -110,9 +342,12 @@ let self = { ]; }; - "graceful-fs" = self."graceful-fs-1"; + "graceful-fs" = self."graceful-fs-1.1.10"; + "graceful-fs-1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1" = self."graceful-fs-1.1.10"; + "graceful-fs-~1.1.2" = self."graceful-fs-1.1.10"; - "graceful-fs-1" = self.buildNodePackage rec { + "graceful-fs-1.1.10" = self.buildNodePackage rec { name = "graceful-fs-1.1.10"; src = fetchurl { url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; @@ -123,31 +358,38 @@ let self = { ]; }; - "graceful-fs-~1.1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "hat" = self."hat-0.0.3"; + + "hat-0.0.3" = self.buildNodePackage rec { + name = "hat-0.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/hat/-/${name}.tgz"; + sha256 = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; }; deps = [ ]; }; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "hiredis" = self."hiredis-*"; + + "hiredis-*" = self.buildNodePackage rec { + name = "hiredis-0.1.14"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; + sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; }; deps = [ ]; }; - "inherits" = self."inherits-1"; + "inherits" = self."inherits-1.0.0"; + "inherits-1" = self."inherits-1.0.0"; + "inherits-1.x" = self."inherits-1.0.0"; + "inherits-~1.0.0" = self."inherits-1.0.0"; - "inherits-1" = self.buildNodePackage rec { + "inherits-1.0.0" = self.buildNodePackage rec { name = "inherits-1.0.0"; src = fetchurl { url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; @@ -158,22 +400,13 @@ let self = { ]; }; - "inherits-1.x" = self.buildNodePackage rec { - name = "inherits-1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - }; - deps = [ + "less" = self."less-1.3.0"; - ]; - }; - - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "less-1.3.0" = self.buildNodePackage rec { + name = "less-1.3.0"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/less/-/${name}.tgz"; + sha256 = "a182824764d5feefe8a66c5f9c7fe8b92d24a7677942fd650b9092bbd3f63d1b"; }; deps = [ @@ -193,13 +426,24 @@ let self = { ]; }; - "mkdirp" = self."mkdirp-0.3"; + "mime" = self."mime-1.2.6"; - "mkdirp-0.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; + "mime->= 0.0.1" = self.buildNodePackage rec { + name = "mime-1.2.7"; src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; + }; + deps = [ + + ]; + }; + + "mime-1.2.6" = self.buildNodePackage rec { + name = "mime-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/${name}.tgz"; + sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; }; deps = [ @@ -219,6 +463,45 @@ let self = { ]; }; + "mkdirp" = self."mkdirp-0.3"; + + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + }; + deps = [ + + ]; + }; + + "mongodb" = self."mongodb-1.1.0-beta"; + + "mongodb-1.1.0-beta" = self.buildNodePackage rec { + name = "mongodb-1.1.0-beta"; + src = fetchurl { + url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; + sha256 = "05e5a798d4c3a499af1e77a33eb13a31d4fb688a63e97b3fe970a3bccea39ab3"; + }; + deps = [ + self."bson-0.1.0" + ]; + }; + + "mrclean" = self."mrclean-0.1.0"; + + "mrclean-0.1.0" = self.buildNodePackage rec { + name = "mrclean-0.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/mrclean/-/${name}.tgz"; + sha256 = "5a8921007d8d3db990d41924d220f90efc8cbeb1f425c52fe0fe28be22223705"; + }; + deps = [ + + ]; + }; + "node-gyp" = self."node-gyp-*"; "node-gyp-*" = self.buildNodePackage rec { @@ -284,6 +567,19 @@ let self = { ]; }; + "options" = self."options-*"; + + "options-*" = self.buildNodePackage rec { + name = "options-0.0.3"; + src = fetchurl { + url = "http://registry.npmjs.org/options/-/${name}.tgz"; + sha256 = "06cfe21b54b45f8cf7bb0a184d6ea6de3adb2dc471bf0663d06c791b4d48536d"; + }; + deps = [ + + ]; + }; + "osenv" = self."osenv-0"; "osenv-0" = self.buildNodePackage rec { @@ -297,7 +593,95 @@ let self = { ]; }; - "request" = self."request-2.9"; + "pause" = self."pause-0.0.1"; + + "pause-0.0.1" = self.buildNodePackage rec { + name = "pause-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/pause/-/${name}.tgz"; + sha256 = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; + }; + deps = [ + + ]; + }; + + "policyfile" = self."policyfile-0.0.4"; + + "policyfile-0.0.4" = self.buildNodePackage rec { + name = "policyfile-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/policyfile/-/${name}.tgz"; + sha256 = "e19e9e57d6262ab7965212ec5456eae2c07438de3b09fd8f3cba36a61a14c43f"; + }; + deps = [ + + ]; + }; + + "qs" = self."qs-0.5.0"; + "qs->= 0.3.1" = self."qs-0.5.0"; + + "qs-0.4.2" = self.buildNodePackage rec { + name = "qs-0.4.2"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "c44875d3aa882693cf73185b46fed63c1a89c34dce600b191b41dd90fb019b86"; + }; + deps = [ + + ]; + }; + + "qs-0.5.0" = self.buildNodePackage rec { + name = "qs-0.5.0"; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/${name}.tgz"; + sha256 = "229a99fc833d50307833a13d898f3de137f2823593220273295e7e1dc81ab993"; + }; + deps = [ + + ]; + }; + + "range-parser" = self."range-parser-0.0.4"; + + "range-parser-0.0.4" = self.buildNodePackage rec { + name = "range-parser-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/${name}.tgz"; + sha256 = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; + }; + deps = [ + + ]; + }; + + "redis" = self."redis-0.7.2"; + + "redis-0.6.7" = self.buildNodePackage rec { + name = "redis-0.6.7"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "6a65c0204a773ca4adec0635d747c80a7565ba5e2028775c7d0e95d23df088bb"; + }; + deps = [ + + ]; + }; + + "redis-0.7.2" = self.buildNodePackage rec { + name = "redis-0.7.2"; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/${name}.tgz"; + sha256 = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; + }; + deps = [ + self."hiredis" + ]; + }; + + "request" = self."request-~2"; "request-2.9" = self.buildNodePackage rec { name = "request-2.9.203"; @@ -310,6 +694,17 @@ let self = { ]; }; + "request-~2" = self.buildNodePackage rec { + name = "request-2.11.0"; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "01e5c144c755c8ee1a1ec93077b684bd63efb8df32d54675e20737e8e1c1afa6"; + }; + deps = [ + + ]; + }; + "rimraf" = self."rimraf-2"; "rimraf-2" = self.buildNodePackage rec { @@ -336,6 +731,66 @@ let self = { ]; }; + "send" = self."send-0.0.4"; + + "send-0.0.4" = self.buildNodePackage rec { + name = "send-0.0.4"; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/${name}.tgz"; + sha256 = "7e028fa3760884d8103414f079dc4bcc99d0b72bc21bcaa9d66a319d59010d6c"; + }; + deps = [ + self."debug" + self."mime-1.2.6" + self."fresh-0.1.0" + self."range-parser-0.0.4" + ]; + }; + + "showdown" = self."showdown-0.0.1"; + + "showdown-0.0.1" = self.buildNodePackage rec { + name = "showdown-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/showdown/-/${name}.tgz"; + sha256 = "669a3284344a4cb51b0327af8d84b9e35c895ef1cedbafada5284a31f4d4783d"; + }; + deps = [ + + ]; + }; + + "socket.io" = self."socket.io-0.9.6"; + + "socket.io-0.9.6" = self.buildNodePackage rec { + name = "socket.io-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io/-/${name}.tgz"; + sha256 = "444e346e2701e2212590461a1fcf656f5d685ceb209e473517603286f09e743c"; + }; + deps = [ + self."socket.io-client-0.9.6" + self."policyfile-0.0.4" + self."redis-0.6.7" + ]; + }; + + "socket.io-client" = self."socket.io-client-0.9.6"; + + "socket.io-client-0.9.6" = self.buildNodePackage rec { + name = "socket.io-client-0.9.6"; + src = fetchurl { + url = "http://registry.npmjs.org/socket.io-client/-/${name}.tgz"; + sha256 = "eab65186515d5206fe18b9ced75aae8c803dbcd18295a9a1cb71e5ae772ba399"; + }; + deps = [ + self."uglify-js-1.2.5" + self."ws-0.4.x" + self."xmlhttprequest-1.2.2" + self."active-x-obfuscator-0.0.1" + ]; + }; + "tar" = self."tar-~0.1.12"; "tar-~0.1.12" = self.buildNodePackage rec { @@ -351,6 +806,84 @@ let self = { ]; }; + "timerstub" = self."timerstub-*"; + + "timerstub-*" = self.buildNodePackage rec { + name = "timerstub-0.1.3"; + src = fetchurl { + url = "http://registry.npmjs.org/timerstub/-/${name}.tgz"; + sha256 = "0ecbd05a10e0db1d628505c8a3b6ae07246bb8cf1074c435ddc26f22fcb5e153"; + }; + deps = [ + self."coffee-script-~1.1.2" + ]; + }; + + "tinycolor" = self."tinycolor-0.x"; + + "tinycolor-0.x" = self.buildNodePackage rec { + name = "tinycolor-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/${name}.tgz"; + sha256 = "f5aaf5df002750c4af19181988c8789c9e230445747e511dde7c660424f286a0"; + }; + deps = [ + + ]; + }; + + "uglify-js" = self."uglify-js-1.2.6"; + + "uglify-js-1.2.5" = self.buildNodePackage rec { + name = "uglify-js-1.2.5"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "111fa1b844885b94df8cd73eb864bd96ff2e9173e8eb7045cc778fa237304a74"; + }; + deps = [ + + ]; + }; + + "uglify-js-1.2.6" = self.buildNodePackage rec { + name = "uglify-js-1.2.6"; + src = fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/${name}.tgz"; + sha256 = "6d9202c8332e78868510a5441de4d54d8c2e08901ea7945eb332be8d7670788d"; + }; + deps = [ + + ]; + }; + + "underscore" = self."underscore-1.3.3"; + "underscore->=1.3.1" = self."underscore-1.3.3"; + + "underscore-1.3.3" = self.buildNodePackage rec { + name = "underscore-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; + sha256 = "e710644e53f5a6d75a41a3e19d8c35eedbce0db1e886e470daf9f909c9d1ea8a"; + }; + deps = [ + + ]; + }; + + "vows" = self."vows->=0.5.4"; + + "vows->=0.5.4" = self.buildNodePackage rec { + name = "vows-0.6.4"; + src = fetchurl { + url = "http://registry.npmjs.org/vows/-/${name}.tgz"; + sha256 = "017586c2fbdd5cd15aacdc870ea0c1b1ab60558306457ddc9b0aa4dae8290597"; + }; + deps = [ + self."eyes->=0.1.6" + self."diff-~1.0.3" + ]; + }; + "which" = self."which-1"; "which-1" = self.buildNodePackage rec { @@ -363,6 +896,47 @@ let self = { ]; }; + + "ws" = self."ws-0.4.x"; + + "ws-0.4.x" = self.buildNodePackage rec { + name = "ws-0.4.21"; + src = self.patchLatest { + url = "http://registry.npmjs.org/ws/-/${name}.tgz"; + sha256 = "f21bc0058730355e1ff9d6ccf84a4cb56a2fc28e939edd15395770ea9e87fa0e"; + }; + deps = [ + self."commander-~0.6.1" + self."tinycolor-0.x" + self."options" + ]; + }; + + "xmlhttprequest" = self."xmlhttprequest-1.2.2"; + + "xmlhttprequest-1.2.2" = self.buildNodePackage rec { + name = "xmlhttprequest-1.2.2"; + src = fetchurl { + url = "http://registry.npmjs.org/xmlhttprequest/-/${name}.tgz"; + sha256 = "44ce4ed6e5f7b5df84f27590fa142ecd175f53da4807b9f06c0c4733e23bd95d"; + }; + deps = [ + + ]; + }; + + "zeparser" = self."zeparser-0.0.5"; + + "zeparser-0.0.5" = self.buildNodePackage rec { + name = "zeparser-0.0.5"; + src = fetchurl { + url = "http://registry.npmjs.org/zeparser/-/${name}.tgz"; + sha256 = "8b5a57ae84a7b7adf8827d1469c8f66d08d1660bd1375a07381877cd1bb9ed0b"; + }; + deps = [ + + ]; + }; }; in self From 314af2262c3980f67b061a86c8396116102d7c5b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 4 Sep 2012 12:39:40 -0400 Subject: [PATCH 0967/1120] =?UTF-8?q?2030=20Images=20=E2=80=93=20for=20Int?= =?UTF-8?q?el=20Centrino=20Wireless-N=202230?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firmware/iwlwifi-2030-ucode/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix new file mode 100644 index 000000000000..162423dbc05e --- /dev/null +++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "iwlwifi-2030-ucode-18.168.6.1"; + + src = fetchurl { + url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz"; + sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8"; + }; + + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out" + chmod -x * + cp * "$out" + ''; + + meta = { + description = "Firmware for the Intel 2030 Series wireless card"; + + longDescription = '' + This package provides the Intel 2030 Series wireless card + firmware. It contains the `iwlwifi-2030-6.ucode' file. + ''; + + homepage = http://intellinuxwireless.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01ae4a9c0ba..471de6cab5df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5613,6 +5613,8 @@ let iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { }; + iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { }; + iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { }; From 0bf2161b03437b288a326efa84150a4a1b7a6ccb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 5 Sep 2012 01:04:14 +0200 Subject: [PATCH 0968/1120] e2fsprogs: minor upgrade to 1.42.5 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index bd697d761e01..4f4d235008bf 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.4"; + name = "e2fsprogs-1.42.5"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "0plhvcjynyy5ifih5jr8p2fjymqyl8fj6vj74cmqjyrahi3z6iir"; + sha256 = "1kki3367961377wz2n6kva8q0wjjk6qhxmhp2dp3ar3lxgcamvbn"; }; buildInputs = [ pkgconfig libuuid ]; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck"; preInstall = "installFlagsArray=('LN=ln -s')"; - + postInstall = "make install-libs"; - + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; From 7fbf92d8f91063250bacf400392eaf3f2ece473d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 5 Sep 2012 12:22:03 -0400 Subject: [PATCH 0969/1120] npm2nix: Bump to 0.1.3 --- pkgs/top-level/node-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 82d6b65ee48d..7c083c7e0eee 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -540,13 +540,13 @@ let self = { ]; }; - "npm2nix" = self."npm2nix-0.1.2"; + "npm2nix" = self."npm2nix-0.1.3"; - "npm2nix-0.1.2" = self.buildNodePackage rec { - name = "npm2nix-0.1.2"; + "npm2nix-0.1.3" = self.buildNodePackage rec { + name = "npm2nix-0.1.3"; src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; - sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.3.tar.gz; + sha256 = "1728fzmixcyg4g8mqcgn5yf7d4nin9zyqv8bs8b6660swhfdn4il"; name = "${name}.tgz"; }; deps = [ From 8ffc870e78198acbb4f8dd36c4cbcf527fe4bb0d Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 8 Aug 2012 00:53:05 +0200 Subject: [PATCH 0970/1120] Tig: cosmetics --- 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 20d64ff11e4f..88cfccf24a38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6980,7 +6980,6 @@ let git = gitAndTools.git; gitFull = gitAndTools.gitFull; gitSVN = gitAndTools.gitSVN; - tig = gitAndTools.tig; giv = callPackage ../applications/graphics/giv { pcre = pcre.override { unicodeSupport = true; }; @@ -7719,6 +7718,8 @@ let inherit (gnome) libIDL; }; + tig = gitAndTools.tig; + timidity = callPackage ../tools/misc/timidity { }; tkcvs = callPackage ../applications/version-management/tkcvs { }; From 843053d7a7b228db7784e4e5bb7778763cdb5397 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:34:54 +0000 Subject: [PATCH 0971/1120] haskellPackages.split: add 0.1.4.3 --- .../development/libraries/haskell/split/0.1.4.3.nix | 13 +++++++++++++ .../haskell/split/{default.nix => 0.2.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/split/0.1.4.3.nix rename pkgs/development/libraries/haskell/split/{default.nix => 0.2.nix} (100%) diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix new file mode 100644 index 000000000000..ad0df5c2cb02 --- /dev/null +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "split"; + version = "0.1.4.3"; + sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; + meta = { + homepage = "http://code.haskell.org/~byorgey/code/split"; + description = "Combinator library for splitting lists"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/0.2.nix similarity index 100% rename from pkgs/development/libraries/haskell/split/default.nix rename to pkgs/development/libraries/haskell/split/0.2.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f90e16abe02d..6df630f62d5f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1408,7 +1408,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; - split = callPackage ../development/libraries/haskell/split {}; + split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; + split_0_2 = callPackage ../development/libraries/haskell/split/0.2.nix {}; + split = self.split_0_2; stbImage = callPackage ../development/libraries/haskell/stb-image {}; From 38a844e0e9ae256c41185e818b1af38ea7cc3840 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:37:35 +0000 Subject: [PATCH 0972/1120] haskellPackages.urlencoded: initial --- .../libraries/haskell/urlencoded/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/urlencoded/default.nix diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix new file mode 100644 index 000000000000..f0a786e55f09 --- /dev/null +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -0,0 +1,16 @@ +{ cabal, mtl, network, split }: + +cabal.mkDerivation (self: { + pname = "urlencoded"; + version = "0.3.0.1"; + sha256 = "1i6r05d5libcilngsa6illcazfv6g4rhibzgk8c2jsjq9cg53ihz"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl network split ]; + meta = { + homepage = "https://github.com/pheaver/urlencoded"; + description = "Generate or process x-www-urlencoded data"; + 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 6df630f62d5f..10d925aea42a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1524,6 +1524,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); url = callPackage ../development/libraries/haskell/url {}; + urlencoded = callPackage ../development/libraries/haskell/urlencoded { split = self.split_0_1_4_3; }; + utf8Light = callPackage ../development/libraries/haskell/utf8-light {}; utf8String = callPackage ../development/libraries/haskell/utf8-string {}; From d4145f4f7dcbda697cb4cad37f46ab194c2f2d29 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:38:07 +0000 Subject: [PATCH 0973/1120] haskellPackages.liblastfm: initial --- .../libraries/haskell/liblastfm/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/liblastfm/default.nix diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix new file mode 100644 index 000000000000..c625fc444796 --- /dev/null +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -0,0 +1,15 @@ +{ cabal, aeson, curl, mtl, pureMD5, urlencoded, utf8String, xml }: + +cabal.mkDerivation (self: { + pname = "liblastfm"; + version = "0.0.3.4"; + sha256 = "1d8fypl9s64jpsr8hygyfqq6jzv1bvd22zq4f93xsffpvv7nqnyk"; + buildDepends = [ + aeson curl mtl pureMD5 urlencoded utf8String xml + ]; + meta = { + description = "Wrapper to Lastfm API"; + 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 10d925aea42a..61f1a86deec5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1016,6 +1016,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libmpd = callPackage ../development/libraries/haskell/libmpd {}; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; From 116a96b7a43258e377ea3e7caaddb9bc95775ac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:46:22 +0200 Subject: [PATCH 0974/1120] haskell-urlencoded: patch to support recent versions of split --- pkgs/development/libraries/haskell/urlencoded/default.nix | 3 +++ pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index f0a786e55f09..0e7a5413fa27 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl network split ]; + patchPhase = '' + sed -i -e 's|split.*|split|' urlencoded.cabal + ''; meta = { homepage = "https://github.com/pheaver/urlencoded"; description = "Generate or process x-www-urlencoded data"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 61f1a86deec5..5e3b80c4b93d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1526,7 +1526,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); url = callPackage ../development/libraries/haskell/url {}; - urlencoded = callPackage ../development/libraries/haskell/urlencoded { split = self.split_0_1_4_3; }; + urlencoded = callPackage ../development/libraries/haskell/urlencoded {}; utf8Light = callPackage ../development/libraries/haskell/utf8-light {}; From d9f3317942fbea79ed0643ef1f2b28ddb0df9098 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:47:03 +0200 Subject: [PATCH 0975/1120] haskell-split: drop obsolete version 0.1.4.3 --- .../development/libraries/haskell/split/0.1.4.3.nix | 13 ------------- .../haskell/split/{0.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/split/0.1.4.3.nix rename pkgs/development/libraries/haskell/split/{0.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix deleted file mode 100644 index ad0df5c2cb02..000000000000 --- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "split"; - version = "0.1.4.3"; - sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby"; - meta = { - homepage = "http://code.haskell.org/~byorgey/code/split"; - description = "Combinator library for splitting lists"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/split/0.2.nix b/pkgs/development/libraries/haskell/split/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/split/0.2.nix rename to pkgs/development/libraries/haskell/split/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5e3b80c4b93d..b45db385e59c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1410,9 +1410,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {}; - split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {}; - split_0_2 = callPackage ../development/libraries/haskell/split/0.2.nix {}; - split = self.split_0_2; + split = callPackage ../development/libraries/haskell/split {}; stbImage = callPackage ../development/libraries/haskell/stb-image {}; From ef0c0089da7561203db104b0a02cfebd15aa69bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Thu, 6 Sep 2012 17:31:40 +0200 Subject: [PATCH 0976/1120] yafc: update to 1.2.3 --- pkgs/applications/networking/yafc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 9b1c9892cbfa..bdbb53d1675f 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, readline, libssh, intltool}: stdenv.mkDerivation rec { - name = "yafc-1.2.0"; + name = "yafc-1.2.3"; src = fetchurl { url = "https://github.com/downloads/sebastinas/yafc/${name}.tar.xz"; - sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58"; + sha256 = "11h5r9ragfpil338kq981wxnifacflqfwgydhmy00b3fbdlnxzsi"; }; buildInputs = [ readline libssh intltool ]; From b6f5f5976a9fbf4d0c6be830971b54f2c54f3079 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:31:10 +0200 Subject: [PATCH 0977/1120] ikiwiki: update to version 3.20120725 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index d061495b1764..1f99a02f429f 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20120629"; + version = "3.20120725"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "7e39cdb727f261ce20fde5f0b05966680589a3d028c569780addd4b530382f07"; + sha256 = "b600096a77b17e4a9e8a9552c4d36e01ed9217a0f8ff8a4f15110cf80e7adfad"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 33bf9644cf2227583bac023c86549e229ba80eb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:31:28 +0200 Subject: [PATCH 0978/1120] git-annex: update to version 3.20120825 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 16f62ad50ec2..86c8e9717b16 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -5,14 +5,14 @@ }: let - version = "3.20120629"; + version = "3.20120825"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; - sha256 = "0dajcmx1sn3rqlba5b66lkiwji849gxzcb5d8666in21g7lc1ccs"; + sha256 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0"; name = "git-annex-${version}.tar.gz"; }; From 14da2bf31b4bc29e729f265b6e863b7209e67758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:33:33 +0200 Subject: [PATCH 0979/1120] git: update to version 1.7.12 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 066b5a50913e..b48c5f05d9e4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ let - version = "1.7.11.4"; + version = "1.7.12"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "16a1gm256w82j9ardzyfyqi0f35l3x92xsqz8ghz1pnja8jns7g9"; + sha256 = "3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505"; }; patches = [ ./docbook2texi.patch ]; From 52e5b8e2c5da64dc5b7a36943127da5403b33285 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:32:59 +0200 Subject: [PATCH 0980/1120] ghostscript: cosmetic Refer to the source code as "src" rather than "data". --- pkgs/misc/ghostscript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 0a028660f7ff..86fad985b9a5 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -27,7 +27,7 @@ let maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ]; }; - gnuForkData = rec { + gnuForkSrc = rec { name = "ghostscript-9.04.1"; src = fetchurl { url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2"; @@ -38,7 +38,7 @@ let patches = [ ./purity.patch ]; }; - mainlineData = { + mainlineSrc = { name = "ghostscript-9.05"; src = fetchurl { url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2; @@ -55,7 +55,7 @@ let patches = [ ./purity-9.05.patch ]; }; - variant = if gnuFork then gnuForkData else mainlineData; + variant = if gnuFork then gnuForkSrc else mainlineSrc; in From 94da2e30ddf180cd22436da2627f220476c67b0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:34:18 +0200 Subject: [PATCH 0981/1120] ghostscript: cosmetic don't rely on magic URL syntax; URLs are strings --- pkgs/misc/ghostscript/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 86fad985b9a5..ac171b2ff814 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -9,7 +9,7 @@ assert cupsSupport -> cups != null; let meta = { - homepage = http://www.gnu.org/software/ghostscript/; + homepage = "http://www.gnu.org/software/ghostscript/"; description = "GNU Ghostscript, a PostScript interpreter"; longDescription = '' @@ -41,11 +41,11 @@ let mainlineSrc = { name = "ghostscript-9.05"; src = fetchurl { - url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2; + url = "http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2"; sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g"; }; meta = meta // { - homepage = http://www.ghostscript.com/; + homepage = "http://www.ghostscript.com/"; description = "GPL Ghostscript, a PostScript interpreter"; }; @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { fonts = [ (fetchurl { - url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz; + url = "mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz"; sha256 = "1lxr1y52r26qjif8kdqkfhsb5llakdcx3f5b9ppdyn59bb83ivsc"; }) (fetchurl { - url = mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz; + url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1"; }) # ... add other fonts here From ef649da11977556dce3cf0498f508b999dfe08f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:46:54 +0200 Subject: [PATCH 0982/1120] polyml: fix bogus license attribute --- pkgs/development/compilers/polyml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 2654fd513e54..dfdc50cd827c 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Poly/ML is a full implementation of Standard ML. ''; homepage = http://www.polyml.org/; - license = stdenv.lib.licenses.lgpl; + license = stdenv.lib.licenses.lgpl21; platforms = with stdenv.lib.platforms; linux; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z From a9da133fdadf212b055c63e0b9f377f564775943 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Sep 2012 14:35:05 +0200 Subject: [PATCH 0983/1120] boost: add version 1.51.0 --- pkgs/development/libraries/boost/1.51.nix | 86 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.51.nix diff --git a/pkgs/development/libraries/boost/1.51.nix b/pkgs/development/libraries/boost/1.51.nix new file mode 100644 index 000000000000..8b040dd86473 --- /dev/null +++ b/pkgs/development/libraries/boost/1.51.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.51.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; + sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88cfccf24a38..4c6f65ff841f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3313,6 +3313,7 @@ let boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost150 = callPackage ../development/libraries/boost/1.50.nix { }; + boost151 = callPackage ../development/libraries/boost/1.51.nix { }; boost = boost150; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; From 28a725fcbed7e6360734e1701d76d2e294b742f5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:08:37 +0200 Subject: [PATCH 0984/1120] bwidget/tcllib/tcltls: Add libPrefix attributes. This is what I forgot in the packages I have added a few months ago, so it's time to revisit them and improve things, like for example set the right libPrefix in order to stay consistent with other TCL libraries. In addition this fixes some whitespace ugliness in the affected packages. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 4 ++-- pkgs/development/libraries/bwidget/default.nix | 10 +++++++--- pkgs/development/libraries/tcllib/default.nix | 6 +++++- pkgs/development/libraries/tcltls/default.nix | 6 +++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 30c91d3d905b..6014f582467a 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}" + wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}" ''; - buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper]; + buildInputs = [ tcl tk tcllib tcltls bwidget x11 makeWrapper ]; meta = { homepage = "http://tkabber.jabber.ru/"; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 693e0587a0b2..b8aed94bb0be 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -12,9 +12,13 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ensureDir "$out/tcltk" - cp -R *.tcl lang images "$out/tcltk/" + ensureDir "$out/lib/${passthru.libPrefix}" + cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" ''; - buildInputs = [tcl]; + passthru = { + libPrefix = "bwidget${version}"; + }; + + buildInputs = [ tcl ]; } diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index fcfbbe19d949..6aec229f5295 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -9,5 +9,9 @@ stdenv.mkDerivation rec { sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x"; }; - buildInputs = [tcl]; + passthru = { + libPrefix = "tcllib${version}"; + }; + + buildInputs = [ tcl ]; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index dbbfc3d38556..3f984c377dd1 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -17,5 +17,9 @@ stdenv.mkDerivation rec { sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; }; - buildInputs = [tcl openssl]; + passthru = { + libPrefix = "tls${version}"; + }; + + buildInputs = [ tcl openssl ]; } From 882289a583c11ec38d64d4509431e81a42b95177 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:20:31 +0200 Subject: [PATCH 0985/1120] tclgpg: New package, pre-1.0 release. The library has not been released so far, but it is used by Tkabber and some other software in Tcl (none of them is in nixpkgs so far). Signed-off-by: aszlig --- pkgs/development/libraries/tclgpg/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/tclgpg/default.nix diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix new file mode 100644 index 000000000000..d8bea7f14e3e --- /dev/null +++ b/pkgs/development/libraries/tclgpg/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: + +stdenv.mkDerivation rec { + name = "tclgpg-${version}"; + version = "1.0pre"; + + src = fetchsvn { + url = "http://tclgpg.googlecode.com/svn/trunk"; + rev = 74; + sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; + }; + + configureFlags = "--with-tcl=" + tcl + "/lib " + + "--with-tclinclude=" + tcl + "/include "; + + preConfigure = '' + configureFlags="--exec_prefix=$prefix $configureFlags" + sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in + autoreconf -vfi + ''; + + prePatch = '' + sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl + ''; + + passthru = { + libPrefix = "gpg1.0"; + }; + + buildInputs = [ autoconf automake tcl tcllib ]; + + meta = { + homepage = http://code.google.com/p/tclgpg/; + description = "A Tcl interface to GNU Privacy Guard"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6f65ff841f..4201d879ac85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4867,6 +4867,8 @@ let tclap = callPackage ../development/libraries/tclap {}; + tclgpg = callPackage ../development/libraries/tclgpg { }; + tcllib = callPackage ../development/libraries/tcllib { }; tcltls = callPackage ../development/libraries/tcltls { }; From d058ae5b0bafd2aa7a4075c9f09409b5a9a7329e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:26:37 +0200 Subject: [PATCH 0986/1120] tkabber: Add tclgpg to TCLLIBPATH. This ensures that Tkabber can now be used with GPG support, though as of gnupg version 2, this requires gpg-agent as well. Only if all conditions are met, an option to actually use GPG will show up in Tkabber's settings. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 6014f582467a..8bf7b44de9c0 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }: +{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg +, bwidget, cacert, makeWrapper, x11 }: stdenv.mkDerivation rec { name = "tkabber-0.11.1"; @@ -26,10 +27,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}" + wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}\ ${tclgpg}/lib/${tclgpg.libPrefix}" ''; - buildInputs = [ tcl tk tcllib tcltls bwidget x11 makeWrapper ]; + buildInputs = [ tcl tk tcllib tcltls tclgpg bwidget x11 makeWrapper ]; meta = { homepage = "http://tkabber.jabber.ru/"; From 5d159722787ea2fab471e427306ed4b371e95576 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:41:40 +0200 Subject: [PATCH 0987/1120] tkabber: Clean up TCLLIBPATH generation. This should make things a lot more DRY as we now can generalize library paths by using the libPrefix attribute of each library. In addition this also cuts the line length in wrapProgram. Signed-off-by: aszlig --- .../instant-messengers/tkabber/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 8bf7b44de9c0..56672dee33f0 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,7 +1,15 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg , bwidget, cacert, makeWrapper, x11 }: -stdenv.mkDerivation rec { +let + tclLibraries = [ bwidget tcllib tcltls tclgpg ]; + + getTclLibPath = p: "${p}/lib/${p.libPrefix}"; + + tclLibPaths = stdenv.lib.concatStringsSep " " + (map getTclLibPath tclLibraries); + +in stdenv.mkDerivation rec { name = "tkabber-0.11.1"; src = fetchurl { @@ -27,10 +35,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}\ ${tclgpg}/lib/${tclgpg.libPrefix}" + wrapProgram $out/bin/tkabber --set TCLLIBPATH '"${tclLibPaths}"' ''; - buildInputs = [ tcl tk tcllib tcltls tclgpg bwidget x11 makeWrapper ]; + buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; From 5b59bb4d2850e09272d653020ff9efe681b41d57 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:44:54 +0200 Subject: [PATCH 0988/1120] tkabber-plugins: Remove dependency on tkabber. The tkabber plugins really do not require a dependency on tkabber itself, so let's drop it. In addition, this also removes creating a $out/bin dir, which was left back then when creating the tkabber-plugins derivation by copy & pasting stuff from the main tkabber derivation. Signed-off-by: aszlig --- .../instant-messengers/tkabber-plugins/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix index c361f3270e65..236f03ffba64 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tkabber}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "tkabber-plugins-${version}"; @@ -10,9 +10,6 @@ stdenv.mkDerivation rec { }; configurePhase = '' - mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile ''; - - buildInputs = [tkabber]; } From bf72d46084d6cefea3c3c131ae380dee0361e9ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:49:15 +0200 Subject: [PATCH 0989/1120] tkabber: Add missing meta.license. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 56672dee33f0..6d0036c39b35 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -43,5 +43,6 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://tkabber.jabber.ru/"; description = "A GUI client for the XMPP (Jabber) instant messaging protocol"; + license = stdenv.lib.licenses.gpl2; }; } From e18227378a3983dc1f23cc67fc6798c3a50ebb9f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:51:56 +0200 Subject: [PATCH 0990/1120] tkabber-plugins: Add missing meta attributes. Signed-off-by: aszlig --- .../instant-messengers/tkabber-plugins/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix index 236f03ffba64..b46133e433e6 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber-plugins/default.nix @@ -12,4 +12,10 @@ stdenv.mkDerivation rec { configurePhase = '' sed -e "s@/usr/local@$out@" -i Makefile ''; + + meta = { + homepage = "http://tkabber.jabber.ru/tkabber-plugins"; + description = "Plugins for the Tkabber instant messenger"; + license = stdenv.lib.licenses.gpl2; + }; } From c544eb4c713caff1faa92312a2c45fa0aa3cbbcf Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:55:17 +0200 Subject: [PATCH 0991/1120] tkabber: Set the correct path to tkabber-plugins. This should now point to the path for the tkabber plugins package, which will be used as soon as the tkabber-plugins derivation is available as a symlink in the user's environment. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 6d0036c39b35..3b6547a8be90 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -35,7 +35,9 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH '"${tclLibPaths}"' + wrapProgram $out/bin/tkabber \ + --set TCLLIBPATH '"${tclLibPaths}"' \ + --set TKABBER_SITE_PLUGINS '$HOME/.nix-profile/share/tkabber-plugins' ''; buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; From 36947c89570c06630a295a4b021619a577c2a033 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:02:57 +0200 Subject: [PATCH 0992/1120] tkabber: Honor OPENSSL_X509_CERT_FILE. This gets rid of the dependency on cacert and ensures that Tkabber will read OPENSSL_X509_CERT_FILE whenever the sslcacertstore is not set by the user in Tkabber's options. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 3b6547a8be90..03a98cb20597 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, cacert, makeWrapper, x11 }: +, bwidget, makeWrapper, x11 }: let tclLibraries = [ bwidget tcllib tcltls tclgpg ]; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { patchPhase = '' substituteInPlace login.tcl --replace \ "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\"" + "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@ From ce1c6fe0fd2cdd2dbfcf7e5ff85abf58d1a973d3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:23:54 +0200 Subject: [PATCH 0993/1120] licenses: Add Tcl/Tk license. It is similar to the BSD license but has a few restrictions regarding government use. But as I am not a lawyer, I'm not sure if that could be merged with bsd3, so I'm listing it here separately just to be sure. Signed-off-by: aszlig --- pkgs/lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index dc88f887cc79..87f9298706ed 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -175,6 +175,12 @@ shortName = "Proprietary"; fullName = "Proprietary (non redistributable) license"; }; + + tcltk = { + shortName = "Tcl/Tk"; + fullName = "Tcl/Tk license"; + url = http://www.tcl.tk/software/tcltk/license.html; + }; zlib = { shortName = "zlib"; From ae32dd91d4fdf83aa259e58cf2e4e36ce06ca30e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:30:44 +0200 Subject: [PATCH 0994/1120] tcl: Set license to licenses.tcltk. Signed-off-by: aszlig --- pkgs/development/interpreters/tcl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix index 060aa3b5a6ba..48755065b992 100644 --- a/pkgs/development/interpreters/tcl/default.nix +++ b/pkgs/development/interpreters/tcl/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { meta = { description = "The Tcl scription language"; homepage = http://www.tcl.tk/; + license = stdenv.lib.licenses.tcltk; }; passthru = { From bd130c34ec81a9b14c9a2d7d7f2beb610f35a26c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:31:52 +0200 Subject: [PATCH 0995/1120] bwidget: Add missing meta attributes. Signed-off-by: aszlig --- pkgs/development/libraries/bwidget/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index b8aed94bb0be..31dc885bc433 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -21,4 +21,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ tcl ]; + + meta = { + homepage = "http://tcl.activestate.com/software/tcllib/"; + description = "The BWidget toolkit is a high-level widget set for Tcl/Tk."; + license = stdenv.lib.licenses.tcltk; + }; } From 1ca55953fc8569293f1c4841253bc40a02a5eac5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:34:50 +0200 Subject: [PATCH 0996/1120] tcllib: Add missing meta attributes. Signed-off-by: aszlig --- pkgs/development/libraries/tcllib/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index 6aec229f5295..12bbe0914e0e 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -14,4 +14,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ tcl ]; + + meta = { + homepage = "http://tcl.activestate.com/software/tcllib/"; + description = "Tcl-only library of standard routines for Tcl"; + license = stdenv.lib.licenses.tcltk; + }; } From 4f1b8117f33de8de4291293cdb0adb7ababd0fae Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:38:25 +0200 Subject: [PATCH 0997/1120] tcltls: Add missing meta attributes. Signed-off-by: aszlig --- pkgs/development/libraries/tcltls/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index 3f984c377dd1..278fed375145 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -22,4 +22,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ tcl openssl ]; + + meta = { + homepage = "http://tls.sourceforge.net/"; + description = "An OpenSSL / RSA-bsafe Tcl extension"; + license = stdenv.lib.licenses.tcltk; + }; } From 09c3613d4a3e97e957f08610c437707905b0a7c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:27:20 +0200 Subject: [PATCH 0998/1120] libnl: upgrade to 3.2.13 --- pkgs/os-specific/linux/libnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 35f05e9d0092..6fe31c631788 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bison, flex}: stdenv.mkDerivation rec { - name = "libnl-3.0"; + name = "libnl-3.2.13"; src = fetchurl { url = "${meta.homepage}files/${name}.tar.gz"; - sha256 = "1vac10m3w0m5lsypjcrhs2dzwng82nkbzqz8g8kyzkxb3qz5ql3s"; + sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd"; }; buildInputs = [ bison flex ]; From 3ab9e5a38af32ddfc6f793271e38e0550155be66 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:27:32 +0200 Subject: [PATCH 0999/1120] powertop: upgrade to 2.1 --- pkgs/os-specific/linux/powertop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index d175c5f0478d..68075d115a48 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, gettext, libnl1, ncurses, pciutils, pkgconfig, zlib }: +{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.0"; + name = "powertop-2.1"; src = fetchurl { - url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.bz2"; - sha256 = "7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c"; + url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; + sha256 = "16161nlah4i4hq8vyx7ds1vq7icdzwm7gmyjg0xhcrs1r9n83m1x"; }; - buildInputs = [ gettext libnl1 ncurses pciutils pkgconfig zlib ]; + buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; meta = { description = "Analyze power consumption on Intel-based laptops"; From d9aac705bbb574888ea49c670495589d89702014 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:54:20 +0200 Subject: [PATCH 1000/1120] wpa_supplicant: upgrade to 1.0 --- .../linux/wpa_supplicant/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 522478ed5b77..f947bc9a1e73 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }: +{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: stdenv.mkDerivation rec { - version = "0.7.3"; - + version = "1.0"; + name = "wpa_supplicant-${version}"; src = fetchurl { - url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; - sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; + url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; + sha256 = "171b9027rbzy64zaal4832ix9i3mm6ypwmynbpia5bss793ivm4i"; }; - + preBuild = '' cd wpa_supplicant cp -v defconfig .config @@ -18,26 +18,19 @@ stdenv.mkDerivation rec { 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 CONFIG_LIBNL32=y | tee -a .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl1 ]; + buildInputs = [ openssl dbus_libs libnl ]; buildNativeInputs = [ pkgconfig ]; patches = - [ # Upstream patch required for NetworkManager-0.9 - (fetchurl { - url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; - name = "wpa_supplicant-nm-0.9.patch"; - sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; - }) - # wpa_supplicant crashes when controlled through dbus (wicd/nm) - # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625 - (fetchurl { - url = "https://bugzilla.redhat.com/attachment.cgi?id=491018"; - name = "dbus-assertion-fix.patch"; - sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a"; + [ (fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant"; + name = "hostap_allow-linking-with-libnl-3.2.patch"; + sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2"; }) ]; From c1c9c9d2a127c76e6bdb8dc0c488f05247aa06e5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 14:21:24 +0200 Subject: [PATCH 1001/1120] network-manager: use libnl3, as libnl1 is no longer maintained --- pkgs/tools/networking/network-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f7aab9fb4f25..eec7361f6a29 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz -, udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables +, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , libgcrypt, dnsmasq, avahi, bind, perl, substituteAll }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" ]; - buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ]; + buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; From 3de1a56a73467206c87e36c808b0b8ac22dc48a3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 15:04:47 +0200 Subject: [PATCH 1002/1120] hostapd: upgrade to 1.0 --- pkgs/os-specific/linux/hostapd/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 39f92d99b7f6..f13a1033f8ba 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, libnl1, openssl }: +{ stdenv, fetchurl, libnl, openssl, pkgconfig }: stdenv.mkDerivation rec { name = "hostapd-${version}"; - version = "0.7.3"; + version = "1.0"; src = fetchurl { - url = http://w1.fi/releases/hostapd-0.7.3.tar.gz; - sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri"; + url = "http://w1.fi/releases/${name}.tar.gz"; + sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0"; }; - buildInputs = [ libnl1 openssl ]; + buildInputs = [ libnl openssl pkgconfig ]; configurePhase = '' cd hostapd - substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211" - substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/" + substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin" mv defconfig .config + echo CONFIG_LIBNL32=y | tee -a .config + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)" ''; preInstall = "mkdir -p $out/bin"; From d7f89b207584f4e8f4310787b16542040de52197 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 15:07:07 +0200 Subject: [PATCH 1003/1120] libnl1, libnl2: remove now they are unused --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c6f65ff841f..ffa151e98fce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5680,10 +5680,6 @@ let libnl = callPackage ../os-specific/linux/libnl { }; - libnl2 = callPackage ../os-specific/linux/libnl/v2.nix { }; - - libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { }; - linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; From 071d685dda26a31f43a3278c94ec13523995f0ac Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 8 Sep 2012 14:50:47 +0200 Subject: [PATCH 1004/1120] mongodb: upgrade to 2.2.0 --- pkgs/servers/nosql/mongodb/default.nix | 32 +++++++++++--------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 685aeb05ce7c..48a33377e506 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,39 +1,34 @@ -{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}: - -assert useV8 -> v8 != null; +{ stdenv, fetchurl, scons, which, v8, useV8 ? false}: with stdenv.lib; stdenv.mkDerivation rec { - name = "mongodb-2.0.6"; + name = "mongodb-2.2.0"; src = fetchurl { - url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz"; - sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9"; + url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz; + sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8"; }; - buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8; + buildNativeInputs = [ scons which ]; enableParallelBuilding = true; patchPhase = '' - substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )" - substituteInPlace SConstruct --replace "../v8" "${v8}" - substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]" + substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" + '' + optionalString useV8 '' + substituteInPlace SConstruct --replace "#/../v8" "${v8}" \ + --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]" ''; buildPhase = '' - export TERM="" - scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ - ${optionalString useV8 "--usev8"} + echo $PATH + scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} ''; installPhase = '' - scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \ - ${optionalString useV8 "--usev8"} --full --prefix=$out - if [ -d $out/lib64 ]; then - mv $out/lib64 $out/lib - fi + scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out + rm -rf $out/lib64 # exact same files as installed in $out/lib ''; meta = { @@ -45,4 +40,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffa151e98fce..51b984e17f84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5348,7 +5348,6 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost149; useV8 = (getConfig ["mongodb" "useV8"] false); }; From ad628ab557e87ce981566af5fe162f9aab2fe1b9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 17:25:59 +0200 Subject: [PATCH 1005/1120] mongodb: fix build on i686, restrict platforms to linux mongodb is supposed to work on most unixes but its build system is quite picky and fragile. As it hasn't worked for non-linux platforms on NixOS yet, this change won't affect anyone and will remove the illusion that other platforms are currently supported. --- pkgs/servers/nosql/mongodb/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 48a33377e506..ce664972037e 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -2,6 +2,12 @@ with stdenv.lib; +let installerPatch = fetchurl { + url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch"; + sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a"; + }; + +in stdenv.mkDerivation rec { name = "mongodb-2.2.0"; @@ -12,9 +18,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ scons which ]; + patches = [ installerPatch ]; + enableParallelBuilding = true; - patchPhase = '' + postPatch = '' substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" '' + optionalString useV8 '' substituteInPlace SConstruct --replace "#/../v8" "${v8}" \ @@ -37,6 +45,6 @@ stdenv.mkDerivation rec { license = "AGPLv3"; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From 338e78c7b6df25d523696f17fe4f1d141db50176 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:31:54 +0200 Subject: [PATCH 1006/1120] emacs htmlize: upgrade to 1.40 --- pkgs/applications/editors/emacs-modes/htmlize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix index 948beae82d47..d4de24d394c1 100644 --- a/pkgs/applications/editors/emacs-modes/htmlize/default.nix +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "htmlize-1.37"; + name = "htmlize-1.40"; builder = ./builder.sh; src = fetchurl { url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el.cgi; - sha256 = "70cf41a2ea6a478a45143a8cd672381c01ed894448200e602531acbf2b1fd160"; + sha256 = "1v7pzif5b7dr6iyllqvzka8i6s23rsjdnmilnma054gv8d4shw6a"; }; meta = { From 7bbda346ba6be74b3b1bb9440261074aadf6863d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:32:14 +0200 Subject: [PATCH 1007/1120] emacs: add package "xml-rpc" --- .../editors/emacs-modes/xml-rpc/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/xml-rpc/default.nix diff --git a/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix new file mode 100644 index 000000000000..87a732b5b4ca --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/xml-rpc/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, emacs}: + +stdenv.mkDerivation rec { + name = "xml-rpc-1.6.8"; + + src = fetchurl { + url = https://launchpadlibrarian.net/40270196/xml-rpc.el; + sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b"; + }; + + phases = [ "buildPhase" "installPhase"]; + + buildInputs = [ emacs ]; + + buildPhase = '' + cp $src xml-rpc.el + emacs --batch -f batch-byte-compile xml-rpc.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install xml-rpc.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "An elisp implementation of clientside XML-RPC."; + homepage = https://launchpad.net/xml-rpc-el; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b984e17f84..5ab5cfb2375c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6807,6 +6807,8 @@ let scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; + + xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; }; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; From da87b2c9bf9f5703e7d966849057ecd26c242f15 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:32:27 +0200 Subject: [PATCH 1008/1120] emacs: add package "org2blog" --- .../editors/emacs-modes/org2blog/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/org2blog/default.nix diff --git a/pkgs/applications/editors/emacs-modes/org2blog/default.nix b/pkgs/applications/editors/emacs-modes/org2blog/default.nix new file mode 100644 index 000000000000..c8c538c5cb7c --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/org2blog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, emacs, xmlRpc }: + +stdenv.mkDerivation rec { + name = "org2blog-0.5"; + + src = fetchgit { + url = https://github.com/punchagan/org2blog.git; + rev = "338abe30e9bc89684f8384f8deaf826b63844da6"; + sha256 = "46ab31e90d0d54071c126b7d5599a3e82062baa79ddf26b988bcb88d306d6827"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ xmlRpc ]; + + buildPhase = '' + emacs -L . -L ${xmlRpc}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "A tool to publish directly from Emacs’ org-mode to WordPress blogs."; + homepage = https://github.com/punchagan/org2blog; + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab5cfb2375c..7d69d18ab8f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6784,6 +6784,8 @@ let # we want it to have higher precedence. org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); + org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; + pcache = callPackage ../applications/editors/emacs-modes/pcache { }; phpMode = callPackage ../applications/editors/emacs-modes/php { }; From 64c0d7a4908d3a0eb073b9e2cf9f4cbfb0728301 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 11:30:12 +0200 Subject: [PATCH 1009/1120] ghc: bump 7.6.1-rc1 to version 7.6.1 --- pkgs/development/compilers/ghc/7.6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix index 203a354c13c4..77eeacb6a66b 100644 --- a/pkgs/development/compilers/ghc/7.6.1.nix +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.6.0.20120810"; + version = "7.6.1"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/7.6.1-rc1/${name}-src.tar.bz2"; - sha256 = "04m8ms3a58590s4p8x6qma25rdanz0iai8rcla78ka798612pvjd"; + url = "http://haskell.org/ghc/dist/7.6.1/${name}-src.tar.bz2"; + sha256 = "1q5rqp8z90mq6ysf7h28zkbhfaxlrpva2qy0wnkr43d7214dzp7i"; }; buildInputs = [ ghc perl gmp ncurses ]; From 1037089c55bd73a74cd21f71f99b03794b356515 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 11:31:36 +0200 Subject: [PATCH 1010/1120] Update default version of boost to 1.51.0. Version 1.50.0 should be dropped from Nixpkgs, if possible, once we're reasonably sure that the update doesn't break any packages in ways that cannot be trivially fixed. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d69d18ab8f8..231c0cf7cc0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3314,7 +3314,7 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost150 = callPackage ../development/libraries/boost/1.50.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; - boost = boost150; + boost = boost151; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { }; From 15df3d131accbbc926a0d64b419b28a5485480cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:17:59 +0200 Subject: [PATCH 1011/1120] ghc-7.6.1: parallel builds of this package fail I got the following error in 4 consecutive attempts: 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 --- pkgs/development/compilers/ghc/7.6.1.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix index 77eeacb6a66b..335befb6c125 100644 --- a/pkgs/development/compilers/ghc/7.6.1.nix +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -12,7 +12,16 @@ stdenv.mkDerivation rec { buildInputs = [ ghc perl gmp ncurses ]; - enableParallelBuilding = true; + # 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 = false; buildMK = '' libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" From 11111c7d018f7297ed878b1b51584a404e1bda17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:19:45 +0200 Subject: [PATCH 1012/1120] haskell-cabal2nix: update to version 1.39 --- 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 b5983dec6fb5..72c032342d91 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.38"; - sha256 = "1kybxrkddbzr1cqpqplbflhakf9njb9hvamhdwvlanlk8985h8jg"; + version = "1.39"; + sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From 2ccd0238cb578d5b3a142b1e784485e31cc7f0c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:27:35 +0200 Subject: [PATCH 1013/1120] haskell-jailbreak-cabal: add version 1.0 --- .../tools/haskell/jailbreak-cabal/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/tools/haskell/jailbreak-cabal/default.nix diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix new file mode 100644 index 000000000000..303e7ceb2c30 --- /dev/null +++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix @@ -0,0 +1,17 @@ +{ cabal, Cabal }: + +cabal.mkDerivation (self: { + pname = "jailbreak-cabal"; + version = "1.0"; + sha256 = "10vq592fx1i3fdqiij7daf3dmqq5c8c29ihr2y1rn2pjhkyiy4kk"; + isLibrary = false; + isExecutable = true; + buildDepends = [ Cabal ]; + meta = { + homepage = "http://github.com/peti/jailbreak-cabal"; + description = "Strip version restrictions from build dependencies in Cabal files"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b45db385e59c..30c7bfc58c1a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1788,6 +1788,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall = self.cabalInstall_0_14_0; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal { + Cabal = self.Cabal_1_14_0; + }; + lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; myhasktags = callPackage ../tools/misc/myhasktags {}; From 470ade254e73e280b0ec9e1a1ef081926e0d1371 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 14:59:07 +0200 Subject: [PATCH 1014/1120] Add support for jailbreak-cabal utility to the Cabal builder. Jailbreaks-cabal allows Nixpkgs maintainers to quick-fix builds of packages that over-specify their version requirements by removing the version restrictions of all dependencies from the Cabal file. Set jailbreak = true in the build expression to activate this feature. --- pkgs/build-support/cabal/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 8ae8c06d5132..42392aff60c4 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -1,6 +1,6 @@ # generic builder for Cabal packages -{stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, enableLibraryProfiling ? false} : +{ stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, enableLibraryProfiling ? false }: { mkDerivation = args : # arguments for the individual package, can modify the defaults @@ -86,7 +86,8 @@ configurePhase = '' eval "$preConfigure" - for i in Setup.hs Setup.lhs; do + ${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && " + }for i in Setup.hs Setup.lhs; do test -f $i && ghc --make $i done From d7d1f995e6b1cb0feadc2436e254deb3d288441f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:21:17 +0200 Subject: [PATCH 1015/1120] Use jailbreak to get rid of overspecified version restrictions to fix builds of Agda, accelerate-cuda, clientsession, filestore, ghc-events, gitit, happstack, happstack, happstack, hledger-lib, hledger, mime-mail, pandoc, snap, wai-app-static, yesod-static, and urlencoded. --- pkgs/development/libraries/haskell/Agda/default.nix | 4 +--- .../libraries/haskell/accelerate-cuda/default.nix | 3 --- .../development/libraries/haskell/clientsession/default.nix | 4 +--- pkgs/development/libraries/haskell/filestore/default.nix | 4 +--- pkgs/development/libraries/haskell/ghc-events/default.nix | 4 +--- pkgs/development/libraries/haskell/gitit/default.nix | 4 +--- .../libraries/haskell/happstack/happstack-hamlet.nix | 4 +--- .../libraries/haskell/happstack/happstack-server.nix | 4 +--- .../libraries/haskell/happstack/happstack-util.nix | 4 +--- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 +--- pkgs/development/libraries/haskell/hledger/default.nix | 4 +--- pkgs/development/libraries/haskell/mime-mail/default.nix | 4 +--- pkgs/development/libraries/haskell/pandoc/default.nix | 4 +--- pkgs/development/libraries/haskell/snap/snap.nix | 4 +--- pkgs/development/libraries/haskell/urlencoded/default.nix | 4 +--- .../libraries/haskell/wai-app-static/default.nix | 6 ++---- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 +--- 17 files changed, 17 insertions(+), 52 deletions(-) diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix index c72177e2108f..b598accffc60 100644 --- a/pkgs/development/libraries/haskell/Agda/default.nix +++ b/pkgs/development/libraries/haskell/Agda/default.nix @@ -13,9 +13,7 @@ cabal.mkDerivation (self: { QuickCheck syb xhtml zlib ]; buildTools = [ alex happy ]; - patchPhase = '' - sed -i -e 's|mtl == 2.0.\*|mtl|' Agda.cabal - ''; + jailbreak = true; meta = { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index ff9a98cbb59e..3772320b0c22 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { hashable hashtables languageCQuote mainlandPretty mtl srcloc transformers unorderedContainers ]; - patchPhase = '' - sed -i -e 's|\|defaultMainWithHooks autoconfUserHooks|' Setup.hs - ''; meta = { homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/"; description = "Accelerate backend for NVIDIA GPUs"; diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 417e568092d7..13513d023330 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -10,9 +10,7 @@ cabal.mkDerivation (self: { base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged ]; - patchPhase = '' - sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' clientsession.cabal - ''; + jailbreak = true; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index b0cc40d39140..e265cf54e4ed 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,9 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - patchPhase = '' - sed -i -e 's|split.*,|split,|' filestore.cabal - ''; + jailbreak = true; noHaddock = true; meta = { description = "Interface for versioning file stores"; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 4827b7494845..149e88cd01de 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,9 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - patchPhase = '' - sed -i -e 's|mtl *>=.*$|mtl,|' ghc-events.cabal - ''; + jailbreak = true; noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 41d521805ce7..7de302aee6de 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -18,9 +18,7 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - patchPhase = '' - sed -i -e 's|hslogger.*,|hslogger,|' -e 's|base64-bytestring.*,|base64-bytestring,|' gitit.cabal - ''; + jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index 7b2c937bd069..cf71dde30c34 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -5,9 +5,7 @@ cabal.mkDerivation (self: { version = "7.0.1"; sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n"; buildDepends = [ hamlet happstackServer text ]; - patchPhase = '' - sed -i -e 's|hamlet .*,|hamlet,|' happstack-hamlet.cabal - ''; + jailbreak = true; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 410eb7e1d051..06b882c20bb1 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -13,9 +13,7 @@ cabal.mkDerivation (self: { html monadControl mtl network parsec sendfile syb systemFilepath text time transformers transformersBase utf8String xhtml zlib ]; - patchPhase = '' - sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' happstack-server.cabal - ''; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-util.nix b/pkgs/development/libraries/haskell/happstack/happstack-util.nix index b457ec6dc322..8dfac311a9a5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-util.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-util.nix @@ -12,9 +12,7 @@ cabal.mkDerivation (self: { extensibleExceptions filepath hslogger mtl network parsec random time unixCompat ]; - patchPhase = '' - sed -i -e 's|mtl >= 1.1 && < 2.1|mtl|' happstack-util.cabal - ''; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web framework"; diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index de2e40a03d52..af230b2e6448 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -10,9 +10,7 @@ cabal.mkDerivation (self: { cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String ]; - patchPhase = '' - sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger-lib.cabal - ''; + jailbreak = true; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index a02697be7c23..46ae378d738c 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -13,9 +13,7 @@ cabal.mkDerivation (self: { cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe shakespeareText split text time utf8String ]; - patchPhase = '' - sed -i -e 's|,split.*|,split|' -e 's|,cmdargs.*|,cmdargs|' hledger.cabal - ''; + jailbreak = true; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 9abc588a0e76..6303cbb8f4ea 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -7,9 +7,7 @@ cabal.mkDerivation (self: { buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; - patchPhase = '' - sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' mime-mail.cabal - ''; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 8f34d2d88a0a..85a8338e4319 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -15,9 +15,7 @@ cabal.mkDerivation (self: { highlightingKate HTTP json mtl network pandocTypes parsec random syb tagsoup temporary texmath time utf8String xml zipArchive zlib ]; - patchPhase = '' - sed -i -e 's|base64-bytestring.*,|base64-bytestring,|' pandoc.cabal - ''; + jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 4121a657357f..e40aee63bc19 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,9 +19,7 @@ cabal.mkDerivation (self: { snapServer stm syb text time transformers unorderedContainers utf8String vector vectorAlgorithms xmlhtml ]; - patchPhase = '' - sed -i snap.cabal -e 's|clientsession.*,|clientsession,|' - ''; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index 0e7a5413fa27..45891bb45b12 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -7,9 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl network split ]; - patchPhase = '' - sed -i -e 's|split.*|split|' urlencoded.cabal - ''; + jailbreak = true; meta = { homepage = "https://github.com/pheaver/urlencoded"; description = "Generate or process x-www-urlencoded data"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index e1f2cb9116da..b6f80e49c5b3 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -13,10 +13,8 @@ cabal.mkDerivation (self: { cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; - patchPhase = '' - sed -i -e 's|, base64-bytestring.*|, base64-bytestring|' wai-app-static.cabal - ''; - meta = { + jailbreak = true; + meta = { homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 8fffccd649ab..4a7d8c1a7260 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -12,9 +12,7 @@ cabal.mkDerivation (self: { httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; - patchPhase = '' - sed -i yesod-static.cabal -e 's|, base64-bytestring.*|, base64-bytestring|' - ''; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; From 9a19904d32c9f5bc912f0922c6d4fdbf6f9448e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:11:19 +0200 Subject: [PATCH 1016/1120] cosmetic --- pkgs/development/libraries/haskell/filestore/default.nix | 2 +- pkgs/development/libraries/haskell/ghc-events/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index e265cf54e4ed..752037698ca1 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - jailbreak = true; noHaddock = true; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 149e88cd01de..0b5fc5c107ab 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - jailbreak = true; noHaddock = true; + jailbreak = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; From b9f0b44b1ad6aa383447b08500312716b3f8510f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:14:33 +0200 Subject: [PATCH 1017/1120] haskell-haskeline: update to version 0.7.0.3 --- .../libraries/haskell/haskeline/{0.7.0.2.nix => 0.7.0.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/haskeline/{0.7.0.2.nix => 0.7.0.3.nix} (84%) diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix similarity index 84% rename from pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix rename to pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix index b58152f7c24d..3d51d396c7f5 100644 --- a/pkgs/development/libraries/haskell/haskeline/0.7.0.2.nix +++ b/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskeline"; - version = "0.7.0.2"; - sha256 = "0mmflw8mslvif8w1app4zwrlpynpfvzqdb9srs6bgicawwgkb2r0"; + version = "0.7.0.3"; + sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg"; buildDepends = [ filepath terminfo transformers ]; configureFlags = "-fterminfo"; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 30c7bfc58c1a..fd200172e381 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -815,8 +815,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hashtables = callPackage ../development/libraries/haskell/hashtables {}; haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {}; - haskeline_0_7_0_2 = callPackage ../development/libraries/haskell/haskeline/0.7.0.2.nix {}; - haskeline = self.haskeline_0_7_0_2; + haskeline_0_7_0_3 = callPackage ../development/libraries/haskell/haskeline/0.7.0.3.nix {}; + haskeline = self.haskeline_0_7_0_3; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; From 18e9e6832bbaae2a6431c53f295bd0578595aea4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:18:40 +0200 Subject: [PATCH 1018/1120] haddock: add version 2.11.0 and 2.12.0 --- .../tools/documentation/haddock/2.11.0.nix | 18 ++++++++++++++++++ .../tools/documentation/haddock/2.12.0.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++-- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/documentation/haddock/2.11.0.nix create mode 100644 pkgs/development/tools/documentation/haddock/2.12.0.nix diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix new file mode 100644 index 000000000000..92dccbf05a6b --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.11.0"; + sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix new file mode 100644 index 000000000000..39610f9a08c2 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.12.0"; + sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildTools = [ alex happy ]; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + 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 fd200172e381..c0f3ea890da4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib = self.zlib_0_5_3_3; # 7.5 fail cabalInstall = self.cabalInstall_0_14_0; # 7.5 ok alex = self.alex_3_0_1; # 7.5 ok - haddock = self.haddock_2_10_0; # 7.5 ok + haddock = self.haddock_2_12_0; # 7.5 ok happy = self.happy_1_18_9; # 7.5 ok }; @@ -1712,7 +1712,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; - haddock = self.haddock_2_10_0; + haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; + haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; + haddock = self.haddock_2_12_0; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; From c03160831bb4c1881cc2ab63cadc47c97efc93f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:19:47 +0200 Subject: [PATCH 1019/1120] haskell-th-orphans: add version 0.6 --- .../libraries/haskell/th-orphans/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/th-orphans/default.nix diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix new file mode 100644 index 000000000000..da14adfe339b --- /dev/null +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -0,0 +1,14 @@ +{ cabal, thLift }: + +cabal.mkDerivation (self: { + pname = "th-orphans"; + version = "0.6"; + sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj"; + buildDepends = [ thLift ]; + noHaddock = true; + meta = { + description = "Orphan instances for TH datatypes"; + 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 c0f3ea890da4..71cd638ea7d5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1483,6 +1483,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); thLift = callPackage ../development/libraries/haskell/th-lift {}; + thOrphans = callPackage ../development/libraries/haskell/th-orphans {}; + threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; From 062678654574cfc96831b2e4bf09594bcfb7485c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:21:42 +0200 Subject: [PATCH 1020/1120] haskell-deepseq: update to version 1.3.0.1 --- .../libraries/haskell/deepseq/{1.3.0.0.nix => 1.3.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/deepseq/{1.3.0.0.nix => 1.3.0.1.nix} (76%) diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix similarity index 76% rename from pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix rename to pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix index 2470dcdf89fb..78f9273e46a2 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq"; - version = "1.3.0.0"; - sha256 = "0z2k1rda67nmhv62irjfd642iarj1i9m55l6p47j4cysrszhvqgy"; + version = "1.3.0.1"; + sha256 = "068zka6rwprbzpx7yisi1ajsxdly23zaf2vjklx1wp66yypx54lp"; meta = { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 71cd638ea7d5..1f75e397846a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -614,7 +614,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; - deepseq_1_3_0_0 = callPackage ../development/libraries/haskell/deepseq/1.3.0.0.nix {}; + deepseq_1_3_0_1 = callPackage ../development/libraries/haskell/deepseq/1.3.0.1.nix {}; deepseq = null; # a core package in recent GHCs deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; From 4517928069fed81eae1ecc31ef41604f8947f99a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:26:15 +0200 Subject: [PATCH 1021/1120] haskell-X11: update to version 1.6.0.1 --- .../libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix} | 8 +++----- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/X11/{1.6.0.nix => 1.6.0.1.nix} (69%) diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.nix b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix similarity index 69% rename from pkgs/development/libraries/haskell/X11/1.6.0.nix rename to pkgs/development/libraries/haskell/X11/1.6.0.1.nix index 6292f7eab5c5..4a558d483a36 100644 --- a/pkgs/development/libraries/haskell/X11/1.6.0.nix +++ b/pkgs/development/libraries/haskell/X11/1.6.0.1.nix @@ -1,11 +1,9 @@ -{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender, syb -}: +{ cabal, libX11, libXext, libXinerama, libXrandr, libXrender }: cabal.mkDerivation (self: { pname = "X11"; - version = "1.6.0"; - sha256 = "0jjnr4490mkdrmq3lvv7hha7rc9vbwsxlwsvcv56q6zgjx4zwf8j"; - buildDepends = [ syb ]; + version = "1.6.0.1"; + sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz"; extraLibraries = [ libX11 libXext libXinerama libXrandr libXrender ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1f75e397846a..cacd2d3a66c1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1602,8 +1602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; - X11_1_6_0 = callPackage ../development/libraries/haskell/X11/1.6.0.nix {}; - X11 = self.X11_1_6_0; + X11_1_6_0_1 = callPackage ../development/libraries/haskell/X11/1.6.0.1.nix {}; + X11 = self.X11_1_6_0_1; X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; From 44f8ce0fe15d377da861f4e75d85f2cb3990eb48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:29:38 +0200 Subject: [PATCH 1022/1120] haskell-src-exts: update to version 1.13.5 --- .../haskell/haskell-src-exts/{1.13.3.nix => 1.13.5.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/haskell-src-exts/{1.13.3.nix => 1.13.5.nix} (84%) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix similarity index 84% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index d4cb1d97bb77..16f6d6362a1e 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-exts"; - version = "1.13.3"; - sha256 = "0z2vs6ji0dgm3c11jwcq5jcnjr8a6pawrkn3c8a3a5p612v8d495"; + version = "1.13.5"; + sha256 = "03bzhfp7l9f5hh61qdrr83331nbfgj3jfsfylwmnmcknpisdqnkw"; buildDepends = [ cpphs ]; buildTools = [ happy ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cacd2d3a66c1..e8d1b468e6c2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -832,8 +832,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc = self.haskellSrc_1_0_1_5; haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {}; - haskellSrcExts_1_13_3 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.3.nix {}; - haskellSrcExts = self.haskellSrcExts_1_13_3; + haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {}; + haskellSrcExts = self.haskellSrcExts_1_13_5; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; From 69f66a11b62df04ee5d8c0580c27bc4875d7b5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:05:13 +0200 Subject: [PATCH 1023/1120] haskell-language-c-quote: jailbreak to support recent versions of haskell-src-meta --- pkgs/development/libraries/haskell/language-c-quote/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index a765b015a314..7cf0aae9596e 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { mainlandPretty mtl srcloc syb symbol ]; buildTools = [ alex happy ]; + jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "C/CUDA/OpenCL quasiquoting library"; From ac751dc753d1acb4ba53825d4ebec525f079a40b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 1024/1120] haskell-darcs: update to version 2.8.2 --- pkgs/applications/version-management/darcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 53cb4b360a0c..3fb667b94619 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.1"; - sha256 = "1fz9k9zihb0fz0w2y55iqa1fd604nxzz48r62sx3ixxn8qqsvrd1"; + version = "2.8.2"; + sha256 = "1gd8028k91hjsd9hvx3pw4h5zsn2ckc7pfp7f1f566dpp1g422v5"; isLibrary = true; isExecutable = true; buildDepends = [ From e2c9238fae92072cec4e084a6bd366bef68d968b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 1025/1120] haskell-arrows: update to version 0.4.4.1 --- pkgs/development/libraries/haskell/arrows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index baebfbce0f60..149f5f951e5d 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "arrows"; - version = "0.4.4.0"; - sha256 = "1dcvv1vscyggwqmlm6j2sc29zy0wmhn6w4g617gbxxb1j28bm6a9"; + version = "0.4.4.1"; + sha256 = "1qpbpwsc3frjdngwjv3r58nfa0ik88cqh24ls47svigsz3c4n42v"; buildDepends = [ Stream ]; meta = { homepage = "http://www.haskell.org/arrows/"; From 5d84d2e17694732eee659c7f8dbad935f8938c80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 1026/1120] haskell-attoparsec-conduit: update to version 0.5.0.1 --- .../libraries/haskell/attoparsec-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index db4ebc6799d0..e887b2d539cb 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.5.0"; - sha256 = "17l98kbv2pxcchacy7r4ja0czdklc7r4j8vzv3pi0pjb2s9ih6sq"; + version = "0.5.0.1"; + sha256 = "1qrg524gr9ajdxaqd9gmxpj45d7ga21q27ykr76kjdwxfpqaq6n8"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 639926af26989bb1519f8982d996ef72363cf859 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 1027/1120] haskell-blaze-builder-conduit: update to version 0.5.0.1 --- .../libraries/haskell/blaze-builder-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index db3e1e8a71fb..14d4498f5858 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.5.0"; - sha256 = "1saviq46670khz3pcw2ldvbhhgqs522lvbpm62mxjfvrynjw1gwg"; + version = "0.5.0.1"; + sha256 = "1avbgrgqzryqv717714s0418lknm0lqzkis3hia00qhy762amlcn"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From d35889b374d8389c5954aac898992cbdb905342a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1028/1120] haskell-blaze-html: update to version 0.5.1.0 --- pkgs/development/libraries/haskell/blaze-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index c8b2eb06a321..c2505aeb72fa 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.5.0.0"; - sha256 = "0cfvdf50jbm6w277jf69ac57nbkgkn2ifcp6r2amd3qdbmdgqkwj"; + version = "0.5.1.0"; + sha256 = "1f256z68pbm1h6wsk33p94byxwfp01i4pbdrch32jdi1q35cmqxh"; buildDepends = [ blazeBuilder blazeMarkup text ]; meta = { homepage = "http://jaspervdj.be/blaze"; From 19c8861568e227048e7f1a660e2a6a153c75dad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1029/1120] haskell-cookie: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/cookie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 1b958b3240e3..b7dae5d4a9b1 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cookie"; - version = "0.4.0"; - sha256 = "1vkz6nys26i0yprb8jkv8iyq9xqnxb0wv07f7s7c448vx4gfln98"; + version = "0.4.0.1"; + sha256 = "01k5gq9kwbrivkhr1sj8aw4cgf2c1xgwwajqvd435r0g99fpx5kk"; buildDepends = [ blazeBuilder dataDefault text time ]; meta = { homepage = "http://github.com/snoyberg/cookie"; From bd4ae8058439ff9688221de87432f8c0c899af2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1030/1120] haskell-crypto-conduit: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/crypto-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index e76d59678368..539fa3b192f3 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.0"; - sha256 = "15x7v6vmmd90mrb60wllvdai8fk8cvm5bkxzzqyjikshldvlhmas"; + version = "0.4.0.1"; + sha256 = "1afkn9kp5y1qsgd2l2q85d2bh0wbvn07x0ddi72sr8g7daw8zrs8"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; From ead567b8905da27259158df7ed00743fb9535d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1031/1120] haskell-cuda: update to version 0.4.1.1 --- pkgs/development/libraries/haskell/cuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 296d639918e3..3baa02d26747 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.4.1.0"; - sha256 = "1drr95d4v3khidxr6na5vyq28bv5rqk2n676q0bydc4rqwhb1z6w"; + version = "0.4.1.1"; + sha256 = "05hhlnfyr30r1frsc15px38ijd1qvs125yjxvsi6q1kmmkq1w6y9"; buildDepends = [ extensibleExceptions ]; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; From 6c78b5f919f51eed6a7862b5d594c320bfb132e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1032/1120] haskell-fclabels: update to version 1.1.4.3 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 85fe25f7d188..79ea3160df22 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.4.2"; - sha256 = "0abw6vfl5ff8d4cv5s3mfvzhylba5ajnvd5pgmx540i38lcq9wi6"; + version = "1.1.4.3"; + sha256 = "10qr0ncsqxg0dg2f73ip873gr342saxhidaf3c6g5vr03cvmmkap"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 603be88be125b7910be1ce6f18b28f37aeb5606d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1033/1120] haskell-filepath: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/filepath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/default.nix index ae28bdc2e41f..0cd65bb1905e 100644 --- a/pkgs/development/libraries/haskell/filepath/default.nix +++ b/pkgs/development/libraries/haskell/filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "filepath"; - version = "1.3.0.0"; - sha256 = "1v5affq82b4fypm49d5sradcx4ymgmkac563vfx483pmyl73i5jl"; + version = "1.3.0.1"; + sha256 = "1ny8dz8rv883vg6hkzg3zank771cr2z9sfhii7aw4rfb71k29g5p"; meta = { homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; description = "Library for manipulating FilePaths in a cross platform way"; From 6a34dabe17783041e4aadbbbad349fcdba709c8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1034/1120] haskell-flexible-defaults: update to version 0.0.1.0 --- .../libraries/haskell/flexible-defaults/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 40ac59d1c9e3..9cba8f2c13f1 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "flexible-defaults"; - version = "0.0.0.3"; - sha256 = "1s0dz61bqzzbxqvn9i8zwaccsha15als45zzjs2yc11r3m151dla"; + version = "0.0.1.0"; + sha256 = "0vq8ci3zbzmw8abjd12dhjiqzz4ckr99c1fqk32qsp5bvm81bdma"; buildDepends = [ thExtras transformers ]; meta = { homepage = "https://github.com/mokus0/flexible-defaults"; From 8b4ee13aad188cdc40a385a40ffb68c91e08e8b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1035/1120] haskell-gloss: update to version 1.7.5.2 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 08e08e29ec04..a4b613dd756d 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.4.1"; - sha256 = "01mxazdgmz3k8y4s2k2mj11g1m788dykx60i7bqbdwzbzc65hcfw"; + version = "1.7.5.2"; + sha256 = "1lasq106slq57k832pqhaq5wh7hwxn5bzg7rjk95rf3rrq5xb9f5"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; From 26a7363aad26d762a091e2be44c8c60ce043ec13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1036/1120] haskell-haskell-src-meta: update to version 0.6.0.1 --- .../libraries/haskell/haskell-src-meta/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 2300d6e80cad..1d9bba47b4b1 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,10 +1,10 @@ -{ cabal, haskellSrcExts, syb, thLift, uniplate }: +{ cabal, haskellSrcExts, syb, thOrphans, uniplate }: cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.5.1.2"; - sha256 = "09if8423dwf4jcr6p7d8j4r9i2n8jc7xxvjn1p1mwjp0ajzk8g9s"; - buildDepends = [ haskellSrcExts syb thLift uniplate ]; + version = "0.6.0.1"; + sha256 = "181xjajvppipzgknmbhbb1i2r8rimbr5vzn6gf1ksddgw12sargd"; + buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; From 51384cc51900289cecaacebfdd66e3881ca09bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1037/1120] haskell-highlighting-kate: update to version 0.5.3.2 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 55051901206b..21497f3252a2 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.2"; - sha256 = "1a3aifknbxm3v0lvqisdc6zqgki9x9z12jdrmijxmxq1riwwalr2"; + version = "0.5.3.2"; + sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; From 4127150fcfda5d36d6fb5a6cfec783c37dcd7a74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1038/1120] haskell-hscolour: update to version 1.20.3 --- pkgs/development/libraries/haskell/hscolour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/libraries/haskell/hscolour/default.nix index 2c2aa5be7e60..d8bc08b4b33c 100644 --- a/pkgs/development/libraries/haskell/hscolour/default.nix +++ b/pkgs/development/libraries/haskell/hscolour/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hscolour"; - version = "1.20.2"; - sha256 = "0jl2m2bpsqg2hnf9mmwwrpa7af8wqwaajfp2h3nnnmy5qks10ad5"; + version = "1.20.3"; + sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs"; isLibrary = true; isExecutable = true; meta = { From b422578f1d35c2730eefe29d8a37eac2f6ff1d1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1039/1120] haskell-iteratee: update to version 0.8.9.4 --- pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index bc99a88895b3..ee9026bae493 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.9.3"; - sha256 = "1abm7f7ymzw9sa625f40sj4510sbpyplybpgb5a229sq8118dbh0"; + version = "0.8.9.4"; + sha256 = "0j8q5i3kf1ld7630z65hj55p2jlhl23f6qjag4zwrhrh38bfr531"; buildDepends = [ ListLike MonadCatchIOTransformers monadControl parallel transformers transformersBase From 0a5b6548e79c5c4cdd204cb0a4ed89abbbc16dac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 1040/1120] haskell-logict: update to version 0.5.0.2 --- 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 4e67e4ffb4c8..a603b4fe6449 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.1"; - sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv"; + version = "0.5.0.2"; + sha256 = "0m0a55l061vbxdqw9h1780g893amdxs7glza4jd5jncjsv823s1z"; buildDepends = [ mtl ]; meta = { homepage = "http://code.haskell.org/~dolio/logict"; From e421db3284ee688808dcbf0247e1270fe695afb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1041/1120] haskell-math-functions: update to version 0.1.1.2 --- pkgs/development/libraries/haskell/math-functions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index fda06d718eda..127e888d1104 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "math-functions"; - version = "0.1.1.1"; - sha256 = "1256fyd80z6yf61a5a90b3lad7hj0n59cyn741nkdh8p6hqrsi7z"; + version = "0.1.1.2"; + sha256 = "09q9647zxvvg7wi81r14qhhy64d1mwgy8kg0zkhdvg4rzw9j669v"; buildDepends = [ erf vector ]; meta = { homepage = "https://github.com/bos/math-functions"; From b3eb13c229c210baf6f415687f4997c8d223d882 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1042/1120] haskell-mime-mail: update to version 0.4.1.2 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 6303cbb8f4ea..d24bf5719bde 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.1.1"; - sha256 = "01dshc6ysjkab9hl851948l6k0lwgm1fqmyk97zy7wckb252w6y4"; + version = "0.4.1.2"; + sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; From efe11de735217ae119ff6bbe41aa94a49085125f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1043/1120] haskell-multirec: update to version 0.7.3 --- pkgs/development/libraries/haskell/multirec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 4f73ffa98aec..a7d7459b4558 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multirec"; - version = "0.7.2"; - sha256 = "1f715h27x8gz73d2irgl1gw74zd5lyda80nzk9xxwihqqkzvbhsm"; + version = "0.7.3"; + sha256 = "0k1wbjsvkl08nwjikflc8yyalk654mf8bvi1rhm28i4na52myi5y"; noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; From bf6b450d70a18d5368495f24d1953f477b76fa9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1044/1120] haskell-network-conduit: update to version 0.5.0.1 --- .../development/libraries/haskell/network-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index f05d191ed176..4c989e176982 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.5.0"; - sha256 = "0q7smsrv3gp5kvzqfgw2mw9w70gjr5pkx2bmk58dvbnz6al85abn"; + version = "0.5.0.1"; + sha256 = "1rk8a8n1yily20y3jr51zbd00m2c6ic8gxw9rnmkr2cfs963l2v5"; buildDepends = [ conduit liftedBase monadControl network transformers ]; From 2d5e95a09c1bb9f82fb147bd84f7b8d7e2aa845f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1045/1120] haskell-persistent: update to version 1.0.1 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 6820e92f7eb5..732c04d8de77 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.0.0"; - sha256 = "1rrvq3girsjxfvdvvr9zxgc3252hrwcy84zj2mj0a5w057jahhhg"; + version = "1.0.1"; + sha256 = "0k9p3icwz3mygdhmhay8lsc12qgak4ysiyfbap9a68azqrk7045p"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 76ae366292ca69d771e849115a0fee8817d9ec42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1046/1120] haskell-pureMD5: update to version 2.1.2.1 --- pkgs/development/libraries/haskell/pureMD5/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 9501c7ffff1b..8e66b2c3c037 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -2,10 +2,8 @@ cabal.mkDerivation (self: { pname = "pureMD5"; - version = "2.1.0.3"; - sha256 = "0whlsb6zq4zcp3wq0bd6pgcsl0namr8b2s6i4l5aykq8v7fx40ii"; - isLibrary = true; - isExecutable = true; + version = "2.1.2.1"; + sha256 = "1zsn949qk95bwx1fbyv84q0lhb4k18bgixl7nivfzsnmhr31fs37"; buildDepends = [ binary cereal cryptoApi tagged ]; meta = { description = "A Haskell-only implementation of the MD5 digest (hash) algorithm"; From 2040c25c3d53dcb56b936e6a20a80e5ffd48d026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1047/1120] haskell-semigroups: update to version 0.8.4.1 --- pkgs/development/libraries/haskell/semigroups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 795c690d7a24..240062493e30 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.8.4"; - sha256 = "0xphwxxzddgcw2hr4h60l3y27f1x032w049wkjs71f5hdypwapv4"; + version = "0.8.4.1"; + sha256 = "05wv5amgg3nqr1if936zl330sv1k4i9p8xzdmgxsmchp4lshyr6n"; meta = { homepage = "http://github.com/ekmett/semigroups/"; description = "Haskell 98 semigroups"; From 6ab66d48fe142c5bdb9708a4a3dce83eb63825ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1048/1120] haskell-simple-sendfile: update to version 0.2.7 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 20bdca91bb3a..d99762df2b24 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.6"; - sha256 = "1bv8lmpp1h89kx614ijyi5kyqsf4nj75zdarjwxm7is6ixp3rnha"; + version = "0.2.7"; + sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; From 0acfb5994f0b6b321e955cf5de95e03be3f371f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 1049/1120] haskell-syb-with-class: update to version 0.6.1.4 --- pkgs/development/libraries/haskell/syb/syb-with-class.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 10f9f226f697..c6a85e27df15 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "syb-with-class"; - version = "0.6.1.3"; - sha256 = "0dmj9ah7az5lckamvm46pff0595p6v4pvzdv0lqq97gjs5i59y9d"; + version = "0.6.1.4"; + sha256 = "0fi6m1a4017422kdmj1vvvzbks79jkcldp20h2nb7jsf8zvimfkc"; meta = { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; From 0dd27329466804233bda5f198da60a942440d83f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1050/1120] haskell-system-filepath: update to version 0.4.7 --- .../development/libraries/haskell/system-filepath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index d4ffbf82d2af..851b28baafea 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.6"; - sha256 = "0p8lf10b5zn2gw5klpjc397q892cydvnl677srj9rk3lhmsm5jjl"; + version = "0.4.7"; + sha256 = "108bmgz6rynkyabr4pws07smdh31syqvzry9cshrw3zd07c3mn89"; buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; From d1990fed5d21e2b74c144160be570015feb61020 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1051/1120] haskell-texmath: update to version 0.6.1.1 --- 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 6820b2ed2473..65d9da1548fd 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.0.6"; - sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k"; + version = "0.6.1.1"; + sha256 = "06yk19jvpj7di1njybk1hdc7hp6c9h3yb4gvi7ljna6wqrh6zqaz"; isLibrary = true; isExecutable = true; buildDepends = [ parsec syb xml ]; From 69074bf98b2e4a7f1bfabcd5af4fac0396dc9d39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1052/1120] haskell-unordered-containers: update to version 0.2.2.1 --- .../libraries/haskell/unordered-containers/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index e6ff0dd64b90..8ac2372d1c0d 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.2.0"; - sha256 = "1418vr7swk2p1xjxyj86arln6niwgpfjfqdknnkh31m4h83f0q5r"; + version = "0.2.2.1"; + sha256 = "0ny8w7xw0ch3yp0fnskzygz61b72ln5s5ccsdlcqpp29cvfar6zy"; buildDepends = [ deepseq hashable ]; meta = { + homepage = "https://github.com/tibbe/unordered-containers"; description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 2c4011974d8ba2b5ff40f09494b5b04e0ce12535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1053/1120] haskell-warp: update to version 1.3.1 --- pkgs/development/libraries/haskell/warp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index e066196cd4d5..30bbbef9a0b2 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,16 +1,16 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive , conduit, httpTypes, liftedBase, network, networkConduit -, simpleSendfile, transformers, unixCompat, wai +, simpleSendfile, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.0.1"; - sha256 = "0bgmz2kd2z9agpid0w2whfz1cyrmiaiyap20za1l56d88m0p1z45"; + version = "1.3.1"; + sha256 = "12f4v080v8jgm02swqbbgq9yvbajmbr8ja2p6ljc7bhf3rkpwplr"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers - unixCompat wai + unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 07a2ac1634854d242f8a5efc856c2de9675b437d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1054/1120] haskell-zipper: update to version 0.4.2 --- pkgs/development/libraries/haskell/zipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index bf27fa78162a..5ff1da422efa 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zipper"; - version = "0.4.1"; - sha256 = "19xgvqznf200akzf19mp40fg75c0gzpp38wq3n671nm90r08lgvi"; + version = "0.4.2"; + sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44"; buildDepends = [ multirec ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec"; From 09f1fbfa1ccaf1fa17f5dcb28cdd1c6d0b0569e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1055/1120] haskell-zlib-bindings: update to version 0.1.1.1 --- 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 3bb9d314957c..c78ca3f68ee9 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"; - sha256 = "0hgqr7sh3pri482191gd9qrz2nbgxw1aqdx1x6lc9s0bbw68isai"; + version = "0.1.1.1"; + sha256 = "1r502gskbm36smd5nj0f53ildv9rkm3k79zmwdmrskg6z1n7jmfh"; buildDepends = [ zlib ]; meta = { homepage = "http://github.com/snoyberg/zlib-bindings"; From 4fc17179f9cb5795f099f5df385e874408f3718c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1056/1120] haskell-zlib-conduit: update to version 0.5.0.1 --- pkgs/development/libraries/haskell/zlib-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 0f6a3656126a..728d2d202f1a 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.5.0"; - sha256 = "0mba63wx11vb9xir4fbp031ay71xv8b3rnj8gnihsxf3yqq09b99"; + version = "0.5.0.1"; + sha256 = "138wag9fjq3hx48nzr0nvvclcyjwcd0ykjbbgms2h9msmz9vflk5"; buildDepends = [ conduit transformers void zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 010c282cb292e128e66dc6b9b3b3fec206ec2363 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 1057/1120] haskell-lhs2tex: update to version 1.18.1 --- pkgs/tools/typesetting/lhs2tex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 5ac339e92ece..2b96ae526c40 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self: { pname = "lhs2tex"; - version = "1.17"; + version = "1.18.1"; name = self.fname; - sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc"; + sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw"; extraBuildInputs = [regexCompat texLive]; postInstall = '' From 5bde8b0985010cb8abd13f814c142dbd09fb88c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:39:44 +0200 Subject: [PATCH 1058/1120] Override 'Cabal' attribute in 'jailbreakCabal' only when building with a GHC version older than 7.2.x. Newer compilers can use their native version of Cabal to build this tool. --- pkgs/top-level/haskell-defaults.nix | 6 ++++++ pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e076a92350d4..f747c3669ad4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -42,6 +42,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc703Prefs = @@ -50,6 +51,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc702Prefs = ghc701Prefs; @@ -60,6 +62,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc6123Prefs = ghc6122Prefs; @@ -73,6 +76,7 @@ monadPar = self.monadPar_0_1_0_3; deepseq = self.deepseq_1_1_0_2; # deviating from Haskell platform here, to make some packages (notably statistics) compile + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; }; ghc6121Prefs = @@ -83,6 +87,7 @@ repaExamples = null; # don't pick this version of 'repa-examples' during nix-env -u deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; @@ -97,6 +102,7 @@ cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; }; deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; + jailbreakCabal = self.jailbreakCabal.override { Cabal = self.Cabal_1_14_0; }; # deviating from Haskell platform here, to make some packages (notably statistics) compile }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e8d1b468e6c2..775ae03c0838 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1792,9 +1792,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall = self.cabalInstall_0_14_0; - jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal { - Cabal = self.Cabal_1_14_0; - }; + jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; From 249ff424a9caf4e0c9d593879292a7054f04572b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:56:51 +0200 Subject: [PATCH 1059/1120] haskell-zlib: jailbreak version 0.5.3.3 to fix build with GHC 7.6.1 --- pkgs/development/libraries/haskell/zlib/0.5.3.3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index a151a45c0e71..bba9e1a13fe4 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5.3.3"; sha256 = "1hrq34w9y8m7nahvrdpnkh9rdb4jycpcpv9ix6qrxijvbz2vdbg2"; extraLibraries = [ zlib ]; + jailbreak = true; meta = { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; From bbf098baa88f7e3d79cb2c6d7055cb64314283dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:59:20 +0200 Subject: [PATCH 1060/1120] haskell-defaults.nix: extensible-exceptions is not a part of GHC 7.6.1 --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index f747c3669ad4..f33defcb8095 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,7 @@ self : self.haskellPlatformArgs_future self // { haskellPlatform = null; binary = null; # now a core package + extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; ghc741Prefs = From 741a7ef530e47fb2a2c6a1ccf22b87b7072659bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 16:30:58 +0200 Subject: [PATCH 1061/1120] haskell-packages.nix: update 'haskellPlatformArgs_future' for GHC 7.6.1 --- pkgs/top-level/haskell-packages.nix | 54 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 775ae03c0838..d61ee5f28a0d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,33 +120,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; # 7.5 fail - fgl = self.fgl_5_4_2_4; # 7.5 ok - GLUT = self.GLUT_2_1_2_1; # 7.5 fail - haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok - html = self.html_1_0_1_2; # 7.5 ok - HTTP = self.HTTP_4000_2_4; # 7.5 ok - HUnit = self.HUnit_1_2_5_1; # 7.5 ok - mtl = self.mtl_2_1_2; # 7.5 ok - network = self.network_2_3_1_0; # 7.5 ok - OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail - parallel = self.parallel_3_2_0_3; # 7.5 ok - parsec = self.parsec_3_1_3; # 7.5 ok - QuickCheck = self.QuickCheck_2_5; # 7.5 fail - random = self.random_1_0_1_1; # 7.5 ok - regexBase = self.regexBase_0_93_2; # 7.5 ok - regexCompat = self.regexCompat_0_95_1; # 7.5 fail - regexPosix = self.regexPosix_0_95_1; # 7.5 fail - stm = self.stm_2_4; # 7.5 ok - syb = self.syb_0_3_7; # 7.5 ok - text = self.text_0_11_2_3; # 7.5 ok - transformers = self.transformers_0_3_0_0; # 7.5 ok - xhtml = self.xhtml_3000_2_1; # 7.5 ok - zlib = self.zlib_0_5_3_3; # 7.5 fail - cabalInstall = self.cabalInstall_0_14_0; # 7.5 ok - alex = self.alex_3_0_1; # 7.5 ok - haddock = self.haddock_2_12_0; # 7.5 ok - happy = self.happy_1_18_9; # 7.5 ok + cgi = self.cgi_3001_1_8_2; # 7.6 fail + fgl = self.fgl_5_4_2_4; # 7.6 ok + GLUT = self.GLUT_2_3_0_0; # 7.6 fail + haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 fail + html = self.html_1_0_1_2; # 7.6 ok + HTTP = self.HTTP_4000_2_4; # 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_3_1_0; # 7.6 ok + OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok + parallel = self.parallel_3_2_0_3; # 7.6 ok + parsec = self.parsec_3_1_3; # 7.6 ok + QuickCheck = self.QuickCheck_2_5; # 7.6 ok + random = self.random_1_0_1_1; # 7.6 ok + regexBase = self.regexBase_0_93_2; # 7.6 ok + regexCompat = self.regexCompat_0_95_1; # 7.6 fail + regexPosix = self.regexPosix_0_95_1; # 7.6 fail + stm = self.stm_2_4; # 7.6 ok + syb = self.syb_0_3_7; # 7.6 ok + text = self.text_0_11_2_3; # 7.6 ok + transformers = self.transformers_0_3_0_0; # 7.6 ok + xhtml = self.xhtml_3000_2_1; # 7.6 ok + zlib = self.zlib_0_5_3_3; # 7.6 ok + cabalInstall = self.cabalInstall_0_14_0; # 7.6 ok + alex = self.alex_3_0_1; # 7.6 ok + haddock = self.haddock_2_12_0; # 7.6 ok + happy = self.happy_1_18_9; # 7.6 fail }; haskellPlatformArgs_2012_2_0_0 = self : { From 9f7f71aeaa21a100df8f476d1fed12e0d162633e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 16:31:41 +0200 Subject: [PATCH 1062/1120] Add myself as maintainer to those packages Haskell packages I, well, maintain. --- pkgs/development/libraries/haskell/funcmp/default.nix | 2 +- pkgs/development/libraries/haskell/hackage-db/default.nix | 2 +- pkgs/development/libraries/haskell/hsdns/default.nix | 2 +- pkgs/development/libraries/haskell/hsemail/default.nix | 2 +- pkgs/development/libraries/haskell/streamproc/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index f6893cc37975..ed68f0cc1fe6 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Functional MetaPost"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index b27ff78d8f95..3d873dc20737 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "provide access to the Hackage database via Data.Map"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index aab6530fcc99..af5fddda1c06 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Asynchronous DNS Resolver"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index 36a320dbe687..c6dd1c6a5683 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Internet Message Parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 36080e9044e6..88799c9318aa 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { description = "Stream Processer Arrow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; }; }) From 7b587a5ad87b17f34ec13ea839e046f653e3e45c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 18:27:35 +0200 Subject: [PATCH 1063/1120] haskell-funcmp: update to version 1.7 --- pkgs/development/libraries/haskell/funcmp/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index ed68f0cc1fe6..d17ca718f0ae 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -2,14 +2,17 @@ cabal.mkDerivation (self: { pname = "funcmp"; - version = "1.6"; - sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0"; + version = "1.7"; + sha256 = "1rna7x7lw36fv5pyq0zn4b472mh11r0bszzji13wm3byhhmzs04k"; buildDepends = [ filepath ]; meta = { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From bb7daf767b7835c20c3fca4d369754f6e7b42d72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 18:28:02 +0200 Subject: [PATCH 1064/1120] cosmetic --- pkgs/development/libraries/haskell/hackage-db/default.nix | 5 ++++- pkgs/development/libraries/haskell/hsdns/default.nix | 5 ++++- pkgs/development/libraries/haskell/hsemail/default.nix | 5 ++++- pkgs/development/libraries/haskell/streamproc/default.nix | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 3d873dc20737..37698cebb38a 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { description = "provide access to the Hackage database via Data.Map"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index af5fddda1c06..2a83df47f090 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -12,6 +12,9 @@ cabal.mkDerivation (self: { description = "Asynchronous DNS Resolver"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index c6dd1c6a5683..f69789772ace 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -10,6 +10,9 @@ cabal.mkDerivation (self: { description = "Internet Message Parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 88799c9318aa..fef81d92212f 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -9,6 +9,9 @@ cabal.mkDerivation (self: { description = "Stream Processer Arrow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres self.stdenv.lib.maintainers.simons ]; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From 6e0924ca84ffe4c7ea0a51e85b23edf9baa93ddd Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:08:29 +0200 Subject: [PATCH 1065/1120] haskell-active: New package in version 0.1.0.2. This package is required by diagrams-lib. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/active/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/active/default.nix diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix new file mode 100644 index 000000000000..5c563ad9cd73 --- /dev/null +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, semigroupoids, semigroups, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "active"; + version = "0.1.0.2"; + sha256 = "1iymh3sd21ba7ijwv5afphn5vhmwchk6725hbcsdwk2d2x2gd674"; + buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; + meta = { + description = "Abstractions for animation"; + 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 d61ee5f28a0d..44554b495922 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -397,6 +397,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {}; + active = callPackage ../development/libraries/haskell/active {}; + ACVector = callPackage ../development/libraries/haskell/AC-Vector {}; abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {}; From d12f707f6c471bb04332a4a6e2df4b5fde018109 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:09:44 +0200 Subject: [PATCH 1066/1120] haskell-newtype: New package in version 0.2. This package is required by diagrams-lib. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/newtype/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/newtype/default.nix diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix new file mode 100644 index 000000000000..40354c9472ce --- /dev/null +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "newtype"; + version = "0.2"; + sha256 = "0ng4i5r73256gzwl6bw57h0abqixj783c3ggph1hk2wsplx0655p"; + meta = { + description = "A typeclass and set of functions for working with newtypes"; + 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 44554b495922..edd21f50a975 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1119,6 +1119,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; + nonNegative = callPackage ../development/libraries/haskell/non-negative {}; numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {}; From cad8a942e1fbe79e42c6897a8012526c89e69fc9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:28:00 +0200 Subject: [PATCH 1067/1120] haskel-vector-space-points: New package. Starting with version 0.1.1.1, required by diagrams-core. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/vector-space-points/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vector-space-points/default.nix diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix new file mode 100644 index 000000000000..7497ed59c4f9 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -0,0 +1,13 @@ +{ cabal, newtype, vectorSpace }: + +cabal.mkDerivation (self: { + pname = "vector-space-points"; + version = "0.1.1.1"; + sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx"; + buildDepends = [ newtype vectorSpace ]; + meta = { + description = "A type for points, as distinct from vectors"; + 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 edd21f50a975..b148cb782d5f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1556,6 +1556,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; + vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; + void = callPackage ../development/libraries/haskell/void {}; vty = callPackage ../development/libraries/haskell/vty {}; From a7ca54494548fe30612b8cabba4885391bec2077 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:30:28 +0200 Subject: [PATCH 1068/1120] haskell-diagrams-lib: New package, v0.5.0.1. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/diagrams-lib/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-lib/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams-lib/default.nix new file mode 100644 index 000000000000..d5c386c1e1f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-lib/default.nix @@ -0,0 +1,19 @@ +{ cabal, active, colour, dataDefault, diagramsCore, newtype +, NumInstances, semigroups, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "diagrams-lib"; + version = "0.5.0.1"; + sha256 = "0spfsllr2z064cxkdqcij02f0ikxxmll2dqj7rfikp4738wj21dy"; + buildDepends = [ + active colour dataDefault diagramsCore newtype NumInstances + semigroups vectorSpace + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative graphics"; + 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 b148cb782d5f..b49531d5d72c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; + Diff = callPackage ../development/libraries/haskell/Diff {}; digest = callPackage ../development/libraries/haskell/digest { From e3826e5e9cc63a948cd75c50a3ec61be3d4a9f75 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:31:48 +0200 Subject: [PATCH 1069/1120] haskell-diagrams-core: New package, v0.5.0.1. Signed-off-by: aszlig Acked-by: Peter Simons --- .../haskell/diagrams-core/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-core/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams-core/default.nix new file mode 100644 index 000000000000..365e27371319 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-core/default.nix @@ -0,0 +1,18 @@ +{ cabal, MemoTrie, newtype, semigroups, vectorSpace +, vectorSpacePoints +}: + +cabal.mkDerivation (self: { + pname = "diagrams-core"; + version = "0.5.0.1"; + sha256 = "073fk9cxm1kh92alr51dgwps9wxc5w3470axc6q7w91sk5cskpxy"; + buildDepends = [ + MemoTrie newtype semigroups vectorSpace vectorSpacePoints + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Core libraries for diagrams EDSL"; + 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 b49531d5d72c..5c2f99c1a7bd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; Diff = callPackage ../development/libraries/haskell/Diff {}; From 1763eb518b4b57dd47be792b44fcc830bba35c71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:32:40 +0200 Subject: [PATCH 1070/1120] haskell-diagrams-cairo: New package, v0.5.0.2. We use the jailbreak attribute here to avoid splitting off cmdargs and split into directly versioned packages. Signed-off-by: aszlig --- .../haskell/diagrams-cairo/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams-cairo/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix new file mode 100644 index 000000000000..294a266fef47 --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams-cairo/default.nix @@ -0,0 +1,19 @@ +{ cabal, cairo, cmdargs, diagramsCore, diagramsLib, filepath, gtk +, mtl, split +}: + +cabal.mkDerivation (self: { + pname = "diagrams-cairo"; + version = "0.5.0.2"; + sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8"; + jailbreak = true; + buildDepends = [ + cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Cairo backend for diagrams drawing EDSL"; + 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 5c2f99c1a7bd..fd56c927371d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; From 4c418cd3aa4a8a690f1e939ad09509efa831c8e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:33:36 +0200 Subject: [PATCH 1071/1120] haskell-diagrams: New package, v0.5. This is just a metapackage, so the build is going to fail and we need to fix things up next. Signed-off-by: aszlig Acked-by: Peter Simons --- .../libraries/haskell/diagrams/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/diagrams/default.nix diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix new file mode 100644 index 000000000000..11feea574f0c --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/default.nix @@ -0,0 +1,14 @@ +{ cabal, diagramsCairo, diagramsCore, diagramsLib }: + +cabal.mkDerivation (self: { + pname = "diagrams"; + version = "0.5"; + sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5"; + buildDepends = [ diagramsCairo diagramsCore diagramsLib ]; + meta = { + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative vector graphics"; + 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 fd56c927371d..9f8808ccb22d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,6 +625,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; + diagrams = callPackage ../development/libraries/haskell/diagrams {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; From 3e1c9217c4a1f1592d897bbf6903f77d713bce18 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:43:12 +0200 Subject: [PATCH 1072/1120] haskell-diagrams: Don't invoke haddock. This package is only a metapackage and doesn't contain any source files, so we don't need to generate source code documentation at all. Signed-off-by: aszlig Acked-by: Peter Simons --- pkgs/development/libraries/haskell/diagrams/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/default.nix index 11feea574f0c..21c3a7a28f60 100644 --- a/pkgs/development/libraries/haskell/diagrams/default.nix +++ b/pkgs/development/libraries/haskell/diagrams/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.5"; sha256 = "163h2fg3gpmsfm57gjyja2rxh9pl6s3xnzlidfdy201zbk1mzdg5"; buildDepends = [ diagramsCairo diagramsCore diagramsLib ]; + noHaddock = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; From 5320792ed70da5e07d5b04afb06c9d929d1764fe Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:45:19 +0200 Subject: [PATCH 1073/1120] haskell-diagrams: Move main libs into single dir. That way we have all diagrams specific stuff in one directory, which coulde make it easier for code-reuse in the future. Signed-off-by: aszlig Acked-by: Peter Simons --- .../{diagrams-cairo/default.nix => diagrams/cairo.nix} | 0 .../{diagrams-core/default.nix => diagrams/core.nix} | 0 .../haskell/diagrams/{default.nix => diagrams.nix} | 0 .../{diagrams-lib/default.nix => diagrams/lib.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/{diagrams-cairo/default.nix => diagrams/cairo.nix} (100%) rename pkgs/development/libraries/haskell/{diagrams-core/default.nix => diagrams/core.nix} (100%) rename pkgs/development/libraries/haskell/diagrams/{default.nix => diagrams.nix} (100%) rename pkgs/development/libraries/haskell/{diagrams-lib/default.nix => diagrams/lib.nix} (100%) diff --git a/pkgs/development/libraries/haskell/diagrams-cairo/default.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-cairo/default.nix rename to pkgs/development/libraries/haskell/diagrams/cairo.nix diff --git a/pkgs/development/libraries/haskell/diagrams-core/default.nix b/pkgs/development/libraries/haskell/diagrams/core.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-core/default.nix rename to pkgs/development/libraries/haskell/diagrams/core.nix diff --git a/pkgs/development/libraries/haskell/diagrams/default.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams/default.nix rename to pkgs/development/libraries/haskell/diagrams/diagrams.nix diff --git a/pkgs/development/libraries/haskell/diagrams-lib/default.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix similarity index 100% rename from pkgs/development/libraries/haskell/diagrams-lib/default.nix rename to pkgs/development/libraries/haskell/diagrams/lib.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9f8808ccb22d..30edecc335dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -625,13 +625,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derp = callPackage ../development/libraries/haskell/derp {}; - diagrams = callPackage ../development/libraries/haskell/diagrams {}; + diagrams = callPackage ../development/libraries/haskell/diagrams/diagrams.nix {}; - diagramsCairo = callPackage ../development/libraries/haskell/diagrams-cairo {}; + diagramsCairo = callPackage ../development/libraries/haskell/diagrams/cairo.nix {}; - diagramsCore = callPackage ../development/libraries/haskell/diagrams-core {}; + diagramsCore = callPackage ../development/libraries/haskell/diagrams/core.nix {}; - diagramsLib = callPackage ../development/libraries/haskell/diagrams-lib {}; + diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; Diff = callPackage ../development/libraries/haskell/Diff {}; From 96ab1aa9df4a0fc8b7f89afeda6b6b915ee70e98 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 31 Aug 2012 14:47:47 +0200 Subject: [PATCH 1074/1120] pylast: New package, version 0.5.11. pylast is an interface for the last.fm API version 2.0. It also supports services such as Libre.fm, which has a similar API. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d76215961f2f..9cdbae68564c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -974,6 +974,25 @@ let pythonPackages = python.modules // rec { }; + pylast = buildPythonPackage rec { + name = "pylast-${version}"; + version = "0.5.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz"; + md5 = "506cf1b13020b3ed2f3c845ea0c9830e"; + }; + + doCheck = false; + + meta = { + homepage = http://code.google.com/p/pylast/; + description = "A python interface to last.fm (and compatibles)"; + license = pkgs.lib.licenses.asl20; + }; + }; + + libcloud = buildPythonPackage (rec { name = "libcloud-0.3.1"; From e94d50f3590982b3cf7841bdf63aaec5c525a7aa Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 31 Aug 2012 15:03:27 +0200 Subject: [PATCH 1075/1120] pep8: New package, version 1.3.3. This is a style checker/linter to check whether a source files is correctly formatted according to PEP8: http://www.python.org/dev/peps/pep-0008/ Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9cdbae68564c..c809aa544417 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1551,6 +1551,23 @@ let pythonPackages = python.modules // rec { }; + pep8 = buildPythonPackage rec { + name = "pep8-${version}"; + version = "1.3.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; + md5 = "093a99ced0cc3b58c01549d7350f5a73"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/pep8/; + description = "Python style guide checker"; + license = pkgs.lib.licenses.mit; + }; + }; + + pexpect = buildPythonPackage { name = "pexpect-2.3"; From 03a8eea607e05c743addce66b3b44ebd46067c95 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 2 Sep 2012 13:13:18 +0200 Subject: [PATCH 1076/1120] pyinotify: New package, version 0.9.3. Provides Python bindings for the inotify syscalls. For more information on inotify, see: http://en.wikipedia.org/wiki/Inotify Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c809aa544417..1ac779195312 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1796,6 +1796,30 @@ let pythonPackages = python.modules // rec { }; + pyinotify = pkgs.stdenv.mkDerivation rec { + name = "python-pyinotify-${version}"; + version = "0.9.3"; + + src = fetchgit { + url = "git://github.com/seb-m/pyinotify.git"; + rev = "refs/tags/${version}"; + sha256 = "d38ce95e4af00391e58246a8d7fe42bdb51d63054b09809600b2faef2a803472"; + }; + + buildInputs = [ python ]; + + installPhase = '' + python setup.py install --prefix=$out + ''; + + meta = { + homepage = https://github.com/seb-m/pyinotify/wiki; + description = "Monitor filesystems events on Linux platforms with inotify"; + license = pkgs.lib.licenses.mit; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; From 930d13e12ccb4924b534333bfcc6861961fbe46f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 01:15:23 +0200 Subject: [PATCH 1077/1120] picard: New package, version 1.1. Picard is the official MusicBrainz audio tagger which is able to use audio fingerprinting to tag your files. Signed-off-by: aszlig --- pkgs/applications/audio/picard/default.nix | 46 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/audio/picard/default.nix diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix new file mode 100644 index 000000000000..dccb6571f4d5 --- /dev/null +++ b/pkgs/applications/audio/picard/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pythonPackages, gettext, pyqt4 +, pkgconfig, libdiscid, libofa, ffmpeg }: + +pythonPackages.buildPythonPackage rec { + name = "picard-${version}"; + namePrefix = ""; + version = "1.1"; + + src = fetchurl { + url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; + md5 = "57abb76632a423760f336ac11da5c149"; + }; + + buildInputs = [ + pkgconfig + ffmpeg + libofa + gettext + ]; + + propagatedBuildInputs = [ + pythonPackages.mutagen + pyqt4 + libdiscid + ]; + + configurePhase = '' + python setup.py config + ''; + + buildPhase = '' + python setup.py build + ''; + + installPhase = '' + python setup.py install --prefix="$out" + ''; + + doCheck = false; + + meta = { + homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; + description = "The official MusicBrainz tagger"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 231c0cf7cc0f..73ee8d25f044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7471,6 +7471,8 @@ let pianobooster = callPackage ../applications/audio/pianobooster { }; + picard = callPackage ../applications/audio/picard { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; From de5c5467a682e9cc678fe8f8f6b22c850607ecda Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 01:44:21 +0200 Subject: [PATCH 1078/1120] mmv: New package, version 1.01b from Debian. This package as well as the patches are used from Debian, as the upstream version is no longer maintained, plus other distributions seem to use the Debian patched version aswell. And by looking at the patch from Debian, it seems reasonable, because it contains a _lot_ of fixes that accrued over time. Signed-off-by: aszlig --- pkgs/tools/misc/mmv/default.nix | 46 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/misc/mmv/default.nix diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix new file mode 100644 index 000000000000..e6e7eb505bfc --- /dev/null +++ b/pkgs/tools/misc/mmv/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mmv-${version}"; + version = "1.01b"; + + src = fetchurl { + url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; + sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef"; + }; + + patches = [ + # Use Debian patched version, as upstream is no longer maintained and it + # contains a _lot_ of fixes. + (fetchurl { + url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; + sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13"; + }) + ]; + + postPatch = '' + sed -i \ + -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \ + -e "s|/usr/bin|$out/bin|" \ + -e "s|/usr/man|$out/share/man|" \ + Makefile + ''; + + preInstall = '' + mkdir -p "$out/bin" "$out/share/man/man1" + ''; + + postInstall = '' + for variant in mcp mad mln + do + ln -s mmv "$out/bin/$variant" + ln -s mmv.1 "$out/share/man/man1/$variant.1" + done + ''; + + meta = { + homepage = "http://linux.maruhn.com/sec/mmv.html"; + description = "Utility for wildcard renaming, copying, etc"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73ee8d25f044..79c7da88a54d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -978,6 +978,8 @@ let minidlna = callPackage ../tools/networking/minidlna { }; + mmv = callPackage ../tools/misc/mmv { }; + most = callPackage ../tools/misc/most { }; netperf = callPackage ../applications/networking/netperf { }; From 194e9d929c2b2f2c7a05843664bceca575b7cbd4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 02:55:35 +0200 Subject: [PATCH 1079/1120] w3m: Add support for fbcon image display. This builds the w3m image helper with fbcon support if the derivation is called with graphicsSupport set to true. This change shouldn't break anything as graphicsSupport is disabled by default, so in any case it could only break things for users explicitly passing the attribute. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/w3m/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 2a05e920d5f1..9dc7116234e7 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -2,11 +2,11 @@ , sslSupport ? true , graphicsSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib -, imlib2 ? null, x11 ? null +, imlib2 ? null, x11 ? null, fbcon ? null }: assert sslSupport -> openssl != null; -assert graphicsSupport -> x11 != null; +assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optionals graphicsSupport [imlib2 x11]; + ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; - configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"; + configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" + + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path From 9d71bb96c0d2a7f1640dd05c3dcc06c2d1501057 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 02:59:01 +0200 Subject: [PATCH 1080/1120] w3m: Add mouse support for completeness. I'm personally not using mouse/gpm support for w3m, because I find it somewhat too awkward when copy/pasting text. But maybe there are users out there who want to have it. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/w3m/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 9dc7116234e7..38ef20ec9694 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl , sslSupport ? true , graphicsSupport ? false +, mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib , imlib2 ? null, x11 ? null, fbcon ? null +, gpm ? null }: assert sslSupport -> openssl != null; assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); +assert mouseSupport -> gpm != null; stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -22,6 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl + ++ stdenv.lib.optional mouseSupport gpm ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" From 3ed91754e27683abf611d5089612f57366335207 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 03:56:24 +0200 Subject: [PATCH 1081/1120] lastwatch: New package, version 0.4.1. This is actually one of my own programs I've written some years ago, but as I'm still using it on several systems, I'm adding it to nixpkgs. As it is an (at the moment, fanotify looks like it's more suitable) inotify based scrobbler, it of course requires the inotify feature to be enabled in the kernel. Signed-off-by: aszlig --- pkgs/applications/audio/lastwatch/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/audio/lastwatch/default.nix diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix new file mode 100644 index 000000000000..324a0b0bebcb --- /dev/null +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "lastwatch-${version}"; + namePrefix = ""; + version = "0.4.1"; + + src = fetchgit { + url = "git://github.com/aszlig/LastWatch.git"; + rev = "refs/tags/v${version}"; + sha256 = "c43f0fd87e9f3daafc7e8676daf2e89c8e21fbabc278eb1455e28d2997587a92"; + }; + + pythonPath = [ + pythonPackages.pyinotify + pythonPackages.pylast + pythonPackages.mutagen + ]; + + propagatedBuildInputs = pythonPath; + + installCommand = "python setup.py install --prefix=$out"; + + meta = { + homepage = "https://github.com/aszlig/LastWatch"; + description = "An inotify-based last.fm audio scrobbler"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79c7da88a54d..49a608d273c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7224,6 +7224,8 @@ let fftw = fftwSinglePrec; }; + lastwatch = callPackage ../applications/audio/lastwatch { }; + lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { From d891fc6f3bf5dd08f249cdf8a452b6d97b43903e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 20:34:10 +0200 Subject: [PATCH 1082/1120] virtualbox: Update to version 4.1.22. Upstream changes are: * VMM: fixed a potential host crash triggered by shutting down a VM when another VM was running (only affected 32-bit hosts and 64-bit OS X hosts, 4.1 regression) * VMM: fixed a potential host crash under a high guest memory pressure (seen with Windows 8 guests) * VMM: respect RAM preallocation while restoring saved state. * VMM: fixed handling of task gates if VT-x/AMD-V is disabled * Storage: fixed audio CD passthrough for certain media players * USB: don't crash if a USB device is plugged or unplugged when saving or loading the VM state (SMP guests only) * RTC: fixed a potential corruption of CMOS bank 1 * Mac OS X hosts: installer fixes for Leopard (4.1.20 regression) * Windows Additions: fixed memory leak in VBoxTray Full changelogs with bug ids and links to it can be found at: https://www.virtualbox.org/wiki/Changelog Signed-off-by: aszlig --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 1067300a2ef6..56387f9e5c40 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; let - version = "4.1.20"; + version = "4.1.22"; forEachModule = action: '' for mod in \ @@ -34,7 +34,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb"; + sha256 = "7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153"; }; buildInputs = From fc872096917968411a24667528a3060118008cc6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 21:36:36 +0200 Subject: [PATCH 1083/1120] virtualbox/guest-additions: Update to 4.1.22. Signed-off-by: aszlig --- .../virtualization/virtualbox/guest-additions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5b207e2e799f..d903c44866c0 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.1.18"; in +let version = "4.1.22"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1zsjh4q71ny10s2zaxnaw4w3bs961c21xv6dd6zpwhnbimlhlrqb"; + sha256 = "5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; From 46d9146d64a2e405a1465a0b0246c2e2257e7487 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 10 Sep 2012 23:15:54 +0200 Subject: [PATCH 1084/1120] Update SSReflect to version 1.4 --- .../science/logic/ssreflect/default.nix | 15 +++---- .../science/logic/ssreflect/static.patch | 40 +++++++------------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index c554b5dcea1c..764954f54f8f 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -6,7 +6,7 @@ let pname = "ssreflect"; - version = "1.3pl4"; + version = "1.4"; name = "${pname}-${version}"; webpage = http://www.msr-inria.inria.fr/Projects/math-components; in @@ -15,22 +15,16 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "${webpage}/${name}.tar.gz"; - sha256 = "1ha3iiqq79pgll5ra9z0xdi3d3dr3wb9f5vsm4amy884l5anva02"; + url = "${webpage}/${name}-coq8.4.tar.gz"; + sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h"; }; buildInputs = [ ocaml camlp5 coq makeWrapper ]; patches = [ ./static.patch ]; - postBuild = '' - cd src - coqmktop -ide -opt ssreflect.cmx -o ../bin/ssrcoqide - cd .. - ''; - installPhase = '' - COQLIB=$out/lib/coq make -f Makefile.coq install -e + COQLIB=$out/lib/coq/ make -f Makefile.coq install -e mkdir -p $out/bin cp bin/* $out/bin for i in $out/bin/*; do @@ -39,6 +33,7 @@ stdenv.mkDerivation { --add-flags "$out/lib/coq/user-contrib/Ssreflect" \ --add-flags "Ssreflect" done + makeWrapper "${coq}/bin/coqide" "$out/bin/ssrcoqide" --add-flags "-coqtop" --add-flags "$out/bin/ssrcoq" ''; meta = { diff --git a/pkgs/applications/science/logic/ssreflect/static.patch b/pkgs/applications/science/logic/ssreflect/static.patch index edb8a6111f7e..2211d8802582 100644 --- a/pkgs/applications/science/logic/ssreflect/static.patch +++ b/pkgs/applications/science/logic/ssreflect/static.patch @@ -1,33 +1,21 @@ ---- ssreflect1.3pl4/Make (revision 3823) -+++ ssreflect1.3pl4/Make (working copy) -@@ -1,18 +1,18 @@ - ## Uncomment for static linking - ## --# --#-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq --#-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte +--- ssreflect1.4-coq8.4/Make (revision 3823) ++++ ssreflect1.4-coq8.4/Make (working copy) +@@ -1,10 +1,10 @@ +-### Uncomment for static linking +-## +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq +-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte -#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" -#SSRCOQ = bin/ssrcoq --# -+ -+-custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq -+-custom "$(COQBIN)coqmktop -o bin/ssrcoq.byte src/ssreflect.cmo" "src/ssreflect.cmo bin/ssrcoq" bin/ssrcoq.byte +-## ++## Uncomment for static linking ++# ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq ++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte +-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" +SSRCOQ = bin/ssrcoq -+ - ## - - ## Uncomment for dynamic linking - ## -- ---I src -- +# -+#-I src -+# - ## ## What follows should be left untouched by the final user of ssreflect -Common subdirectories: old/src and new/src -Common subdirectories: old/test and new/test -Common subdirectories: old/theories and new/theories + -R theories Ssreflect + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88cfccf24a38..74edde7615d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8575,7 +8575,6 @@ let spass = callPackage ../applications/science/logic/spass {}; ssreflect = callPackage ../applications/science/logic/ssreflect { - coq = coq_8_3; camlp5 = ocamlPackages.camlp5_transitional; }; From 3692a2e83d9012b4f3493c15e93c1e5af0c3e8ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:06:02 +0200 Subject: [PATCH 1085/1120] conky: Update to version 1.9.0. Version 1.8.1 seems to be quite dated, in addition I'd like to use the weather plugin, which isn't available in 1.8.1 as well. If you work in your hermetically sealed environment, you surely want to know what's going on outside. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fda361d6c742..2ef52aee99ee 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: stdenv.mkDerivation rec { - name = "conky-1.8.1"; + name = "conky-1.9.0"; src = fetchurl { url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; + sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; From b2b67c055b048c0db9dea06a219b8ef87d5dbbfc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:18:13 +0200 Subject: [PATCH 1086/1120] conky: Remove curl/types.h patch. This patch is no longer needed, as it is fixed upstream now. Signed-off-by: aszlig --- .../linux/conky/curl-types-h.patch | 25 ------------------- pkgs/os-specific/linux/conky/default.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/os-specific/linux/conky/curl-types-h.patch diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch deleted file mode 100644 index ba99da23b46c..000000000000 --- a/pkgs/os-specific/linux/conky/curl-types-h.patch +++ /dev/null @@ -1,25 +0,0 @@ -curl removed header -diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c -index 10e73a6..9bea299 100644 ---- a/src/ccurl_thread.c -+++ b/src/ccurl_thread.c -@@ -33,7 +33,6 @@ - #endif /* DEBUG */ - - #include --#include - #include - - /* -diff --git a/src/eve.c b/src/eve.c -index dc07264..f62a5f6 100644 ---- a/src/eve.c -+++ b/src/eve.c -@@ -37,7 +37,6 @@ - #include - - #include --#include - #include - - #include diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 2ef52aee99ee..94c7e72f0e2e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); - patches = [ ./curl-types-h.patch ]; - meta = { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; From 3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:34:44 +0200 Subject: [PATCH 1087/1120] conky: Patch to #include in conky.c. In current upstream master, they converted conky.c to C++ already, so it's not an issue there anymore. But until then we need to patch it on our own to fix the build. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 2 ++ pkgs/os-specific/linux/conky/stdbool.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/os-specific/linux/conky/stdbool.patch diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 94c7e72f0e2e..f5cccff6650a 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; + patches = [ ./stdbool.patch ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; configureFlags = (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch new file mode 100644 index 000000000000..3f0b714a1f0c --- /dev/null +++ b/pkgs/os-specific/linux/conky/stdbool.patch @@ -0,0 +1,12 @@ +diff --git a/src/conky.c b/src/conky.c +index 5848b61..69a3d45 100644 +--- a/src/conky.c ++++ b/src/conky.c +@@ -34,6 +34,7 @@ + #include "common.h" + #include "timed_thread.h" + #include ++#include + #include + #include + #include From b0ace9fa110fbd68bd7be9bc58f5168b66ae3707 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:40:52 +0200 Subject: [PATCH 1088/1120] conky: Add license attribute to meta. As the GPL license is more restrictive than the BSD license of the original (torsmo) of the fork, I'm adding GPL as the license here. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index f5cccff6650a..381cc44e36f3 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; + license = stdenv.lib.licenses.gpl3Plus; }; } - From 2b7e88e9f5c867356df9976c288b40b36c74b3c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:46:32 +0200 Subject: [PATCH 1089/1120] conky: Re-enable support for ncurses. Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely re-enable it. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 381cc44e36f3..a75df8b531cf 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: +{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl +, ncurses }: stdenv.mkDerivation rec { name = "conky-1.9.0"; @@ -10,9 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./stdbool.patch ]; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); meta = { From 109fdfe34fd77687946d43e740ef24948e574bab Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:50:33 +0200 Subject: [PATCH 1090/1120] conky: Enable weather plugins. Those plugins do not require additional dependencis or at least no dependencies we don't actually use, so let's build them aswell. And after all, If you work in your hermetically sealed environment, you surely want to know what's going on outside. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index a75df8b531cf..086b792b4cd4 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) - ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" + "weather-metar" "weather-xoap" ]); meta = { homepage = http://conky.sourceforge.net/; From 20f883179e4d1bf35c2d05f73f6ad35b0226ac72 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Sep 2012 00:15:26 +0200 Subject: [PATCH 1091/1120] chromium: Update channels to latest versions. stable: 21.0.1180.89 beta: 22.0.1229.39 dev: 23.0.1255.0 Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 8ae373438f59..7d03c397bdcb 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "23.0.1243.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1243.2.tar.bz2"; - sha256 = "1idsc1k0c392mvh2rhfv0sr50rmzdab18ilh9p90mab5a6fk32rh"; + version = "23.0.1255.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1255.0.tar.bz2"; + sha256 = "12ks55mn6nahdzd5kgiwi9m2cfivb0pwj963g8d4kmdbw5bg017g"; }; beta = { - version = "22.0.1229.14"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.14.tar.bz2"; - sha256 = "11z5wc1m5443bsassq3np79yqr2bwr06ph672by3saikl2xkadn5"; + version = "22.0.1229.39"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.39.tar.bz2"; + sha256 = "0v0yz9lkr9xdzh6660y9n2z8m1075ls2r3svafcfa80pq18chzfd"; }; stable = { - version = "21.0.1180.81"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.81.tar.bz2"; - sha256 = "1b5svzg7xxx46bz9s5ayai2ig9b7s0x4s1yl7r42p9g27qwf0dpl"; + version = "21.0.1180.89"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; + sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; }; } From 2347cfa4f99aa4e44eaf5a3b9be4406c1d57d60e Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Sep 2012 04:34:41 +0200 Subject: [PATCH 1092/1120] chromium: Revert zlib changes for v22 and higher. SVN revision 151720 breaks the build with system zlib, see: http://src.chromium.org/viewvc/chrome?view=rev&revision=151720 The issue here is, that r151720 introduces changes directly in zlib, which aren't upstream and unfortunately there is no more information stating the exact reasons for this change, as all references to it are not publicly available: http://crbug.com/139744 https://chromiumcodereview.appspot.com/10837057 So for the moment, we're going to add a patch, which applies to v22 and higher, which essentially reverts r151720, until either more information on the issue is available or it is resolved upstream. As someone has already reported the issue, we just need to track the following issue: http://crbug.com/143623 Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e9e9961d1cd0..7a3c387dedad 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -81,6 +81,18 @@ let pre22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; + # XXX: this reverts r151720 to prevent http://crbug.com/143623 + maybeRevertZlibChanges = let + below22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; + patch = fetchurl { + name = "revert-r151720"; + url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" + + "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;" + + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; + sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; + }; + in stdenv.lib.optional (!below22) patch; + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -114,7 +126,8 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.optional (!config.selinux) seccompPatch ++ stdenv.lib.optional config.cups ./cups_allow_deprecated.patch - ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch; + ++ stdenv.lib.optional config.pulseaudio ./pulseaudio_array_bounds.patch + ++ maybeRevertZlibChanges; postPatch = stdenv.lib.optionalString config.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl From 2a183e60bf8802499e1ffc229994737eb657cf99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 10:42:50 +0200 Subject: [PATCH 1093/1120] all-packages.nix: recurse into haskellPackages_ghc761 package set to make it available to nix-env --- 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 097d01b2f418..b7d4dc1830f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2318,10 +2318,8 @@ let haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); - # Stable branch snapshot. haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); - # Release candidate. - haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; From b4102299e5d2b1ab2a3779ad2b45f6c741d531b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 1094/1120] haskell-authenticate: update to version 1.3.1.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 dc0ce313eff0..27edc1e9a9c7 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.1"; - sha256 = "1ad3vzfa7nvp8h8wk5370d2qyri0nywq1wjdvqas2mg4iv7v7271"; + version = "1.3.1.1"; + sha256 = "120n7z22x4y4ngxqxsi65zn992f1lksaawcd7rmjvf8m0fysbb4n"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet From e81449b41ebff5c6e3da296599059dc5800aab24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 1095/1120] haskell-clientsession: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/clientsession/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 13513d023330..03d3896e8531 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.8.0"; - sha256 = "1ypd5ki4lvwriw922p65hmj41sargawah1gnwi0q08vc7iagq64k"; + version = "0.8.0.1"; + sha256 = "0r6j15wkyp4akhaxvimjxlwdka7cbm3c3nfk5bvkqan1nrip5rxv"; buildDepends = [ base64Bytestring cereal cprngAes cryptoApi cryptocipher entropy skein tagged ]; - jailbreak = true; meta = { homepage = "http://github.com/yesodweb/clientsession/tree/master"; description = "Securely store session data in a client-side cookie"; From 74eaab50ce8e669461ecd9a702956af2b83957df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 1096/1120] haskell-conduit: update to version 0.5.2.4 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 6ed4ae90221a..c383c46f30b5 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.2.3"; - sha256 = "1snyh9zxdmvjb1ilaz6c2z5220r7ygshmcq013nch44b6w3r3cp9"; + version = "0.5.2.4"; + sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void From 6cff725ee9c96409e4c6bec88228d705a7fe6ebf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 1097/1120] haskell-file-embed: update to version 0.0.4.5 --- pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 1ca06b356ecf..0a6fdf6c8cce 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.4"; - sha256 = "1czwa5vpafhvif4gv7bwa7hrxkrbrvvybgyjckd0hdpl6bpd4nhp"; + version = "0.0.4.5"; + sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp"; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; From 7ef7641d1e9d7d69bee1b1f8ccf1f77c03406643 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 1098/1120] haskell-http-conduit: update to version 1.6.0.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index eef0a2b52594..8e647b43eec1 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.6.0.1"; - sha256 = "0v6r57pliaam3i69826bf07iqmkm2s2x6f19mk0amh7fvdfjhgyb"; + version = "1.6.0.2"; + sha256 = "1vp2jpva3ka149zh454x17d743bp58cwzw0f327pkzv36y4msam7"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From 80505bb4169ea482732977d21c90491b2a3e7379 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 1099/1120] haskell-monad-logger: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 66f10e16e662..740b68edb968 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.2.0"; - sha256 = "0rsp24lx9gcvayj5d6afq26qrggm9qrjqjpdm7088xbl5k0c71fz"; + version = "0.2.0.1"; + sha256 = "151brb5h92xc0mhfqcapmxib7vh2k36rsw493fxbn3256xkzc8gk"; buildDepends = [ fastLogger resourcet text transformers ]; meta = { homepage = "https://github.com/kazu-yamamoto/logger"; From 027faa30455ba8ca4831230ad25b999db8242c80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 1100/1120] haskell-wai-app-static: update to version 1.3.0.1 --- .../development/libraries/haskell/wai-app-static/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index b6f80e49c5b3..f073d36f5024 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,14 +6,13 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.0"; - sha256 = "1xsjq0xip9anbd4cpami8w6d2p0pdp375hzw1jx6pvajjmkjksqn"; + version = "1.3.0.1"; + sha256 = "0rgbqbcj4jd6xpjm3nqa5hdf3an7208in536dl6x9n88w9a6qngp"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/wai"; description = "WAI application for static serving"; From 277527fef74a53503e28b294d4666f32368cc4ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 1101/1120] haskell-wai-extra: update to version 1.3.0.1 --- .../libraries/haskell/wai-extra/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index c7732cc6e2bd..0debe101b4f2 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,17 +1,18 @@ { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes -, network, resourcet, stringsearch, text, time, transformers, void -, wai, waiLogger, zlibConduit +, caseInsensitive, conduit, dataDefault, dateCache, fastLogger +, httpTypes, network, resourcet, stringsearch, text, time +, transformers, void, wai, waiLogger, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.0"; - sha256 = "1j76iaymnsyrin014slkv06p3zdk8lfff94abwvvanxl7gs9b286"; + version = "1.3.0.1"; + sha256 = "0mclhaxdgj1vcqa6q22zl5zv4znfis1zyivwypl1pwv0r267siy5"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive - conduit dataDefault fastLogger httpTypes network resourcet - stringsearch text time transformers void wai waiLogger zlibConduit + conduit dataDefault dateCache fastLogger httpTypes network + resourcet stringsearch text time transformers void wai waiLogger + zlibConduit ]; meta = { homepage = "http://github.com/yesodweb/wai"; From 20518a9556e4af2c8d608f5ba204298efbe681e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 1102/1120] haskell-yaml: update to version 0.8.0.2 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index c6a456bf9a4c..52460c8246be 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.0.1"; - sha256 = "0frps30spsxkr479h4hpzsc9gkaazgmdjp5p4pmzy9mf174qacs8"; + version = "0.8.0.2"; + sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From d23a9edde14273dfea5205216ad394b8bdebff59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:13:55 +0200 Subject: [PATCH 1103/1120] haskell-diagrams: cosmetic --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 294a266fef47..f23be1ebfb18 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -6,10 +6,10 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; version = "0.5.0.2"; sha256 = "1wwk65c2cx7rkhmai5spms791fjhl3snwhj0w9399q8pgj6g4lj8"; - jailbreak = true; buildDepends = [ cairo cmdargs diagramsCore diagramsLib filepath gtk mtl split ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; From 98865175ace24898767b70663f25e9d9e9077231 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:34 +0200 Subject: [PATCH 1104/1120] haskell-async: update to version 2.0.1.3 --- pkgs/development/libraries/haskell/async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/default.nix index 499dc394ece1..a0da6384e958 100644 --- a/pkgs/development/libraries/haskell/async/default.nix +++ b/pkgs/development/libraries/haskell/async/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.1.2"; - sha256 = "03mmrs1xrw91pv9xpas8acxvrh4j6bq5l24bqk4vmaq2pdy9snn3"; + version = "2.0.1.3"; + sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; From 5c75c45f26c3269e438d97f57dd11b815035c718 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:34 +0200 Subject: [PATCH 1105/1120] haskell-fast-logger: update to version 0.3.1 --- .../development/libraries/haskell/fast-logger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 74f78e72af24..e266aa15ff87 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,10 +1,10 @@ -{ cabal, blazeBuilder, filepath, text, unixTime }: +{ cabal, blazeBuilder, dateCache, filepath, text, unixTime }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.2.2"; - sha256 = "1r1fk0lqmh49v24wnx236x9cz122c8806y9mrxnaihxggw4anj0x"; - buildDepends = [ blazeBuilder filepath text unixTime ]; + version = "0.3.1"; + sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks"; + buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; From bee2f63817b581e9f1ccc606424a28eb830d5bc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1106/1120] haskell-http-conduit: update to version 1.6.0.3 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 8e647b43eec1..b1cb2bac6abc 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.6.0.2"; - sha256 = "1vp2jpva3ka149zh454x17d743bp58cwzw0f327pkzv36y4msam7"; + version = "1.6.0.3"; + sha256 = "101h4ba92h8gh74pl9kkgfg94sx3nivv6cc2lfm7i85lrp2fwyjr"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie From b32dc0cad763191e0fcca772c941dd40f2bb84a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1107/1120] haskell-persistent-template: update to version 1.0.0.1 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 13c40c6781f9..f87e63489635 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.0.0"; - sha256 = "14hg2f0v14m34qvj9m75nn3h4c33bh3gg1xixn0q318hwj9vpfcn"; + version = "1.0.0.1"; + sha256 = "0dvhxcyzqv4h3n5nnaglgq2pipynax2nrsdsgj3wgyk1a5k8wdrw"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 0af0365640a7f98ac1b4bd8a88f4e3f32cbe1cc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1108/1120] haskell-persistent: update to version 1.0.1.1 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 732c04d8de77..73bb01d7075e 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.0.1"; - sha256 = "0k9p3icwz3mygdhmhay8lsc12qgak4ysiyfbap9a68azqrk7045p"; + version = "1.0.1.1"; + sha256 = "05jzraw8g87vbd5qqrpvivzaz8k50sm9dlabd86a6n1hpcd7xaka"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 1464dd71833485f9b31f96071d2b1adb960cb41c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1109/1120] haskell-pool-conduit: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/pool-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index 73966514e49a..b951b0d435f0 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.0.2"; - sha256 = "1fs2kskvsvck9n011f2pv0s3mxd2hh71p61dxrskz79mfvks5yky"; + version = "0.1.0.3"; + sha256 = "0q95b4770xfd9ancbzbisslqax3pcvg1yf3kkplnvp335ffxbax9"; buildDepends = [ resourcePool resourcet transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; From 053d65377b27266c2e8092263b56a8d2c2efea1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1110/1120] haskell-resourcet: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 7531008d8548..e3190749f1cb 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.3.3.1"; - sha256 = "164r2p08j3im4wz5jkadl5pvb0qj02k4f2s3v08lm39a51kygjdl"; + version = "0.4.0.1"; + sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; From 7b27f68e4204d89142758b172af90073e730b31a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1111/1120] haskell-shakespeare: update to version 1.0.1.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 1619cc6760c4..3cc2456a7d5a 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.1.1"; - sha256 = "0w5dcli9gbmbpfg8rd8bia7wfll4iisi2cbdwdhbnn159mw8s25x"; + version = "1.0.1.3"; + sha256 = "1m0ca3b73fiph939kpd94mxh4a606mv3hafbwg9j4is38mv5kn8d"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; From 1622070cef8ec4d39be9f43cd6c05f1f2c7f86a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1112/1120] haskell-skein: update to version 0.1.0.9 --- 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 5a4afd9309bc..d6719c7a4517 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.8"; - sha256 = "0d0xrrcagf663rn37gpr13jyvfm7rnil18mz4miavb4hwzni46rm"; + version = "0.1.0.9"; + sha256 = "06hx064cpfcd397rmrmfbm7ph38pnxcsn6wij8fcfsx9wq5yq1k1"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; From b24351998b7c275583ba42630ca9df6ce3f5d7d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 1113/1120] haskell-wai-logger: update to version 0.3.0 --- .../libraries/haskell/wai-logger/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 49e643b4e20c..16f02f877462 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, byteorder, caseInsensitive, fastLogger -, httpTypes, network, wai +{ cabal, blazeBuilder, byteorder, caseInsensitive, dateCache +, fastLogger, httpTypes, network, wai }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "0.2.0"; - sha256 = "1p89k71y0y5kpvy9iniqfyz3wmaw1q75s2324df1m1w1hcc0lgb6"; + version = "0.3.0"; + sha256 = "132jcjyqr7bxcfi7v9mapvx8dci0lz8rv91mgnrzgvpac542c2yq"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - wai + blazeBuilder byteorder caseInsensitive dateCache fastLogger + httpTypes network wai ]; meta = { description = "A logging system for WAI"; From 4d329a6ee5c33a8341a151b0c03692cd0b394cf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1114/1120] haskell-xml-conduit: update to version 1.0.3.1 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index e321d2b08d94..3f2e6e6af4fa 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.0.3"; - sha256 = "1pci21zwdclv018fk5hjfmif2wg6zfm9b4g1w3srgm6wdh5013r7"; + version = "1.0.3.1"; + sha256 = "1000gbdwfp98s44kkp793lmqrdm046phwxcvlik20b2485ml8yrj"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl From 44fe21f0935e854385c1fba809d3057d5597f5d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1115/1120] haskell-yesod-auth: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index fdb6b0e3f605..ac5c87d76132 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.1"; - sha256 = "03zywcdv8kb0h8hpdg1zb3c10s6y6j3gg64n8w970f0izi93haxv"; + version = "1.1.1.1"; + sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 From 6d21a18369e79eedc668c144612dfae553155f0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1116/1120] haskell-yesod-core: update to version 1.1.1.2 --- 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 66432d02f592..5a6d6e1c41cc 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.1.1"; - sha256 = "1sx8bn48r8l9qkqlg2rab6b2xz5dkvw8whm3df7rviw9lymgcrdk"; + version = "1.1.1.2"; + sha256 = "1q0p4hnmd0mg3pqkydqcv61p3hrmnqnrsya005dyvxf320anya0y"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes From bac22b874340d57d66bb447e24f678df560a2a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1117/1120] haskell-yesod-form: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 35a0adc2592b..8f3cf37149fc 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.1.1"; - sha256 = "04wlfhaqx7qg904n6f1yz00m3c2sa5ywbhz6m0pmzfm9a7byggcc"; + version = "1.1.1.1"; + sha256 = "0239sbnpl022g53iwbg9pnphiyadxysdwrqz3f8spf6x3w2gs6vg"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss From cc22e43f5aea4a478b74e72fcde2a18ecd0486f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1118/1120] haskell-yesod-static: update to version 1.1.0.1 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 4a7d8c1a7260..ddd0f24d9af4 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.0"; - sha256 = "07aynfgr5hbm98yimlbw9scph387rkxh4mdij4is1mcv2rdhvhxm"; + version = "1.1.0.1"; + sha256 = "1hlg32bhmhc5npd0bm317mssrddf7jzhwr0z3ns0dpiynz9mh0vy"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai waiAppStatic yesodCore ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; From d6f289f10c0c2b6556ae5c9d668751445e276874 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 1119/1120] haskell-yesod: update to version 1.1.0.3 --- 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 eeb2e3766801..46ebf6c8b850 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.0.2"; - sha256 = "0r89sg0nnv3x46l9z39gn109a38jzr46lgx33v18268maqlc7brb"; + version = "1.1.0.3"; + sha256 = "07rj7dyicnklp6hs1m0kjj6xz983d1zryv2f3sqhf620bc2d70fx"; isLibrary = true; isExecutable = true; buildDepends = [ From 504e2ad1287435c0d0ca2a181cfbf222693c9fc0 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 11 Sep 2012 15:02:37 +0200 Subject: [PATCH 1120/1120] updates coccinelle to 1.0-rc15 --- .../tools/misc/coccinelle/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 0b5fa4b8d611..044ae8f93a0b 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,9 +1,9 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, makeWrapper }: +{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: let - name = "coccinelle-1.0.0-rc12"; - sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d"; + name = "coccinelle-1.0.0-rc15"; + sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596"; in stdenv.mkDerivation { inherit name; @@ -15,12 +15,14 @@ in stdenv.mkDerivation { buildInputs = with ocamlPackages; [ ocaml findlib menhir - ocaml_pcre ocaml_sexplib pycaml - python ncurses makeWrapper + ocaml_pcre pycaml + python ncurses pkgconfig ]; - configureFlagsArray = [ "--enable-release" ]; - + # TODO: is the generation of this wrapper truly/still needed? + # I don't have a non-NixOS system, so I cannot verify this, but shouldn't + # libpython know where to find its modules? (the path is for example in + # its Sys-module). postInstall = # On non-NixOS systems, Coccinelle would end up looking up Python modules # in the wrong directory. @@ -31,6 +33,8 @@ in stdenv.mkDerivation { done ''; + configureFlags = "--enable-release"; + meta = { description = "Coccinelle, a program to apply C code semantic patches";